# HG changeset patch
# User dcubed
# Date 1269561299 25200
# Node ID 84043c7507b9b464b0c52056ddd98929ac759872
# Parent  5d393243d487fecfe968b00ce86b5fc3fe109223# Parent  39e409a664b340ca0eaaa5a4e55dddfa99c82bdd
Merge

diff -r 39e409a664b3 -r 84043c7507b9 .hgignore
--- a/.hgignore	Thu Mar 25 16:27:12 2010 -0700
+++ b/.hgignore	Thu Mar 25 16:54:59 2010 -0700
@@ -1,6 +1,6 @@
 ^build/
 ^dist/
-^nbproject/private/
+/nbproject/private/
 ^src/share/tools/hsdis/build/
 ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/
 ^src/share/tools/IdealGraphVisualizer/build/
diff -r 39e409a664b3 -r 84043c7507b9 .hgtags
--- a/.hgtags	Thu Mar 25 16:27:12 2010 -0700
+++ b/.hgtags	Thu Mar 25 16:54:59 2010 -0700
@@ -45,3 +45,39 @@
 d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68
 54fd4d9232969ea6cd3d236e5ad276183bb0d423 jdk7-b69
 0632c3e615a315ff11e2ab1d64f4d82ff9853461 jdk7-b70
+50a95aa4a247f0cbbf66df285a8b1d78ffb153d9 jdk7-b71
+a94714c550658fd6741793ef036cb9625dc2ab1a jdk7-b72
+faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
+f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
+d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
+9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
+455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
+e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
+a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79
+3003ddd1d4330b06cb4691ae74d600d3685899eb jdk7-b80
+1f9b07674480c224828852ffe137beea36b3cab5 jdk7-b81
+1999f5b12482d66c8b0daf6709daea4f51893a04 jdk7-b82
+a94714c550658fd6741793ef036cb9625dc2ab1a hs17-b01
+faf94d94786b621f8e13cbcc941ca69c6d967c3f hs17-b02
+f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 hs17-b03
+d8dd291a362acb656026a9c0a9da48501505a1e7 hs17-b04
+9174bb32e934965288121f75394874eeb1fcb649 hs17-b05
+a5a6adfca6ecefb5894a848debabfe442ff50e25 hs17-b06
+3003ddd1d4330b06cb4691ae74d600d3685899eb hs17-b07
+1f9b07674480c224828852ffe137beea36b3cab5 hs17-b08
+ff3232b68fbb35185b338d7ff4695b52460243f3 hs17-b09
+981375ca07b7f0605f92f57aad95122e8c385a4d hs16-b01
+f4cbf78110c726919f46b59a3b054c54c7e889b4 hs16-b02
+07c1c01e031513bfe6a7d17c6cf30d2752824ae9 hs16-b03
+08f86fa55a31113df626a75c8a626e66a543a1bd hs16-b04
+32c83fb84370a35344676991a48440378e6b6c8a hs16-b05
+ba313800759b678979434d6da8ed3bf49eb8bea4 hs16-b06
+3c0f729815607e1678bd0c41ae68494c700dcc71 hs16-b07
+ac59d4e6dae51ac5fc31a9a4940d1857f91161b1 hs16-b08
+3f844a28c5f4912bd04043b44f21b25b0805ffc2 hs15-b01
+1605bb4eb5a7a1703b13d5b077a22cc665fe45f7 hs15-b02
+2581d90c6c9b2012da930eb4742add94a03069a0 hs15-b03
+9ab385cb0c42997e16a7761ebcd25c90560a2714 hs15-b04
+fafab5d5349c7c066d677538db67a1ee0fb33bd2 hs15-b05
+3f370a32906eb5ba993fabd7b4279be7f31052b9 jdk7-b83
+ffc8d176b84bcfb5ac21302b4feb3b0c0d69b97c jdk7-b84
diff -r 39e409a664b3 -r 84043c7507b9 agent/make/saenv.sh
--- a/agent/make/saenv.sh	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/make/saenv.sh	Thu Mar 25 16:54:59 2010 -0700
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2003-2009 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
@@ -48,8 +48,16 @@
      CPU=i386
    fi
 else
-   LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so
-   export LD_AUDIT_32
+   # configure audit helper library if SA_ALTROOT is set
+   if [ -n "$SA_ALTROOT" ]; then
+     LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so
+     export LD_AUDIT_32
+     if [ ! -f $LD_AUDIT_32 ]; then
+       echo "SA_ALTROOT is set and can't find libsaproc_audit.so."
+       echo "Make sure to build it with 'make natives'."
+       exit 1
+     fi
+   fi
    SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p`
    OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger"
    CPU=sparc
diff -r 39e409a664b3 -r 84043c7507b9 agent/make/saenv64.sh
--- a/agent/make/saenv64.sh	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/make/saenv64.sh	Thu Mar 25 16:54:59 2010 -0700
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2003-2009 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
@@ -43,8 +43,16 @@
   fi
 fi
 
-LD_AUDIT_64=$STARTDIR/../src/os/solaris/proc/$CPU/libsaproc_audit.so
-export LD_AUDIT_64
+# configure audit helper library if SA_ALTROOT is set
+if [ -n "$SA_ALTROOT" ]; then
+  LD_AUDIT_64=$STARTDIR/../src/os/solaris/proc/$CPU/libsaproc_audit.so
+  export LD_AUDIT_64
+  if [ ! -f $LD_AUDIT_64 ]; then
+      echo "SA_ALTROOT is set and can't find libsaproc_audit.so."
+      echo "Make sure to build it with 'make natives'."
+      exit 1
+  fi
+fi
 SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/$CPU:$STARTDIR/solaris/$CPU
 
 OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger"
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/os/solaris/proc/Makefile
--- a/agent/src/os/solaris/proc/Makefile	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/os/solaris/proc/Makefile	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2002-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/os/solaris/proc/mapfile
--- a/agent/src/os/solaris/proc/mapfile	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/os/solaris/proc/mapfile	Thu Mar 25 16:54:59 2010 -0700
@@ -1,7 +1,7 @@
 #
 
 #
-# Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2003-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java
--- a/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java	Thu Mar 25 16:54:59 2010 -0700
@@ -926,6 +926,28 @@
                 }
             }
         },
+        new Command("dumpcodecache", "dumpcodecache", false) {
+            public void doit(Tokens t) {
+                if (t.countTokens() != 0) {
+                    usage();
+                } else {
+                    final PrintStream fout = out;
+                    final HTMLGenerator gen = new HTMLGenerator(false);
+                    CodeCacheVisitor v = new CodeCacheVisitor() {
+                            public void prologue(Address start, Address end) {
+                            }
+                            public void visit(CodeBlob blob) {
+                                fout.println(gen.genHTML(blob.instructionsBegin()));
+                            }
+                            public void epilogue() {
+                            }
+
+
+                        };
+                    VM.getVM().getCodeCache().iterate(v);
+                }
+            }
+        },
         new Command("where", "where { -a | id }", false) {
             public void doit(Tokens t) {
                 if (t.countTokens() != 1) {
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java
--- a/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java	Thu Mar 25 16:54:59 2010 -0700
@@ -33,6 +33,7 @@
 
 public class CodeCache {
   private static AddressField       heapField;
+  private static AddressField       scavengeRootNMethodsField;
   private static VirtualConstructor virtualConstructor;
 
   private CodeHeap heap;
@@ -49,6 +50,7 @@
     Type type = db.lookupType("CodeCache");
 
     heapField = type.getAddressField("_heap");
+    scavengeRootNMethodsField = type.getAddressField("_scavenge_root_nmethods");
 
     virtualConstructor = new VirtualConstructor(db);
     // Add mappings for all possible CodeBlob subclasses
@@ -67,6 +69,10 @@
     heap = (CodeHeap) VMObjectFactory.newObject(CodeHeap.class, heapField.getValue());
   }
 
+  public NMethod scavengeRootMethods() {
+    return (NMethod) VMObjectFactory.newObject(NMethod.class, scavengeRootNMethodsField.getValue());
+  }
+
   public boolean contains(Address p) {
     return getHeap().contains(p);
   }
@@ -167,7 +173,8 @@
     CodeBlob lastBlob = null;
     while (ptr != null && ptr.lessThan(end)) {
       try {
-        CodeBlob blob = findBlobUnsafe(ptr);
+        // Use findStart to get a pointer inside blob other findBlob asserts
+        CodeBlob blob = findBlobUnsafe(heap.findStart(ptr));
         if (blob != null) {
           visitor.visit(blob);
           if (blob == lastBlob) {
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java
--- a/agent/src/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java	Thu Mar 25 16:54:59 2010 -0700
@@ -81,4 +81,8 @@
     Assert.that(false, "should not reach here");
     return null;
   }
+
+  public int readBCI() {
+    return readInt() + InvocationEntryBCI;
+  }
 }
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java
--- a/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 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
@@ -40,7 +40,10 @@
   /** != InvocationEntryBci if this nmethod is an on-stack replacement method */
   private static CIntegerField entryBCIField;
   /** To support simple linked-list chaining of nmethods */
-  private static AddressField  linkField;
+  private static AddressField  osrLinkField;
+  private static AddressField  scavengeRootLinkField;
+  private static JByteField    scavengeRootStateField;
+
   /** Offsets for different nmethod parts */
   private static CIntegerField exceptionOffsetField;
   private static CIntegerField deoptOffsetField;
@@ -87,7 +90,10 @@
     zombieInstructionSizeField  = type.getCIntegerField("_zombie_instruction_size");
     methodField                 = type.getOopField("_method");
     entryBCIField               = type.getCIntegerField("_entry_bci");
-    linkField                   = type.getAddressField("_link");
+    osrLinkField                = type.getAddressField("_osr_link");
+    scavengeRootLinkField       = type.getAddressField("_scavenge_root_link");
+    scavengeRootStateField      = type.getJByteField("_scavenge_root_state");
+
     exceptionOffsetField        = type.getCIntegerField("_exception_offset");
     deoptOffsetField            = type.getCIntegerField("_deoptimize_offset");
     origPCOffsetField           = type.getCIntegerField("_orig_pc_offset");
@@ -219,10 +225,19 @@
     return getEntryBCI();
   }
 
-  public NMethod getLink() {
-    return (NMethod) VMObjectFactory.newObject(NMethod.class, linkField.getValue(addr));
+  public NMethod getOSRLink() {
+    return (NMethod) VMObjectFactory.newObject(NMethod.class, osrLinkField.getValue(addr));
   }
 
+  public NMethod getScavengeRootLink() {
+    return (NMethod) VMObjectFactory.newObject(NMethod.class, scavengeRootLinkField.getValue(addr));
+  }
+
+  public int getScavengeRootState() {
+    return (int) scavengeRootStateField.getValue(addr);
+  }
+
+
   /** Tells whether frames described by this nmethod can be
       deoptimized. Note: native wrappers cannot be deoptimized. */
   public boolean canBeDeoptimized() { return isJavaMethod(); }
@@ -259,7 +274,7 @@
     if (Assert.ASSERTS_ENABLED) {
       Assert.that(pd != null, "scope must be present");
     }
-    return new ScopeDesc(this, pd.getScopeDecodeOffset());
+    return new ScopeDesc(this, pd.getScopeDecodeOffset(), pd.getObjDecodeOffset(), pd.getReexecute());
   }
 
   /** This is only for use by the debugging system, and is only
@@ -291,11 +306,11 @@
   public ScopeDesc getScopeDescNearDbg(Address pc) {
     PCDesc pd = getPCDescNearDbg(pc);
     if (pd == null) return null;
-    return new ScopeDesc(this, pd.getScopeDecodeOffset());
+    return new ScopeDesc(this, pd.getScopeDecodeOffset(), pd.getObjDecodeOffset(), pd.getReexecute());
   }
 
-  public Map/*<Address, PcDesc>*/ getSafepoints() {
-    Map safepoints = new HashMap(); // Map<Address, PcDesc>
+  public Map/*<Address, PCDesc>*/ getSafepoints() {
+    Map safepoints = new HashMap(); // Map<Address, PCDesc>
     sun.jvm.hotspot.debugger.Address p = null;
     for (p = scopesPCsBegin(); p.lessThan(scopesPCsEnd());
          p = p.addOffsetTo(pcDescSize)) {
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java
--- a/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 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
@@ -36,6 +36,8 @@
 public class PCDesc extends VMObject {
   private static CIntegerField pcOffsetField;
   private static CIntegerField scopeDecodeOffsetField;
+  private static CIntegerField objDecodeOffsetField;
+  private static CIntegerField pcFlagsField;
 
   static {
     VM.registerVMInitializedObserver(new Observer() {
@@ -50,6 +52,8 @@
 
     pcOffsetField          = type.getCIntegerField("_pc_offset");
     scopeDecodeOffsetField = type.getCIntegerField("_scope_decode_offset");
+    objDecodeOffsetField   = type.getCIntegerField("_obj_decode_offset");
+    pcFlagsField           = type.getCIntegerField("_flags");
   }
 
   public PCDesc(Address addr) {
@@ -66,10 +70,20 @@
     return ((int) scopeDecodeOffsetField.getValue(addr));
   }
 
+  public int getObjDecodeOffset() {
+    return ((int) objDecodeOffsetField.getValue(addr));
+  }
+
   public Address getRealPC(NMethod code) {
     return code.instructionsBegin().addOffsetTo(getPCOffset());
   }
 
+
+  public boolean getReexecute() {
+    int flags = (int)pcFlagsField.getValue(addr);
+    return ((flags & 0x1)== 1); //first is the reexecute bit
+  }
+
   public void print(NMethod code) {
     printOn(System.out, code);
   }
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java
--- a/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java	Thu Mar 25 16:54:59 2010 -0700
@@ -51,45 +51,46 @@
   /** Scalar replaced bjects pool */
   private List    objects; // ArrayList<ScopeValue>
 
-
-  public ScopeDesc(NMethod code, int decodeOffset) {
+  private ScopeDesc(NMethod code, int decodeOffset, List objects, boolean reexecute) {
     this.code = code;
     this.decodeOffset = decodeOffset;
-    this.objects      = decodeObjectValues(DebugInformationRecorder.SERIALIZED_NULL);
+    this.objects      = objects;
+    this.reexecute    = reexecute;
 
     // Decode header
     DebugInfoReadStream stream  = streamAt(decodeOffset);
 
     senderDecodeOffset = stream.readInt();
     method = (Method) VM.getVM().getObjectHeap().newOop(stream.readOopHandle());
-    setBCIAndReexecute(stream.readInt());
+    bci    = stream.readBCI();
     // Decode offsets for body and sender
     localsDecodeOffset      = stream.readInt();
     expressionsDecodeOffset = stream.readInt();
     monitorsDecodeOffset    = stream.readInt();
   }
 
-  public ScopeDesc(NMethod code, int decodeOffset, int objectDecodeOffset) {
+  public ScopeDesc(NMethod code, int decodeOffset, int objectDecodeOffset, boolean reexecute) {
     this.code = code;
     this.decodeOffset = decodeOffset;
     this.objects      = decodeObjectValues(objectDecodeOffset);
+    this.reexecute    = reexecute;
 
     // Decode header
     DebugInfoReadStream stream  = streamAt(decodeOffset);
 
     senderDecodeOffset = stream.readInt();
     method = (Method) VM.getVM().getObjectHeap().newOop(stream.readOopHandle());
-    setBCIAndReexecute(stream.readInt());
+    bci    = stream.readBCI();
     // Decode offsets for body and sender
     localsDecodeOffset      = stream.readInt();
     expressionsDecodeOffset = stream.readInt();
     monitorsDecodeOffset    = stream.readInt();
   }
 
-  public NMethod getNMethod() { return code; }
-  public Method getMethod() { return method; }
-  public int    getBCI()    { return bci;    }
-  public boolean getReexecute() {return reexecute;}
+  public NMethod getNMethod()   { return code; }
+  public Method getMethod()     { return method; }
+  public int    getBCI()        { return bci;    }
+  public boolean getReexecute() { return reexecute;}
 
   /** Returns a List&lt;ScopeValue&gt; */
   public List getLocals() {
@@ -106,7 +107,7 @@
     return decodeMonitorValues(monitorsDecodeOffset);
   }
 
-  /** Returns a List&lt;MonitorValue&gt; */
+  /** Returns a List&lt;ObjectValue&gt; */
   public List getObjects() {
     return objects;
   }
@@ -117,7 +118,7 @@
       return null;
     }
 
-    return new ScopeDesc(code, senderDecodeOffset);
+    return new ScopeDesc(code, senderDecodeOffset, objects, false);
   }
 
   /** Returns where the scope was decoded */
@@ -151,8 +152,8 @@
   public void printValueOn(PrintStream tty) {
     tty.print("ScopeDesc for ");
     method.printValueOn(tty);
-    tty.println(" @bci " + bci);
-    tty.println(" reexecute: " + reexecute);
+    tty.print(" @bci " + bci);
+    tty.println(" reexecute=" + reexecute);
   }
 
   // FIXME: add more accessors
@@ -160,12 +161,6 @@
   //--------------------------------------------------------------------------------
   // Internals only below this point
   //
-  private void setBCIAndReexecute(int combination) {
-    int InvocationEntryBci = VM.getVM().getInvocationEntryBCI();
-    bci = (combination >> 1) + InvocationEntryBci;
-    reexecute = (combination & 1)==1 ? true : false;
-  }
-
   private DebugInfoReadStream streamAt(int decodeOffset) {
     return new DebugInfoReadStream(code, decodeOffset, objects);
   }
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java	Thu Mar 25 16:54:59 2010 -0700
@@ -63,12 +63,12 @@
     javaSystemLoaderField = type.getOopField("_java_system_loader");
     nofBuckets = db.lookupIntConstant("SystemDictionary::_nof_buckets").intValue();
 
-    objectKlassField = type.getOopField(WK_KLASS("object_klass"));
-    classLoaderKlassField = type.getOopField(WK_KLASS("classloader_klass"));
-    stringKlassField = type.getOopField(WK_KLASS("string_klass"));
-    systemKlassField = type.getOopField(WK_KLASS("system_klass"));
-    threadKlassField = type.getOopField(WK_KLASS("thread_klass"));
-    threadGroupKlassField = type.getOopField(WK_KLASS("threadGroup_klass"));
+    objectKlassField = type.getOopField(WK_KLASS("Object_klass"));
+    classLoaderKlassField = type.getOopField(WK_KLASS("ClassLoader_klass"));
+    stringKlassField = type.getOopField(WK_KLASS("String_klass"));
+    systemKlassField = type.getOopField(WK_KLASS("System_klass"));
+    threadKlassField = type.getOopField(WK_KLASS("Thread_klass"));
+    threadGroupKlassField = type.getOopField(WK_KLASS("ThreadGroup_klass"));
   }
 
   // This WK functions must follow the definitions in systemDictionary.hpp:
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
--- a/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java	Thu Mar 25 16:54:59 2010 -0700
@@ -807,6 +807,9 @@
             Interpreter interp = VM.getVM().getInterpreter();
             if (interp.contains(pc)) {
                InterpreterCodelet codelet = interp.getCodeletContaining(pc);
+               if (codelet == null) {
+                  return "Unknown location in the Interpreter: " + pc;
+               }
                return genHTML(codelet);
             }
             return genHTML(blob);
@@ -969,16 +972,24 @@
    }
 
    protected String genSafepointInfo(NMethod nm, PCDesc pcDesc) {
-      ScopeDesc sd = nm.getScopeDescAt(pcDesc.getRealPC(nm));
-      Formatter buf = new Formatter(genHTML);
-      Formatter tabs = new Formatter(genHTML);
+       ScopeDesc sd = nm.getScopeDescAt(pcDesc.getRealPC(nm));
+       Formatter buf = new Formatter(genHTML);
+       Formatter tabs = new Formatter(genHTML);
+       tabs.append(tab + tab + tab); // Initial indent for debug info
+
+       buf.beginTag("pre");
+       genScope(buf, tabs, sd);
 
-      buf.beginTag("pre");
-      genScope(buf, tabs, sd);
-      buf.endTag("pre");
-      buf.append(genOopMapInfo(nm, pcDesc));
+       // Reset indent for scalar replaced objects
+       tabs = new Formatter(genHTML);
+       tabs.append(tab + tab + tab); // Initial indent for debug info
 
-      return buf.toString();
+       genScObjInfo(buf, tabs, sd);
+       buf.endTag("pre");
+
+       buf.append(genOopMapInfo(nm, pcDesc));
+
+       return buf.toString();
    }
 
     protected void genScope(Formatter buf, Formatter tabs, ScopeDesc sd) {
@@ -1022,8 +1033,95 @@
             buf.append(genHTMLForMonitors(sd, monitors));
         }
 
+        buf.br();
         tabs.append(tab);
-        buf.br();
+    }
+
+    protected void genScObjInfo(Formatter buf, Formatter tabs, ScopeDesc sd) {
+        if (sd == null) {
+            return;
+        }
+
+        List objects = sd.getObjects();
+        if (objects == null) {
+            return;
+        }
+        int length = objects.size();
+        for (int i = 0; i < length; i++) {
+            buf.append(tabs);
+            ObjectValue ov = (ObjectValue)objects.get(i);
+            buf.append("ScObj" + i);
+            ScopeValue sv = ov.getKlass();
+            if (Assert.ASSERTS_ENABLED) {
+                Assert.that(sv.isConstantOop(), "scalar replaced object klass must be constant oop");
+            }
+            ConstantOopReadValue klv = (ConstantOopReadValue)sv;
+            OopHandle klHandle = klv.getValue();
+            if (Assert.ASSERTS_ENABLED) {
+                Assert.that(klHandle != null, "scalar replaced object klass must be not NULL");
+            }
+            Oop obj = VM.getVM().getObjectHeap().newOop(klHandle);
+            if (obj instanceof InstanceKlass) {
+                InstanceKlass kls = (InstanceKlass) obj;
+                buf.append(" " + kls.getName().asString() + "={");
+                int flen = ov.fieldsSize();
+
+                TypeArray klfields = kls.getFields();
+                int klen = (int) klfields.getLength();
+
+                ConstantPool cp = kls.getConstants();
+                int findex = 0;
+                for (int index = 0; index < klen; index += kls.NEXT_OFFSET) {
+                    int accsFlags = klfields.getShortAt(index + kls.ACCESS_FLAGS_OFFSET);
+                    int nameIndex = klfields.getShortAt(index + kls.NAME_INDEX_OFFSET);
+                    AccessFlags access = new AccessFlags(accsFlags);
+                    if (!access.isStatic()) {
+                        ScopeValue svf = ov.getFieldAt(findex++);
+                        String    fstr = scopeValueAsString(sd, svf);
+                        Symbol f_name  = cp.getSymbolAt(nameIndex);
+                        buf.append(" [" + f_name.asString() + " :"+ index + "]=(#" + fstr + ")");
+                    }
+                }
+                buf.append(" }");
+            } else {
+                buf.append(" ");
+                int flen = ov.fieldsSize();
+                if (obj instanceof TypeArrayKlass) {
+                    TypeArrayKlass kls = (TypeArrayKlass) obj;
+                    buf.append(kls.getElementTypeName() + "[" + flen + "]");
+                } else if (obj instanceof ObjArrayKlass) {
+                    ObjArrayKlass kls = (ObjArrayKlass) obj;
+                    Klass elobj = kls.getBottomKlass();
+                    if (elobj instanceof InstanceKlass) {
+                        buf.append(elobj.getName().asString());
+                    } else if (elobj instanceof TypeArrayKlass) {
+                        TypeArrayKlass elkls = (TypeArrayKlass) elobj;
+                        buf.append(elkls.getElementTypeName());
+                    } else {
+                        if (Assert.ASSERTS_ENABLED) {
+                            Assert.that(false, "unknown scalar replaced object klass!");
+                        }
+                    }
+                    buf.append("[" + flen + "]");
+                    int ndim = (int) kls.getDimension();
+                    while (--ndim > 0) {
+                        buf.append("[]");
+                    }
+                } else {
+                    if (Assert.ASSERTS_ENABLED) {
+                        Assert.that(false, "unknown scalar replaced object klass!");
+                    }
+                }
+                buf.append("={");
+                for (int findex = 0; findex < flen; findex++) {
+                    ScopeValue svf = ov.getFieldAt(findex);
+                    String fstr = scopeValueAsString(sd, svf);
+                    buf.append(" [" + findex + "]=(#" + fstr + ")");
+                }
+                buf.append(" }");
+            }
+            buf.br();
+        }
     }
 
    protected String genHTMLForOopMap(OopMap map) {
@@ -1037,8 +1135,6 @@
             tmpBuf.beginTag("tr");
             tmpBuf.beginTag("td");
             tmpBuf.append(type);
-            tmpBuf.endTag("td");
-            tmpBuf.endTag("tr");
             for (; ! oms.isDone(); oms.next()) {
                OopMapValue omv = oms.getCurrent();
                if (omv == null) {
@@ -1048,7 +1144,7 @@
                VMReg vmReg = omv.getReg();
                int reg = vmReg.getValue();
                if (reg < stack0) {
-                  tmpBuf.append(VMRegImpl.getRegisterName(vmReg.getValue()));
+                  tmpBuf.append(VMRegImpl.getRegisterName(reg));
                } else {
                   tmpBuf.append('[');
                   tmpBuf.append(Integer.toString((reg - stack0) * 4));
@@ -1058,7 +1154,13 @@
                   tmpBuf.append(" = ");
                   VMReg vmContentReg = omv.getContentReg();
                   int contentReg = vmContentReg.getValue();
-                  tmpBuf.append(VMRegImpl.getRegisterName(vmContentReg.getValue()));
+                  if (contentReg < stack0) {
+                     tmpBuf.append(VMRegImpl.getRegisterName(contentReg));
+                  } else {
+                     tmpBuf.append('[');
+                     tmpBuf.append(Integer.toString((contentReg - stack0) * 4));
+                     tmpBuf.append(']');
+                  }
                }
                tmpBuf.append(spaces);
             }
@@ -1072,19 +1174,19 @@
 
       OopMapValueIterator omvIterator = new OopMapValueIterator();
       OopMapStream oms = new OopMapStream(map, OopMapValue.OopTypes.OOP_VALUE);
-      buf.append(omvIterator.iterate(oms, "Oop:", false));
+      buf.append(omvIterator.iterate(oms, "Oops:", false));
+
+      oms = new OopMapStream(map, OopMapValue.OopTypes.NARROWOOP_VALUE);
+      buf.append(omvIterator.iterate(oms, "narrowOops:", false));
 
       oms = new OopMapStream(map, OopMapValue.OopTypes.VALUE_VALUE);
-      buf.append(omvIterator.iterate(oms, "Value:", false));
-
-      oms = new OopMapStream(map, OopMapValue.OopTypes.NARROWOOP_VALUE);
-      buf.append(omvIterator.iterate(oms, "Oop:", false));
+      buf.append(omvIterator.iterate(oms, "Values:", false));
 
       oms = new OopMapStream(map, OopMapValue.OopTypes.CALLEE_SAVED_VALUE);
       buf.append(omvIterator.iterate(oms, "Callee saved:",  true));
 
       oms = new OopMapStream(map, OopMapValue.OopTypes.DERIVED_OOP_VALUE);
-      buf.append(omvIterator.iterate(oms, "Derived oop:", true));
+      buf.append(omvIterator.iterate(oms, "Derived oops:", true));
 
       buf.endTag("table");
       return buf.toString();
@@ -1093,6 +1195,8 @@
 
    protected String genOopMapInfo(NMethod nmethod, PCDesc pcDesc) {
       OopMapSet mapSet = nmethod.getOopMaps();
+      if (mapSet == null || (mapSet.getSize() <= 0))
+        return "";
       int pcOffset = pcDesc.getPCOffset();
       OopMap map = mapSet.findMapAtOffset(pcOffset, VM.getVM().isDebugging());
       if (map == null) {
@@ -1106,6 +1210,7 @@
      Formatter buf = new Formatter(genHTML);
      buf.beginTag("pre");
      buf.append("OopMap: ");
+     buf.br();
      buf.append(genHTMLForOopMap(map));
      buf.endTag("pre");
 
@@ -1154,7 +1259,7 @@
       return buf.toString();
    }
 
-   private String scopeValueAsString(ScopeValue sv) {
+   private String scopeValueAsString(ScopeDesc sd, ScopeValue sv) {
       Formatter buf = new Formatter(genHTML);
       if (sv.isConstantInt()) {
          buf.append("int ");
@@ -1187,6 +1292,11 @@
          } else {
             buf.append("null");
          }
+      } else if (sv.isObject()) {
+         ObjectValue ov = (ObjectValue)sv;
+         buf.append("#ScObj" + sd.getObjects().indexOf(ov));
+      } else {
+         buf.append("unknown scope value " + sv);
       }
       return buf.toString();
    }
@@ -1219,7 +1329,7 @@
          }
 
          buf.append(", ");
-         buf.append(scopeValueAsString(sv));
+         buf.append(scopeValueAsString(sd, sv));
          buf.append(") ");
       }
 
@@ -1246,7 +1356,7 @@
          buf.append("(owner = ");
          ScopeValue owner = mv.owner();
          if (owner != null) {
-            buf.append(scopeValueAsString(owner));
+            buf.append(scopeValueAsString(sd, owner));
          } else {
             buf.append("null");
          }
@@ -1324,11 +1434,11 @@
                   buf.append(instr.asString(currentPc, symFinder));
                }
 
+               buf.br();
                if (isSafepoint && !prevWasCall) {
-                  buf.append(genSafepointInfo(nmethod, pcDesc));
+                 buf.append(genSafepointInfo(nmethod, pcDesc));
                }
 
-               buf.br();
                prevWasCall = instr.isCall();
             }
 
diff -r 39e409a664b3 -r 84043c7507b9 agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js
--- a/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Thu Mar 25 16:27:12 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Thu Mar 25 16:54:59 2010 -0700
@@ -1047,7 +1047,7 @@
    } else {
       // some type names have ':'. replace to make it as a 
       // JavaScript identifier
-      tmp.name = tmp.name.replace(':', '_');
+      tmp.name = tmp.name.replace(':', '_').replace('<', '_').replace('>', '_').replace('*', '_').replace(' ', '_');
       eval("function read" + tmp.name + "(addr) {" +
            "   return readVMType('" + tmp.name + "', addr);}"); 
       eval("function print" + tmp.name + "(addr) {" + 
diff -r 39e409a664b3 -r 84043c7507b9 make/Makefile
--- a/make/Makefile	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/Makefile	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2010 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
@@ -84,6 +84,7 @@
 C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
 C2_VM_TARGETS=product  fastdebug  optimized  jvmg
 KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
+ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
 
 # JDK directory list
 JDK_DIRS=bin include jre lib demo
@@ -94,6 +95,12 @@
 all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
 all_optimized: optimized optimized1 optimizedkernel docs export_optimized
 
+allzero:           all_productzero all_fastdebugzero
+all_productzero:   productzero docs export_product
+all_fastdebugzero: fastdebugzero docs export_fastdebug
+all_debugzero:     jvmgzero docs export_debug
+all_optimizedzero: optimizedzero docs export_optimized
+
 # Do everything
 world:         all create_jdk
 
@@ -120,6 +127,10 @@
 	$(CD) $(GAMMADIR)/make; \
 	$(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
 
+$(ZERO_VM_TARGETS):
+	$(CD) $(GAMMADIR)/make; \
+	$(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
+
 # Build compiler1 (client) rule, different for platforms
 generic_build1:
 	$(MKDIR) -p $(OUTPUTDIR)
@@ -180,6 +191,12 @@
 	@$(ECHO) "No kernel ($(VM_TARGET)) for OS_NAME=$(OSNAME)"
 endif
 
+generic_buildzero:
+	$(MKDIR) -p $(OUTPUTDIR)
+	$(CD) $(OUTPUTDIR); \
+		$(MAKE) -f $(ABS_OS_MAKEFILE) \
+			$(MAKE_ARGS) $(VM_TARGET)
+
 # Export file rule
 generic_export: $(EXPORT_LIST)
 export_product:
@@ -210,11 +227,17 @@
 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
 C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
 KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
+ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
 C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
 KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
+ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
 
 # Misc files and generated files need to come from C1 or C2 area
+ifeq ($(ZERO_BUILD), true)
+  MISC_DIR=$(ZERO_DIR)
+  GEN_DIR=$(ZERO_BASE_DIR)/generated
+else
 ifeq ($(ARCH_DATA_MODEL), 32)
   MISC_DIR=$(C1_DIR)
   GEN_DIR=$(C1_BASE_DIR)/generated
@@ -222,6 +245,7 @@
   MISC_DIR=$(C2_DIR)
   GEN_DIR=$(C2_BASE_DIR)/generated
 endif
+endif
 
 # Bin files (windows)
 ifeq ($(OSNAME),windows)
@@ -265,6 +289,12 @@
 
 # Shared Library
 ifneq ($(OSNAME),windows)
+  ifeq ($(ZERO_BUILD), true)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.so:       $(ZERO_DIR)/%.so
+	$(install-file)
+  else
 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
 	$(install-file)
 $(EXPORT_CLIENT_DIR)/%.so:       $(C1_DIR)/%.so
@@ -275,16 +305,20 @@
 	$(install-file)
 $(EXPORT_SERVER_DIR)/64/%.so:    $(C2_DIR)/%.so
 	$(install-file)
+  endif
 endif
 
 # Jar file (sa-jdi.jar)
 $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
 	$(install-file)
 
-# Include files (jvmti.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h)
+# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h)
 $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
 	$(install-file)
 
+$(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
+	$(install-file)
+
 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/%
 	$(install-file)
 
@@ -313,6 +347,7 @@
 	$(RM) -r $(C1_DIR)
 	$(RM) -r $(C2_DIR)
 	$(RM) -r $(KERNEL_DIR)
+	$(RM) -r $(ZERO_DIR)
 clean_export:
 	$(RM) -r $(EXPORT_PATH)
 clean_jdk:
@@ -335,8 +370,10 @@
 	 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
 
 test_jdk:
-  ifeq ($(ARCH_DATA_MODEL), 32)
+  ifneq ($(ZERO_BUILD), true)
+    ifeq ($(ARCH_DATA_MODEL), 32)
 	$(JDK_IMAGE_DIR)/bin/java -client -version
+    endif
   endif
 	$(JDK_IMAGE_DIR)/bin/java -server -version
 
diff -r 39e409a664b3 -r 84043c7507b9 make/defs.make
--- a/make/defs.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/defs.make	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2006-2010 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
@@ -192,13 +192,14 @@
 
   # Use uname output for SRCARCH, but deal with platform differences. If ARCH
   # is not explicitly listed below, it is treated as x86. 
-  SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64,$(ARCH)))
+  SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 zero,$(ARCH)))
   ARCH/       = x86
   ARCH/sparc  = sparc
   ARCH/sparc64= sparc
   ARCH/ia64   = ia64
   ARCH/amd64  = x86
   ARCH/x86_64 = x86
+  ARCH/zero   = zero
 
   # BUILDARCH is usually the same as SRCARCH, except for sparcv9
   BUILDARCH = $(SRCARCH)
@@ -222,8 +223,9 @@
   LIBARCH/sparc   = sparc
   LIBARCH/sparcv9 = sparcv9
   LIBARCH/ia64    = ia64
+  LIBARCH/zero    = $(ZERO_LIBARCH)
 
-  LP64_ARCH = sparcv9 amd64 ia64
+  LP64_ARCH = sparcv9 amd64 ia64 zero
 endif
 
 # Required make macro settings for all platforms
@@ -259,6 +261,7 @@
 
 # Common export list of files
 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h
+EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
diff -r 39e409a664b3 -r 84043c7507b9 make/hotspot_version
--- a/make/hotspot_version	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/hotspot_version	Thu Mar 25 16:54:59 2010 -0700
@@ -33,9 +33,9 @@
 # Don't put quotes (fail windows build).
 HOTSPOT_VM_COPYRIGHT=Copyright 2009
 
-HS_MAJOR_VER=16
+HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=08
+HS_BUILD_NUMBER=10
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
diff -r 39e409a664b3 -r 84043c7507b9 make/jprt.gmk
--- a/make/jprt.gmk	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/jprt.gmk	Thu Mar 25 16:54:59 2010 -0700
@@ -29,17 +29,24 @@
   MILESTONE=$(JPRT_BUILD_VERSION)
 endif
 
+ifeq ($(OSNAME),windows)
+  ZIPFLAGS=-q
+else
+  # store symbolic links as the link
+  ZIPFLAGS=-q -y
+endif
+
 jprt_build_product: all_product copy_product_jdk export_product_jdk
 	( $(CD) $(JDK_IMAGE_DIR) && \
-	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
 
 jprt_build_fastdebug: all_fastdebug copy_fastdebug_jdk export_fastdebug_jdk
 	( $(CD) $(JDK_IMAGE_DIR)/fastdebug && \
-	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
 
 jprt_build_debug: all_debug copy_debug_jdk export_debug_jdk
 	( $(CD) $(JDK_IMAGE_DIR)/debug && \
-	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
+	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
 
 .PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
 
diff -r 39e409a664b3 -r 84043c7507b9 make/jprt.properties
--- a/make/jprt.properties	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/jprt.properties	Thu Mar 25 16:54:59 2010 -0700
@@ -40,6 +40,10 @@
 
 jprt.tools.default.release=${jprt.submit.release}
 
+# Disable syncing the source after builds and tests are done.
+
+jprt.sync.push=false
+
 # Define the Solaris platforms we want for the various releases
 
 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/Makefile
--- a/make/linux/Makefile	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/Makefile	Thu Mar 25 16:54:59 2010 -0700
@@ -132,6 +132,9 @@
 
 endif
 
+# BUILDARCH is set to "zero" for Zero builds.  VARIANTARCH
+# is used to give the build directories meaningful names.
+VARIANTARCH = $(subst i386,i486,$(ZERO_LIBARCH))
 
 # There is a (semi-) regular correspondence between make targets and actions:
 #
@@ -158,6 +161,13 @@
 #       profiledcore    core            <os>_<arch>_core/profiled
 #       productcore     core            <os>_<arch>_core/product
 #
+#       debugzero       zero            <os>_<arch>_zero/debug
+#       fastdebugzero   zero            <os>_<arch>_zero/fastdebug
+#       jvmgzero        zero            <os>_<arch>_zero/jvmg
+#       optimizedzero   zero            <os>_<arch>_zero/optimized
+#       profiledzero    zero            <os>_<arch>_zero/profiled
+#       productzero     zero            <os>_<arch>_zero/product
+#
 # What you get with each target:
 #
 # debug*     - "thin" libjvm_g - debug info linked into the gamma_g launcher
@@ -171,16 +181,22 @@
 # in the build.sh script:
 TARGETS           = debug jvmg fastdebug optimized profiled product
 
-SUBDIR_DOCS       = $(OSNAME)_$(BUILDARCH)_docs
+ifeq ($(ZERO_BUILD), true)
+  SUBDIR_DOCS     = $(OSNAME)_$(VARIANTARCH)_docs
+else
+  SUBDIR_DOCS     = $(OSNAME)_$(BUILDARCH)_docs
+endif
 SUBDIRS_C1        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
 SUBDIRS_C2        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
 SUBDIRS_TIERED    = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
 SUBDIRS_CORE      = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
+SUBDIRS_ZERO      = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
 
 TARGETS_C2        = $(TARGETS)
 TARGETS_C1        = $(addsuffix 1,$(TARGETS))
 TARGETS_TIERED    = $(addsuffix tiered,$(TARGETS))
 TARGETS_CORE      = $(addsuffix core,$(TARGETS))
+TARGETS_ZERO      = $(addsuffix zero,$(TARGETS))
 
 BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
 BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
@@ -196,6 +212,7 @@
 	@echo "  $(TARGETS_C2)"
 	@echo "  $(TARGETS_C1)"
 	@echo "  $(TARGETS_CORE)"
+	@echo "  $(TARGETS_ZERO)"
 
 checks: check_os_version check_j2se_version
 
@@ -245,6 +262,13 @@
 	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 	$(BUILDTREE) VARIANT=core
 
+$(SUBDIRS_ZERO): $(BUILDTREE_MAKE) platform_zero
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+	$(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
+
+platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
+	$(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
+
 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
 
 $(TARGETS_C2):  $(SUBDIRS_C2)
@@ -275,10 +299,18 @@
 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
 endif
 
+$(TARGETS_ZERO):  $(SUBDIRS_ZERO)
+	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ifdef INSTALL
+	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+endif
+
 # Just build the tree, and nothing else:
 tree:      $(SUBDIRS_C2)
 tree1:     $(SUBDIRS_C1)
 treecore:  $(SUBDIRS_CORE)
+treezero:  $(SUBDIRS_ZERO)
 
 # Doc target.  This is the same for all build options.
 #     Hence create a docs directory beside ...$(ARCH)_[...]
@@ -293,20 +325,22 @@
 
 core: jvmgcore productcore
 
+zero: jvmgzero productzero
+
 clean_docs:
 	rm -rf $(SUBDIR_DOCS)
 
-clean_compiler1 clean_compiler2 clean_core:
+clean_compiler1 clean_compiler2 clean_core clean_zero:
 	rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
 
-clean:  clean_compiler2 clean_compiler1 clean_core clean_docs
+clean:  clean_compiler2 clean_compiler1 clean_core clean_zero clean_docs
 
 include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make
 
 #-------------------------------------------------------------------------------
 
-.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE)
-.PHONY: tree tree1 treecore
-.PHONY: all compiler1 compiler2 core
-.PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs
+.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO)
+.PHONY: tree tree1 treecore treezero
+.PHONY: all compiler1 compiler2 core zero
+.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero docs clean_docs
 .PHONY: checks check_os_version check_j2se_version
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/buildtree.make	Thu Mar 25 16:54:59 2010 -0700
@@ -63,20 +63,30 @@
 # For now, until the compiler is less wobbly:
 TESTFLAGS	= -Xbatch -showversion
 
-ifdef USE_SUNCC
-PLATFORM_FILE	= $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
+ifeq ($(ZERO_BUILD), true)
+  PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
 else
-PLATFORM_FILE   = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
+  ifdef USE_SUNCC
+    PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
+  else
+    PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
+  endif
+endif
+
+# Allow overriding of the arch part of the directory but default
+# to BUILDARCH if nothing is specified
+ifeq ($(VARIANTARCH),)
+  VARIANTARCH=$(BUILDARCH)
 endif
 
 ifdef FORCE_TIERED
 ifeq		($(VARIANT),tiered)
-PLATFORM_DIR	= $(OS_FAMILY)_$(BUILDARCH)_compiler2
+PLATFORM_DIR	= $(OS_FAMILY)_$(VARIANTARCH)_compiler2
 else
-PLATFORM_DIR	= $(OS_FAMILY)_$(BUILDARCH)_$(VARIANT)
+PLATFORM_DIR	= $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
 endif
 else
-PLATFORM_DIR    = $(OS_FAMILY)_$(BUILDARCH)_$(VARIANT)
+PLATFORM_DIR    = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
 endif
 
 #
@@ -321,6 +331,7 @@
 DATA_MODE/sparcv9 = 64
 DATA_MODE/amd64   = 64
 DATA_MODE/ia64    = 64
+DATA_MODE/zero    = $(ARCH_DATA_MODEL)
 
 JAVA_FLAG/32 = -d32
 JAVA_FLAG/64 = -d64
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/debug.make
--- a/make/linux/makefiles/debug.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/debug.make	Thu Mar 25 16:54:59 2010 -0700
@@ -38,7 +38,7 @@
  "Please use 'make jvmg' to build debug JVM.                            \n" \
  "----------------------------------------------------------------------\n")
 
-G_SUFFIX =
+G_SUFFIX = _g
 VERSION = debug
 SYSDEFS += -DASSERT -DDEBUG
 PICFLAGS = DEFAULT
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/defs.make
--- a/make/linux/makefiles/defs.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/defs.make	Thu Mar 25 16:54:59 2010 -0700
@@ -37,6 +37,17 @@
   ARCH_DATA_MODEL ?= 32
 endif
 
+# zero
+ifeq ($(ZERO_BUILD), true)
+  ifeq ($(ARCH_DATA_MODEL), 64)
+    MAKE_ARGS      += LP64=1
+  endif
+  PLATFORM         = linux-zero
+  VM_PLATFORM      = linux_$(subst i386,i486,$(ZERO_LIBARCH))
+  HS_ARCH          = zero
+  ARCH             = zero
+endif
+
 # ia64
 ifeq ($(ARCH), ia64)
   ARCH_DATA_MODEL = 64
@@ -93,21 +104,25 @@
 VM_DEBUG=jvmg
 
 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
+
+# client and server subdirectories have symbolic links to ../libjsig.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
+
 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-ifeq ($(ARCH_DATA_MODEL), 32)
-  EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
-  EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
-  EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 
-else
-  ifeq ($(ARCH),ia64)
-    else
-      EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
-      EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
+ifneq ($(ZERO_BUILD), true)
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
+    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+    EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 
+  else
+    ifeq ($(ARCH),ia64)
+      else
+        EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+        EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
     endif
+  endif
 endif
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/fastdebug.make
--- a/make/linux/makefiles/fastdebug.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/fastdebug.make	Thu Mar 25 16:54:59 2010 -0700
@@ -58,7 +58,7 @@
 # Linker mapfile
 MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
 
-G_SUFFIX =
+G_SUFFIX = _g
 VERSION = optimized
 SYSDEFS += -DASSERT -DFASTDEBUG
 PICFLAGS = DEFAULT
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/gcc.make	Thu Mar 25 16:54:59 2010 -0700
@@ -52,6 +52,9 @@
 VM_PICFLAG/AOUT   =
 VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
 
+ifeq ($(ZERO_BUILD), true)
+CFLAGS += $(LIBFFI_CFLAGS)
+endif
 CFLAGS += $(VM_PICFLAG)
 CFLAGS += -fno-rtti
 CFLAGS += -fno-exceptions
@@ -64,6 +67,7 @@
 ARCHFLAG/ia64    =
 ARCHFLAG/sparc   = -m32 -mcpu=v9
 ARCHFLAG/sparcv9 = -m64 -mcpu=v9
+ARCHFLAG/zero    = $(ZERO_ARCHFLAG)
 
 CFLAGS     += $(ARCHFLAG)
 AOUT_FLAGS += $(ARCHFLAG)
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/jsig.make
--- a/make/linux/makefiles/jsig.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/jsig.make	Thu Mar 25 16:54:59 2010 -0700
@@ -25,9 +25,12 @@
 # Rules to build signal interposition library, used by vm.make
 
 # libjsig[_g].so: signal interposition library
-JSIG = jsig$(G_SUFFIX)
+JSIG = jsig
 LIBJSIG = lib$(JSIG).so
 
+JSIG_G    = $(JSIG)$(G_SUFFIX)
+LIBJSIG_G = lib$(JSIG_G).so
+
 JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
 
 DEST_JSIG  = $(JDK_LIBDIR)/$(LIBJSIG)
@@ -50,6 +53,7 @@
 	@echo Making signal interposition lib...
 	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                          $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
+	$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
 
 install_jsig: $(LIBJSIG)
 	@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/jvmg.make
--- a/make/linux/makefiles/jvmg.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/jvmg.make	Thu Mar 25 16:54:59 2010 -0700
@@ -35,7 +35,7 @@
 # Linker mapfile
 MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
 
-G_SUFFIX =
+G_SUFFIX = _g
 VERSION = debug
 SYSDEFS += -DASSERT -DDEBUG
 PICFLAGS = DEFAULT
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/jvmti.make
--- a/make/linux/makefiles/jvmti.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/jvmti.make	Thu Mar 25 16:54:59 2010 -0700
@@ -70,10 +70,10 @@
 both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
 
 $(JvmtiGenClass): $(JvmtiGenSource)
-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiGenSource)
+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
 
 $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
 
 $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
 	@echo Generating $@
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/launcher.make
--- a/make/linux/makefiles/launcher.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/launcher.make	Thu Mar 25 16:54:59 2010 -0700
@@ -25,7 +25,9 @@
 # Rules to build gamma launcher, used by vm.make
 
 # gamma[_g]: launcher
-LAUNCHER = gamma$(G_SUFFIX)
+
+LAUNCHER   = gamma
+LAUNCHER_G = $(LAUNCHER)$(G_SUFFIX)
 
 LAUNCHERDIR   = $(GAMMADIR)/src/os/$(Platform_os_family)/launcher
 LAUNCHERFLAGS = $(ARCHFLAG) \
@@ -70,4 +72,5 @@
 	    $(LINK_LAUNCHER/PRE_HOOK) \
 	    $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \
 	    $(LINK_LAUNCHER/POST_HOOK) \
+	    [ -f $(LAUNCHER_G) ] || { ln -s $@ $(LAUNCHER_G); }; \
         }
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/mapfile-vers-debug
--- a/make/linux/makefiles/mapfile-vers-debug	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/mapfile-vers-debug	Thu Mar 25 16:54:59 2010 -0700
@@ -74,6 +74,7 @@
                 JVM_CurrentTimeMillis;
                 JVM_DefineClass;
                 JVM_DefineClassWithSource;
+                JVM_DefineClassWithSourceCond;
                 JVM_DesiredAssertionStatus;
                 JVM_DisableCompiler;
                 JVM_DoPrivileged;
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/mapfile-vers-product
--- a/make/linux/makefiles/mapfile-vers-product	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/mapfile-vers-product	Thu Mar 25 16:54:59 2010 -0700
@@ -74,6 +74,7 @@
                 JVM_CurrentTimeMillis;
                 JVM_DefineClass;
                 JVM_DefineClassWithSource;
+                JVM_DefineClassWithSourceCond;
                 JVM_DesiredAssertionStatus;
                 JVM_DisableCompiler;
                 JVM_DoPrivileged;
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/rules.make
--- a/make/linux/makefiles/rules.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/rules.make	Thu Mar 25 16:54:59 2010 -0700
@@ -122,12 +122,20 @@
 endif
 endif
 
+COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS)
+
 SUM = /usr/bin/sum
 
 # 'gmake MAKE_VERBOSE=y' gives all the gory details.
 QUIETLY$(MAKE_VERBOSE)  = @
 RUN.JAR$(MAKE_VERBOSE) += >/dev/null
 
+# Settings for javac
+BOOT_SOURCE_LANGUAGE_VERSION = 6
+BOOT_TARGET_CLASS_VERSION = 6
+JAVAC_FLAGS = -g -encoding ascii
+BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
 # With parallel makes, print a message at the end of compilation.
 ifeq    ($(findstring j,$(MFLAGS)),j)
 COMPILE_DONE    = && { echo Done with $<; }
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/sa.make
--- a/make/linux/makefiles/sa.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/sa.make	Thu Mar 25 16:54:59 2010 -0700
@@ -52,10 +52,10 @@
 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
 
 # if $(AGENT_DIR) does not exist, we don't build SA
-# also, we don't build SA on Itanium.
+# also, we don't build SA on Itanium or zero.
 
 all: 
-	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
+	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
 	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
 	fi
 
@@ -74,8 +74,8 @@
 	  mkdir -p $(SA_CLASSDIR);        \
 	fi
 
-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
 
 	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
 	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/saproc.make
--- a/make/linux/makefiles/saproc.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/saproc.make	Thu Mar 25 16:54:59 2010 -0700
@@ -25,9 +25,13 @@
 # Rules to build serviceability agent library, used by vm.make
 
 # libsaproc[_g].so: serviceability agent
-SAPROC = saproc$(G_SUFFIX)
+
+SAPROC = saproc
 LIBSAPROC = lib$(SAPROC).so
 
+SAPROC_G = $(SAPROC)$(G_SUFFIX)
+LIBSAPROC_G = lib$(SAPROC_G).so
+
 AGENT_DIR = $(GAMMADIR)/agent
 
 SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
@@ -49,10 +53,10 @@
 endif
 
 # if $(AGENT_DIR) does not exist, we don't build SA
-# also, we don't build SA on Itanium.
+# also, we don't build SA on Itanium or zero.
 
 checkAndBuildSA:
-	$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
+	$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
 	   $(MAKE) -f vm.make $(LIBSAPROC); \
 	fi
 
@@ -75,6 +79,7 @@
 	           $(SA_DEBUG_CFLAGS)                                   \
 	           -o $@                                                \
 	           -lthread_db
+	$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
 
 install_saproc: checkAndBuildSA
 	$(QUIETLY) if [ -e $(LIBSAPROC) ] ; then             \
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/top.make
--- a/make/linux/makefiles/top.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/top.make	Thu Mar 25 16:54:59 2010 -0700
@@ -24,7 +24,7 @@
 
 # top.make is included in the Makefile in the build directories.
 # It DOES NOT include the vm dependency info in order to be faster.
-# It's main job is to implement the incremental form of make lists.
+# Its main job is to implement the incremental form of make lists.
 # It also:
 #   -builds and runs adlc via adlc.make
 #   -generates JVMTI source and docs via jvmti.make (JSR-163)
@@ -74,6 +74,7 @@
 Include_DBs/COMPILER1   = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
 Include_DBs/COMPILER2   = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
 Include_DBs/TIERED      = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
+Include_DBs/ZERO        = $(Include_DBs/CORE) $(VM)/includeDB_zero
 Include_DBs = $(Include_DBs/$(TYPE))
 
 Cached_plat = $(GENERATED)/platform.current
@@ -114,7 +115,7 @@
 # make makeDeps: (and zap the cached db files to force a nonincremental run)
 
 $(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
-	@$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -g -d $(GENERATED) $(MakeDepsSources)
+	@$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
 	@echo Removing $(Incremental_Lists) to force regeneration.
 	@rm -f $(Incremental_Lists)
 	@$(CDG) echo >$(Cached_plat)
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/linux/makefiles/vm.make	Thu Mar 25 16:54:59 2010 -0700
@@ -40,7 +40,11 @@
 include $(GENERATED)/Dependencies
 
 # read machine-specific adjustments (%%% should do this via buildtree.make?)
-include $(MAKEFILES_DIR)/$(BUILDARCH).make
+ifeq ($(ZERO_BUILD), true)
+  include $(MAKEFILES_DIR)/zeroshark.make
+else
+  include $(MAKEFILES_DIR)/$(BUILDARCH).make
+endif
 
 # set VPATH so make knows where to look for source files
 # Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
@@ -109,8 +113,9 @@
 #----------------------------------------------------------------------
 # JVM
 
-JVM    = jvm$(G_SUFFIX)
-LIBJVM = lib$(JVM).so
+JVM      = jvm
+LIBJVM   = lib$(JVM).so
+LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
 
 JVM_OBJ_FILES = $(Obj_Files)
 
@@ -124,7 +129,11 @@
 	rm -f $@
 	cat $^ > $@
 
-STATIC_CXX = true
+ifeq ($(ZERO_LIBARCH), ppc64)
+  STATIC_CXX = false
+else
+  STATIC_CXX = true
+endif
 
 ifeq ($(LINK_INTO),AOUT)
   LIBJVM.o                 =
@@ -148,6 +157,9 @@
 
   LIBS_VM                  += $(LIBS)
 endif
+ifeq ($(ZERO_BUILD), true)
+  LIBS_VM += $(LIBFFI_LIBS)
+endif
 
 LINK_VM = $(LINK_LIB.c)
 
@@ -190,6 +202,7 @@
 		       $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM);       \
 	    $(LINK_LIB.CC/POST_HOOK)                                    \
 	    rm -f $@.1; ln -s $@ $@.1;                                  \
+	    [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
 	    if [ -x /usr/sbin/selinuxenabled ] ; then                   \
 	      /usr/sbin/selinuxenabled;                                 \
               if [ $$? = 0 ] ; then					\
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/zero.make
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/linux/makefiles/zero.make	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,32 @@
+#
+# Copyright 1999-2008 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.
+#  
+#
+
+# Setup for Zero (non-Shark) version of VM
+
+# Select which includeDB files to use (in top.make)
+TYPE = ZERO
+
+# Install libjvm.so, etc in in server directory.
+VM_SUBDIR = server
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/makefiles/zeroshark.make
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/linux/makefiles/zeroshark.make	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,43 @@
+#
+# Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007, 2008 Red Hat, Inc.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+#
+
+# Setup common to Zero (non-Shark) and Shark versions of VM
+
+# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
+
+# Specify that the CPU is little endian, if necessary
+ifeq ($(ZERO_ENDIANNESS), little)
+  CFLAGS += -DVM_LITTLE_ENDIAN
+endif
+
+# Specify that the CPU is 64 bit, if necessary
+ifeq ($(ARCH_DATA_MODEL), 64)
+  CFLAGS += -D_LP64=1
+endif
+
+OPT_CFLAGS/compactingPermGenGen.o = -O1
diff -r 39e409a664b3 -r 84043c7507b9 make/linux/platform_zero.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/linux/platform_zero.in	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,17 @@
+os_family = linux
+
+arch = zero
+
+arch_model = zero
+
+os_arch = linux_zero
+
+os_arch_model = linux_zero
+
+lib_arch = zero
+
+compiler = gcc
+
+gnu_dis_arch = zero
+
+sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/debug.make
--- a/make/solaris/makefiles/debug.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/debug.make	Thu Mar 25 16:54:59 2010 -0700
@@ -54,7 +54,7 @@
  "Please use 'gnumake jvmg' to build debug JVM.                            \n" \
  "-------------------------------------------------------------------------\n")
 
-G_SUFFIX =
+G_SUFFIX = _g
 VERSION = debug
 SYSDEFS += -DASSERT -DDEBUG
 PICFLAGS = DEFAULT
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/defs.make
--- a/make/solaris/makefiles/defs.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/defs.make	Thu Mar 25 16:54:59 2010 -0700
@@ -65,16 +65,18 @@
 VM_DEBUG=jvmg
 
 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
+
+# client and server subdirectories have symbolic links to ../libjsig.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
+
 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.so
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.so
 ifeq ($(ARCH_DATA_MODEL), 32)
   EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so 
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so 
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/dtrace.make
--- a/make/solaris/makefiles/dtrace.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/dtrace.make	Thu Mar 25 16:54:59 2010 -0700
@@ -24,8 +24,8 @@
 
 # Rules to build jvm_db/dtrace, used by vm.make
 
-# we build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
-# but not for CORE configuration
+# We build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
+# but not for CORE or KERNEL configurations.
 
 ifneq ("${TYPE}", "CORE")
 ifneq ("${TYPE}", "KERNEL")
@@ -37,12 +37,13 @@
 
 else
 
-
 JVM_DB = libjvm_db
-LIBJVM_DB = libjvm$(G_SUFFIX)_db.so
+LIBJVM_DB = libjvm_db.so
+LIBJVM_DB_G = libjvm$(G_SUFFIX)_db.so
 
 JVM_DTRACE = jvm_dtrace
-LIBJVM_DTRACE = libjvm$(G_SUFFIX)_dtrace.so
+LIBJVM_DTRACE = libjvm_dtrace.so
+LIBJVM_DTRACE_G = libjvm$(G_SUFFIX)_dtrace.so
 
 JVMOFFS = JvmOffsets
 JVMOFFS.o = $(JVMOFFS).o
@@ -77,7 +78,7 @@
 LFLAGS_JVM_DTRACE += -D_REENTRANT $(PICFLAG)
 else
 LFLAGS_JVM_DB += -mt $(PICFLAG) -xnolib
-LFLAGS_JVM_DTRACE += -mt $(PICFLAG) -xnolib
+LFLAGS_JVM_DTRACE += -mt $(PICFLAG) -xnolib -ldl
 endif
 
 ISA = $(subst i386,i486,$(shell isainfo -n))
@@ -86,18 +87,24 @@
 ifneq ("${ISA}","${BUILDARCH}")
 
 XLIBJVM_DB = 64/$(LIBJVM_DB)
+XLIBJVM_DB_G = 64/$(LIBJVM_DB_G)
 XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE)
+XLIBJVM_DTRACE_G = 64/$(LIBJVM_DTRACE_G)
 
 $(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
 	@echo Making $@
 	$(QUIETLY) mkdir -p 64/ ; \
 	$(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \
 		$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
+	[ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); }
+
 $(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
 	@echo Making $@
 	$(QUIETLY) mkdir -p 64/ ; \
 	$(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \
 		$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
+	[ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); }
+
 endif # ifneq ("${ISA}","${BUILDARCH}")
 
 ifdef USE_GCC
@@ -142,11 +149,13 @@
 	@echo Making $@
 	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
 		$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
+	[ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); }
 
 $(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
 	@echo Making $@
 	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I.  \
 		$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
+	[ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); }
 
 $(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \
              $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/fastdebug.make
--- a/make/solaris/makefiles/fastdebug.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/fastdebug.make	Thu Mar 25 16:54:59 2010 -0700
@@ -90,7 +90,6 @@
 # for this method for now. (fix this when dtrace bug 6258412 is fixed)
 OPT_CFLAGS/ciEnv.o = $(OPT_CFLAGS) -xinline=no%__1cFciEnvbFpost_compiled_method_load_event6MpnHnmethod__v_
 
-
 # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
 
 # If you set HOTSPARC_GENERIC=yes, you disable all OPT_CFLAGS settings
@@ -115,8 +114,7 @@
 # and mustn't be otherwise.
 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
-
-G_SUFFIX =
+G_SUFFIX = _g
 VERSION = optimized
 SYSDEFS += -DASSERT -DFASTDEBUG -DCHECK_UNHANDLED_OOPS
 PICFLAGS = DEFAULT
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/jsig.make
--- a/make/solaris/makefiles/jsig.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/jsig.make	Thu Mar 25 16:54:59 2010 -0700
@@ -25,8 +25,11 @@
 # Rules to build signal interposition library, used by vm.make
 
 # libjsig[_g].so: signal interposition library
-JSIG = jsig$(G_SUFFIX)
-LIBJSIG = lib$(JSIG).so
+JSIG      = jsig
+LIBJSIG   = lib$(JSIG).so
+
+JSIG_G    = $(JSIG)$(G_SUFFIX)
+LIBJSIG_G = lib$(JSIG_G).so
 
 JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
 
@@ -46,6 +49,7 @@
 	@echo Making signal interposition lib...
 	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                          $(LFLAGS_JSIG) -o $@ $< -ldl
+	[ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
 
 install_jsig: $(LIBJSIG)
 	@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/jvmg.make
--- a/make/solaris/makefiles/jvmg.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/jvmg.make	Thu Mar 25 16:54:59 2010 -0700
@@ -51,7 +51,7 @@
 # and mustn't be otherwise.
 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
-G_SUFFIX =
+G_SUFFIX = _g
 VERSION = debug
 SYSDEFS += -DASSERT -DDEBUG
 PICFLAGS = DEFAULT
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/jvmti.make
--- a/make/solaris/makefiles/jvmti.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/jvmti.make	Thu Mar 25 16:54:59 2010 -0700
@@ -69,10 +69,10 @@
 both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
 
 $(JvmtiGenClass): $(JvmtiGenSource)
-	$(QUIETLY) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiGenSource)
+	$(QUIETLY) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
 
 $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
-	$(QUIETLY) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+	$(QUIETLY) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
 
 $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
 	@echo Generating $@
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/launcher.make
--- a/make/solaris/makefiles/launcher.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/launcher.make	Thu Mar 25 16:54:59 2010 -0700
@@ -25,7 +25,8 @@
 # Rules to build gamma launcher, used by vm.make
 
 # gamma[_g]: launcher
-LAUNCHER = gamma$(G_SUFFIX)
+LAUNCHER   = gamma
+LAUNCHER_G = $(LAUNCHER)$(G_SUFFIX)
 
 LAUNCHERDIR   = $(GAMMADIR)/src/os/$(Platform_os_family)/launcher
 LAUNCHERFLAGS = $(ARCHFLAG) \
@@ -88,5 +89,6 @@
 	    $(LINK_LAUNCHER/PRE_HOOK) \
 	    $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \
 	    $(LINK_LAUNCHER/POST_HOOK) \
+	    [ -f $(LAUNCHER_G) ] || { ln -s $@ $(LAUNCHER_G); }; \
 	    ;; \
 	esac
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/mapfile-vers
--- a/make/solaris/makefiles/mapfile-vers	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/mapfile-vers	Thu Mar 25 16:54:59 2010 -0700
@@ -74,6 +74,7 @@
 		JVM_CurrentTimeMillis;
 		JVM_DefineClass;
 		JVM_DefineClassWithSource;
+		JVM_DefineClassWithSourceCond;
 		JVM_DesiredAssertionStatus;
 		JVM_DisableCompiler;
 		JVM_DoPrivileged;
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/rules.make
--- a/make/solaris/makefiles/rules.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/rules.make	Thu Mar 25 16:54:59 2010 -0700
@@ -122,12 +122,20 @@
 endif
 endif
 
+COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS)
+
 SUM = /usr/bin/sum
 
 # 'gmake MAKE_VERBOSE=y' gives all the gory details.
 QUIETLY$(MAKE_VERBOSE)  = @
 RUN.JAR$(MAKE_VERBOSE) += >/dev/null
 
+# Settings for javac
+BOOT_SOURCE_LANGUAGE_VERSION = 6
+BOOT_TARGET_CLASS_VERSION = 6
+JAVAC_FLAGS = -g -encoding ascii
+BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
 # With parallel makes, print a message at the end of compilation.
 ifeq    ($(findstring j,$(MFLAGS)),j)
 COMPILE_DONE    = && { echo Done with $<; }
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/sa.make
--- a/make/solaris/makefiles/sa.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/sa.make	Thu Mar 25 16:54:59 2010 -0700
@@ -67,8 +67,8 @@
 	$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
 	  mkdir -p $(SA_CLASSDIR);        \
 	fi
-	$(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-	$(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
+	$(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
+	$(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
 	
 	$(QUIETLY) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
 	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/saproc.make
--- a/make/solaris/makefiles/saproc.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/saproc.make	Thu Mar 25 16:54:59 2010 -0700
@@ -25,9 +25,13 @@
 # Rules to build serviceability agent library, used by vm.make
 
 # libsaproc[_g].so: serviceability agent
-SAPROC = saproc$(G_SUFFIX)
+
+SAPROC = saproc
 LIBSAPROC = lib$(SAPROC).so
 
+SAPROC_G = $(SAPROC)$(G_SUFFIX)
+LIBSAPROC_G = lib$(SAPROC_G).so
+
 AGENT_DIR = $(GAMMADIR)/agent
 
 SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)/proc
@@ -69,6 +73,7 @@
 	           $(SA_LFLAGS)                                         \
 	           -o $@                                                \
 	           -ldl -ldemangle -lthread -lc
+	[ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
 
 install_saproc: checkAndBuildSA
 	$(QUIETLY) if [ -f $(LIBSAPROC) ] ; then             \
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/sparcWorks.make
--- a/make/solaris/makefiles/sparcWorks.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/sparcWorks.make	Thu Mar 25 16:54:59 2010 -0700
@@ -281,8 +281,6 @@
 OPT_CFLAGS=-xO4 $(EXTRA_OPT_CFLAGS)
 endif
 
-CFLAGS += $(GAMMADIR)/src/os_cpu/solaris_sparc/vm/solaris_sparc.il
-
 endif # sparc
 
 ifeq ("${Platform_arch_model}", "x86_32")
@@ -293,13 +291,14 @@
 # [phh] Is this still true for 6.1?
 OPT_CFLAGS+=-xO3
 
-CFLAGS += $(GAMMADIR)/src/os_cpu/solaris_x86/vm/solaris_x86_32.il
-
 endif # 32bit x86
 
 # no more exceptions
 CFLAGS/NOEX=-noex
 
+# Inline functions
+CFLAGS += $(GAMMADIR)/src/os_cpu/solaris_${Platform_arch}/vm/solaris_${Platform_arch_model}.il
+
 # Reduce code bloat by reverting back to 5.0 behavior for static initializers
 CFLAGS += -Qoption ccfe -one_static_init
 
@@ -312,6 +311,15 @@
 PICFLAG/BETTER  = $(PICFLAG/DEFAULT)
 PICFLAG/BYFILE  = $(PICFLAG/$@)$(PICFLAG/DEFAULT$(PICFLAG/$@))
 
+# Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
+MAPFLAG = -M FILENAME
+
+# Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
+SONAMEFLAG = -h SONAME
+
+# Build shared library
+SHARED_FLAG = -G
+
 # Would be better if these weren't needed, since we link with CC, but
 # at present removing them causes run-time errors
 LFLAGS += -library=Crun
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/top.make
--- a/make/solaris/makefiles/top.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/top.make	Thu Mar 25 16:54:59 2010 -0700
@@ -24,7 +24,7 @@
 
 # top.make is included in the Makefile in the build directories.
 # It DOES NOT include the vm dependency info in order to be faster.
-# It's main job is to implement the incremental form of make lists.
+# Its main job is to implement the incremental form of make lists.
 # It also:
 #   -builds and runs adlc via adlc.make
 #   -generates JVMTI source and docs via jvmti.make (JSR-163)
@@ -112,7 +112,7 @@
 # make makeDeps: (and zap the cached db files to force a nonincremental run)
 
 $(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
-	@$(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -g -d $(GENERATED) $(MakeDepsSources)
+	@$(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
 	@echo Removing $(Incremental_Lists) to force regeneration.
 	@rm -f $(Incremental_Lists)
 	@$(CDG) echo >$(Cached_plat)
diff -r 39e409a664b3 -r 84043c7507b9 make/solaris/makefiles/vm.make
--- a/make/solaris/makefiles/vm.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/solaris/makefiles/vm.make	Thu Mar 25 16:54:59 2010 -0700
@@ -108,11 +108,16 @@
 #   older libm before libCrun, just to make sure it's found and used first.
 LIBS += -lsocket -lsched -ldl $(LIBM) -lCrun -lthread -ldoor -lc
 else
+ifeq ($(COMPILER_REV_NUMERIC), 502)
+# SC6.1 has it's own libm.so: specifying anything else provokes a name conflict.
+LIBS += -ldl -lthread -lsocket -lm -lsched -ldoor
+else
 LIBS += -ldl -lthread -lsocket $(LIBM) -lsched -ldoor
-endif
+endif # 502
+endif # 505
 else
 LIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc
-endif
+endif # sparcWorks
 
 # By default, link the *.o into the library, not the executable.
 LINK_INTO$(LINK_INTO) = LIBJVM
@@ -126,8 +131,9 @@
 #----------------------------------------------------------------------
 # JVM
 
-JVM    = jvm$(G_SUFFIX)
-LIBJVM = lib$(JVM).so
+JVM      = jvm
+LIBJVM   = lib$(JVM).so
+LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
 
 JVM_OBJ_FILES = $(Obj_Files) $(DTRACE_OBJS)
 
@@ -173,11 +179,12 @@
 	-sbfast|-xsbfast) \
 	    ;; \
 	*) \
-	    echo Linking vm...;                                                  \
-	    $(LINK_LIB.CC/PRE_HOOK)                                              \
-	    $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM);                \
-	    $(LINK_LIB.CC/POST_HOOK)                                             \
-	    rm -f $@.1; ln -s $@ $@.1;                                           \
+	    echo Linking vm...; \
+	    $(LINK_LIB.CC/PRE_HOOK) \
+	    $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
+	    $(LINK_LIB.CC/POST_HOOK) \
+	    rm -f $@.1; ln -s $@ $@.1; \
+	    [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
 	    ;; \
 	esac
 
diff -r 39e409a664b3 -r 84043c7507b9 make/windows/makefiles/generated.make
--- a/make/windows/makefiles/generated.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/windows/makefiles/generated.make	Thu Mar 25 16:54:59 2010 -0700
@@ -91,7 +91,7 @@
 classes/MakeDeps.class: $(MakeDepsSources)
 	if exist classes rmdir /s /q classes
 	mkdir classes
-	$(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -g -d classes $(MakeDepsSources)
+	$(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -d classes $(MakeDepsSources)
 
 !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
 
diff -r 39e409a664b3 -r 84043c7507b9 make/windows/makefiles/jvmti.make
--- a/make/windows/makefiles/jvmti.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/windows/makefiles/jvmti.make	Thu Mar 25 16:54:59 2010 -0700
@@ -68,10 +68,10 @@
         @if not exist $(JvmtiOutDir) mkdir $(JvmtiOutDir)
 
 $(JvmtiGenClass): $(JvmtiGenSource)
-	$(COMPILE_JAVAC) -g -d $(JvmtiOutDir) $(JvmtiGenSource)
+	$(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
 
 $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
-	@$(COMPILE_JAVAC) -g -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+	@$(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
 
 $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
 	@echo Generating $@
diff -r 39e409a664b3 -r 84043c7507b9 make/windows/makefiles/rules.make
--- a/make/windows/makefiles/rules.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/windows/makefiles/rules.make	Thu Mar 25 16:54:59 2010 -0700
@@ -29,7 +29,7 @@
 RUN_JAVAP=$(BootStrapDir)\bin\javap
 RUN_JAVAH=$(BootStrapDir)\bin\javah
 RUN_JAR=$(BootStrapDir)\bin\jar
-COMPILE_JAVAC=$(BootStrapDir)\bin\javac
+COMPILE_JAVAC=$(BootStrapDir)\bin\javac $(BOOTSTRAP_JAVAC_FLAGS)
 COMPILE_RMIC=$(BootStrapDir)\bin\rmic
 BOOT_JAVA_HOME=$(BootStrapDir)
 !else
@@ -37,11 +37,17 @@
 RUN_JAVAP=javap
 RUN_JAVAH=javah
 RUN_JAR=jar
-COMPILE_JAVAC=javac
+COMPILE_JAVAC=javac $(BOOTSTRAP_JAVAC_FLAGS)
 COMPILE_RMIC=rmic
 BOOT_JAVA_HOME=
 !endif
 
+# Settings for javac
+BOOT_SOURCE_LANGUAGE_VERSION=6
+BOOT_TARGET_CLASS_VERSION=6
+JAVAC_FLAGS=-g -encoding ascii
+BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
 ProjectFile=vm.vcproj
 
 !if "$(MSC_VER)" == "1200"
diff -r 39e409a664b3 -r 84043c7507b9 make/windows/makefiles/sa.make
--- a/make/windows/makefiles/sa.make	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/windows/makefiles/sa.make	Thu Mar 25 16:54:59 2010 -0700
@@ -55,9 +55,9 @@
 $(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\)
 	@if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR)
 	@echo ...Building sa-jdi.jar
-	@echo ...$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) ....
-	@$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
-	@$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
+	@echo ...$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) ....
+	@$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
+	@$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
 	$(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
 	$(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES)
 	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
diff -r 39e409a664b3 -r 84043c7507b9 make/windows/projectfiles/common/Makefile
--- a/make/windows/projectfiles/common/Makefile	Thu Mar 25 16:27:12 2010 -0700
+++ b/make/windows/projectfiles/common/Makefile	Thu Mar 25 16:54:59 2010 -0700
@@ -179,6 +179,6 @@
 $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class: $(MakeDepsSources)
 	@if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes
 	@mkdir $(HOTSPOTBUILDSPACE)\classes
-	@$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps -g -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources)
+	@$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources)
 
 FORCE:
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/assembler_sparc.cpp
--- a/src/cpu/sparc/vm/assembler_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/assembler_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -2631,13 +2631,13 @@
       (src.is_register() && src.as_register() == G0)) {
     // do nothing
   } else if (dest.is_register()) {
-    add(dest.as_register(), ensure_rs2(src, temp), dest.as_register());
+    add(dest.as_register(), ensure_simm13_or_reg(src, temp), dest.as_register());
   } else if (src.is_constant()) {
     intptr_t res = dest.as_constant() + src.as_constant();
     dest = RegisterOrConstant(res); // side effect seen by caller
   } else {
     assert(temp != noreg, "cannot handle constant += register");
-    add(src.as_register(), ensure_rs2(dest, temp), temp);
+    add(src.as_register(), ensure_simm13_or_reg(dest, temp), temp);
     dest = RegisterOrConstant(temp); // side effect seen by caller
   }
 }
@@ -2710,7 +2710,7 @@
   RegisterOrConstant itable_offset = itable_index;
   regcon_sll_ptr(itable_offset, exact_log2(itableMethodEntry::size() * wordSize));
   regcon_inc_ptr(itable_offset, itableMethodEntry::method_offset_in_bytes());
-  add(recv_klass, ensure_rs2(itable_offset, sethi_temp), recv_klass);
+  add(recv_klass, ensure_simm13_or_reg(itable_offset, sethi_temp), recv_klass);
 
   // for (scan = klass->itable(); scan->interface() != NULL; scan += scan_step) {
   //   if (scan->interface() == intf) {
@@ -4676,3 +4676,50 @@
     load_ptr_contents(base, G6_heapbase);
   }
 }
+
+// Compare char[] arrays aligned to 4 bytes.
+void MacroAssembler::char_arrays_equals(Register ary1, Register ary2,
+                                        Register limit, Register result,
+                                        Register chr1, Register chr2, Label& Ldone) {
+  Label Lvector, Lloop;
+  assert(chr1 == result, "should be the same");
+
+  // Note: limit contains number of bytes (2*char_elements) != 0.
+  andcc(limit, 0x2, chr1); // trailing character ?
+  br(Assembler::zero, false, Assembler::pt, Lvector);
+  delayed()->nop();
+
+  // compare the trailing char
+  sub(limit, sizeof(jchar), limit);
+  lduh(ary1, limit, chr1);
+  lduh(ary2, limit, chr2);
+  cmp(chr1, chr2);
+  br(Assembler::notEqual, true, Assembler::pt, Ldone);
+  delayed()->mov(G0, result);     // not equal
+
+  // only one char ?
+  br_on_reg_cond(rc_z, true, Assembler::pn, limit, Ldone);
+  delayed()->add(G0, 1, result); // zero-length arrays are equal
+
+  // word by word compare, dont't need alignment check
+  bind(Lvector);
+  // Shift ary1 and ary2 to the end of the arrays, negate limit
+  add(ary1, limit, ary1);
+  add(ary2, limit, ary2);
+  neg(limit, limit);
+
+  lduw(ary1, limit, chr1);
+  bind(Lloop);
+  lduw(ary2, limit, chr2);
+  cmp(chr1, chr2);
+  br(Assembler::notEqual, true, Assembler::pt, Ldone);
+  delayed()->mov(G0, result);     // not equal
+  inccc(limit, 2*sizeof(jchar));
+  // annul LDUW if branch is not taken to prevent access past end of array
+  br(Assembler::notZero, true, Assembler::pt, Lloop);
+  delayed()->lduw(ary1, limit, chr1); // hoisted
+
+  // Caller should set it:
+  // add(G0, 1, result); // equals
+}
+
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/assembler_sparc.hpp
--- a/src/cpu/sparc/vm/assembler_sparc.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/assembler_sparc.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1279,6 +1279,7 @@
 
   // 171
 
+  inline void ldf(FloatRegisterImpl::Width w, Register s1, RegisterOrConstant s2, FloatRegister d);
   inline void ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d);
   inline void ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec = RelocationHolder());
 
@@ -1535,7 +1536,8 @@
 
   // pp 222
 
-  inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2 );
+  inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, RegisterOrConstant s2);
+  inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2);
   inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, int simm13a);
   inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, const Address& a, int offset = 0);
 
@@ -2049,12 +2051,13 @@
                        Register temp = noreg );
   void regcon_sll_ptr( RegisterOrConstant& dest, RegisterOrConstant src,
                        Register temp = noreg );
-  RegisterOrConstant ensure_rs2(RegisterOrConstant rs2, Register sethi_temp) {
-    guarantee(sethi_temp != noreg, "constant offset overflow");
-    if (is_simm13(rs2.constant_or_zero()))
-      return rs2;               // register or short constant
-    set(rs2.as_constant(), sethi_temp);
-    return sethi_temp;
+
+  RegisterOrConstant ensure_simm13_or_reg(RegisterOrConstant roc, Register Rtemp) {
+    guarantee(Rtemp != noreg, "constant offset overflow");
+    if (is_simm13(roc.constant_or_zero()))
+      return roc;               // register or short constant
+    set(roc.as_constant(), Rtemp);
+    return RegisterOrConstant(Rtemp);
   }
 
   // --------------------------------------------------
@@ -2455,6 +2458,11 @@
   void inc_counter(address counter_addr, Register Rtmp1, Register Rtmp2);
   void inc_counter(int*    counter_addr, Register Rtmp1, Register Rtmp2);
 
+  // Compare char[] arrays aligned to 4 bytes.
+  void char_arrays_equals(Register ary1, Register ary2,
+                          Register limit, Register result,
+                          Register chr1, Register chr2, Label& Ldone);
+
 #undef VIRTUAL
 
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/assembler_sparc.inline.hpp
--- a/src/cpu/sparc/vm/assembler_sparc.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/assembler_sparc.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -99,6 +99,11 @@
 inline void Assembler::jmpl( Register s1, Register s2, Register d                          ) { emit_long( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | rs2(s2));  has_delay_slot(); }
 inline void Assembler::jmpl( Register s1, int simm13a, Register d, RelocationHolder const& rspec ) { emit_data( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec);  has_delay_slot(); }
 
+inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, RegisterOrConstant s2, FloatRegister d) {
+  if (s2.is_register()) ldf(w, s1, s2.as_register(), d);
+  else                  ldf(w, s1, s2.as_constant(), d);
+}
+
 inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d) { emit_long( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | rs2(s2) ); }
 inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); }
 
@@ -224,6 +229,11 @@
 
   // pp 222
 
+inline void Assembler::stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, RegisterOrConstant s2) {
+  if (s2.is_register()) stf(w, d, s1, s2.as_register());
+  else                  stf(w, d, s1, s2.as_constant());
+}
+
 inline void Assembler::stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2) { emit_long( op(ldst_op) | fd(d, w) | alt_op3(stf_op3, w) | rs1(s1) | rs2(s2) ); }
 inline void Assembler::stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, int simm13a) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(stf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
 
@@ -284,6 +294,7 @@
 
 inline void Assembler::stb(Register d, Register s1, RegisterOrConstant s2) { stb(d, Address(s1, s2)); }
 inline void Assembler::sth(Register d, Register s1, RegisterOrConstant s2) { sth(d, Address(s1, s2)); }
+inline void Assembler::stw(Register d, Register s1, RegisterOrConstant s2) { stw(d, Address(s1, s2)); }
 inline void Assembler::stx(Register d, Register s1, RegisterOrConstant s2) { stx(d, Address(s1, s2)); }
 inline void Assembler::std(Register d, Register s1, RegisterOrConstant s2) { std(d, Address(s1, s2)); }
 inline void Assembler::st( Register d, Register s1, RegisterOrConstant s2) { st( d, Address(s1, s2)); }
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/c1_Defs_sparc.hpp
--- a/src/cpu/sparc/vm/c1_Defs_sparc.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/c1_Defs_sparc.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 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
@@ -38,7 +38,7 @@
 // registers
 enum {
   pd_nof_cpu_regs_frame_map = 32,  // number of registers used during code emission
-  pd_nof_caller_save_cpu_regs_frame_map = 6,  // number of cpu registers killed by calls
+  pd_nof_caller_save_cpu_regs_frame_map = 10,  // number of cpu registers killed by calls
   pd_nof_cpu_regs_reg_alloc = 20,  // number of registers that are visible to register allocator
   pd_nof_cpu_regs_linearscan = 32,// number of registers visible linear scan
   pd_first_cpu_reg = 0,
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/c1_FrameMap_sparc.cpp
--- a/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -320,6 +320,10 @@
   _caller_save_cpu_regs[3] = FrameMap::O3_opr;
   _caller_save_cpu_regs[4] = FrameMap::O4_opr;
   _caller_save_cpu_regs[5] = FrameMap::O5_opr;
+  _caller_save_cpu_regs[6] = FrameMap::G1_opr;
+  _caller_save_cpu_regs[7] = FrameMap::G3_opr;
+  _caller_save_cpu_regs[8] = FrameMap::G4_opr;
+  _caller_save_cpu_regs[9] = FrameMap::G5_opr;
   for (int i = 0; i < nof_caller_save_fpu_regs; i++) {
     _caller_save_fpu_regs[i] = LIR_OprFact::single_fpu(i);
   }
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
--- a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2010 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
@@ -189,14 +189,17 @@
   Register OSR_buf = osrBufferPointer()->as_register();
   { assert(frame::interpreter_frame_monitor_size() == BasicObjectLock::size(), "adjust code below");
     int monitor_offset = BytesPerWord * method()->max_locals() +
-      (BasicObjectLock::size() * BytesPerWord) * (number_of_locks - 1);
+      (2 * BytesPerWord) * (number_of_locks - 1);
+    // SharedRuntime::OSR_migration_begin() packs BasicObjectLocks in
+    // the OSR buffer using 2 word entries: first the lock and then
+    // the oop.
     for (int i = 0; i < number_of_locks; i++) {
-      int slot_offset = monitor_offset - ((i * BasicObjectLock::size()) * BytesPerWord);
+      int slot_offset = monitor_offset - ((i * 2) * BytesPerWord);
 #ifdef ASSERT
       // verify the interpreter's monitor has a non-null object
       {
         Label L;
-        __ ld_ptr(OSR_buf, slot_offset + BasicObjectLock::obj_offset_in_bytes(), O7);
+        __ ld_ptr(OSR_buf, slot_offset + 1*BytesPerWord, O7);
         __ cmp(G0, O7);
         __ br(Assembler::notEqual, false, Assembler::pt, L);
         __ delayed()->nop();
@@ -205,9 +208,9 @@
       }
 #endif // ASSERT
       // Copy the lock field into the compiled activation.
-      __ ld_ptr(OSR_buf, slot_offset + BasicObjectLock::lock_offset_in_bytes(), O7);
+      __ ld_ptr(OSR_buf, slot_offset + 0, O7);
       __ st_ptr(O7, frame_map()->address_for_monitor_lock(i));
-      __ ld_ptr(OSR_buf, slot_offset + BasicObjectLock::obj_offset_in_bytes(), O7);
+      __ ld_ptr(OSR_buf, slot_offset + 1*BytesPerWord, O7);
       __ st_ptr(O7, frame_map()->address_for_monitor_object(i));
     }
   }
@@ -354,7 +357,7 @@
 }
 
 
-void LIR_Assembler::emit_exception_handler() {
+int LIR_Assembler::emit_exception_handler() {
   // if the last instruction is a call (typically to do a throw which
   // is coming at the end after block reordering) the return address
   // must still point into the code area in order to avoid assertion
@@ -370,15 +373,12 @@
   if (handler_base == NULL) {
     // not enough space left for the handler
     bailout("exception handler overflow");
-    return;
+    return -1;
   }
-#ifdef ASSERT
+
   int offset = code_offset();
-#endif // ASSERT
-  compilation()->offsets()->set_value(CodeOffsets::Exceptions, code_offset());
-
-
-  if (compilation()->has_exception_handlers() || compilation()->env()->jvmti_can_post_exceptions()) {
+
+  if (compilation()->has_exception_handlers() || compilation()->env()->jvmti_can_post_on_exceptions()) {
     __ call(Runtime1::entry_for(Runtime1::handle_exception_id), relocInfo::runtime_call_type);
     __ delayed()->nop();
   }
@@ -387,11 +387,13 @@
   __ delayed()->nop();
   debug_only(__ stop("should have gone to the caller");)
   assert(code_offset() - offset <= exception_handler_size, "overflow");
-
   __ end_a_stub();
+
+  return offset;
 }
 
-void LIR_Assembler::emit_deopt_handler() {
+
+int LIR_Assembler::emit_deopt_handler() {
   // if the last instruction is a call (typically to do a throw which
   // is coming at the end after block reordering) the return address
   // must still point into the code area in order to avoid assertion
@@ -405,23 +407,18 @@
   if (handler_base == NULL) {
     // not enough space left for the handler
     bailout("deopt handler overflow");
-    return;
+    return -1;
   }
-#ifdef ASSERT
+
   int offset = code_offset();
-#endif // ASSERT
-  compilation()->offsets()->set_value(CodeOffsets::Deopt, code_offset());
-
   AddressLiteral deopt_blob(SharedRuntime::deopt_blob()->unpack());
-
   __ JUMP(deopt_blob, G3_scratch, 0); // sethi;jmp
   __ delayed()->nop();
-
   assert(code_offset() - offset <= deopt_handler_size, "overflow");
-
   debug_only(__ stop("should have gone to the caller");)
-
   __ end_a_stub();
+
+  return offset;
 }
 
 
@@ -953,9 +950,11 @@
         } else {
 #ifdef _LP64
           assert(base != to_reg->as_register_lo(), "can't handle this");
+          assert(O7 != to_reg->as_register_lo(), "can't handle this");
           __ ld(base, offset + hi_word_offset_in_bytes, to_reg->as_register_lo());
+          __ lduw(base, offset + lo_word_offset_in_bytes, O7); // in case O7 is base or offset, use it last
           __ sllx(to_reg->as_register_lo(), 32, to_reg->as_register_lo());
-          __ ld(base, offset + lo_word_offset_in_bytes, to_reg->as_register_lo());
+          __ or3(to_reg->as_register_lo(), O7, to_reg->as_register_lo());
 #else
           if (base == to_reg->as_register_lo()) {
             __ ld(base, offset + hi_word_offset_in_bytes, to_reg->as_register_hi());
@@ -976,8 +975,8 @@
           FloatRegister reg = to_reg->as_double_reg();
           // split unaligned loads
           if (unaligned || PatchALot) {
-            __ ldf(FloatRegisterImpl::S, base, offset + BytesPerWord, reg->successor());
-            __ ldf(FloatRegisterImpl::S, base, offset,                reg);
+            __ ldf(FloatRegisterImpl::S, base, offset + 4, reg->successor());
+            __ ldf(FloatRegisterImpl::S, base, offset,     reg);
           } else {
             __ ldf(FloatRegisterImpl::D, base, offset, to_reg->as_double_reg());
           }
@@ -2171,7 +2170,7 @@
     // subtype which we can't check or src is the same array as dst
     // but not necessarily exactly of type default_type.
     Label known_ok, halt;
-    jobject2reg(op->expected_type()->encoding(), tmp);
+    jobject2reg(op->expected_type()->constant_encoding(), tmp);
     __ ld_ptr(dst, oopDesc::klass_offset_in_bytes(), tmp2);
     if (basic_type != T_OBJECT) {
       __ cmp(tmp, tmp2);
@@ -2200,6 +2199,7 @@
   Register len     = O2;
 
   __ add(src, arrayOopDesc::base_offset_in_bytes(basic_type), src_ptr);
+  LP64_ONLY(__ sra(src_pos, 0, src_pos);) //higher 32bits must be null
   if (shift == 0) {
     __ add(src_ptr, src_pos, src_ptr);
   } else {
@@ -2208,6 +2208,7 @@
   }
 
   __ add(dst, arrayOopDesc::base_offset_in_bytes(basic_type), dst_ptr);
+  LP64_ONLY(__ sra(dst_pos, 0, dst_pos);) //higher 32bits must be null
   if (shift == 0) {
     __ add(dst_ptr, dst_pos, dst_ptr);
   } else {
@@ -2429,7 +2430,7 @@
       assert(data->is_BitData(), "need BitData for checkcast");
       Register mdo      = k_RInfo;
       Register data_val = Rtmp1;
-      jobject2reg(md->encoding(), mdo);
+      jobject2reg(md->constant_encoding(), mdo);
 
       int mdo_offset_bias = 0;
       if (!Assembler::is_simm13(md->byte_offset_of_slot(data, DataLayout::header_offset()) + data->size_in_bytes())) {
@@ -2452,7 +2453,7 @@
     // patching may screw with our temporaries on sparc,
     // so let's do it before loading the class
     if (k->is_loaded()) {
-      jobject2reg(k->encoding(), k_RInfo);
+      jobject2reg(k->constant_encoding(), k_RInfo);
     } else {
       jobject2reg_with_patching(k_RInfo, op->info_for_patch());
     }
@@ -2513,7 +2514,7 @@
     // patching may screw with our temporaries on sparc,
     // so let's do it before loading the class
     if (k->is_loaded()) {
-      jobject2reg(k->encoding(), k_RInfo);
+      jobject2reg(k->constant_encoding(), k_RInfo);
     } else {
       jobject2reg_with_patching(k_RInfo, op->info_for_patch());
     }
@@ -2717,7 +2718,7 @@
   assert(op->tmp1()->is_single_cpu(), "tmp1 must be allocated");
   Register mdo  = op->mdo()->as_register();
   Register tmp1 = op->tmp1()->as_register();
-  jobject2reg(md->encoding(), mdo);
+  jobject2reg(md->constant_encoding(), mdo);
   int mdo_offset_bias = 0;
   if (!Assembler::is_simm13(md->byte_offset_of_slot(data, CounterData::count_offset()) +
                             data->size_in_bytes())) {
@@ -2729,9 +2730,6 @@
   }
 
   Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()) - mdo_offset_bias);
-  __ lduw(counter_addr, tmp1);
-  __ add(tmp1, DataLayout::counter_increment, tmp1);
-  __ stw(tmp1, counter_addr);
   Bytecodes::Code bc = method->java_code_at_bci(bci);
   // Perform additional virtual call profiling for invokevirtual and
   // invokeinterface bytecodes
@@ -2774,7 +2772,7 @@
         if (receiver == NULL) {
           Address recv_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_offset(i)) -
                             mdo_offset_bias);
-          jobject2reg(known_klass->encoding(), tmp1);
+          jobject2reg(known_klass->constant_encoding(), tmp1);
           __ st_ptr(tmp1, recv_addr);
           Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)) -
                             mdo_offset_bias);
@@ -2821,15 +2819,23 @@
         __ set(DataLayout::counter_increment, tmp1);
         __ st_ptr(tmp1, mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)) -
                   mdo_offset_bias);
-        if (i < (VirtualCallData::row_limit() - 1)) {
-          __ br(Assembler::always, false, Assembler::pt, update_done);
-          __ delayed()->nop();
-        }
+        __ br(Assembler::always, false, Assembler::pt, update_done);
+        __ delayed()->nop();
         __ bind(next_test);
       }
+      // Receiver did not match any saved receiver and there is no empty row for it.
+      // Increment total counter to indicate polymorphic case.
+      __ lduw(counter_addr, tmp1);
+      __ add(tmp1, DataLayout::counter_increment, tmp1);
+      __ stw(tmp1, counter_addr);
 
       __ bind(update_done);
     }
+  } else {
+    // Static call
+    __ lduw(counter_addr, tmp1);
+    __ add(tmp1, DataLayout::counter_increment, tmp1);
+    __ stw(tmp1, counter_addr);
   }
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
--- a/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -144,17 +144,17 @@
   if (index->is_register()) {
     // apply the shift and accumulate the displacement
     if (shift > 0) {
-      LIR_Opr tmp = new_register(T_INT);
+      LIR_Opr tmp = new_pointer_register();
       __ shift_left(index, shift, tmp);
       index = tmp;
     }
     if (disp != 0) {
-      LIR_Opr tmp = new_register(T_INT);
+      LIR_Opr tmp = new_pointer_register();
       if (Assembler::is_simm13(disp)) {
-        __ add(tmp, LIR_OprFact::intConst(disp), tmp);
+        __ add(tmp, LIR_OprFact::intptrConst(disp), tmp);
         index = tmp;
       } else {
-        __ move(LIR_OprFact::intConst(disp), tmp);
+        __ move(LIR_OprFact::intptrConst(disp), tmp);
         __ add(tmp, index, tmp);
         index = tmp;
       }
@@ -162,8 +162,8 @@
     }
   } else if (disp != 0 && !Assembler::is_simm13(disp)) {
     // index is illegal so replace it with the displacement loaded into a register
-    index = new_register(T_INT);
-    __ move(LIR_OprFact::intConst(disp), index);
+    index = new_pointer_register();
+    __ move(LIR_OprFact::intptrConst(disp), index);
     disp = 0;
   }
 
@@ -668,7 +668,7 @@
   __ add(obj.result(), offset.result(), addr);
 
   if (type == objectType) {  // Write-barrier needed for Object fields.
-    pre_barrier(obj.result(), false, NULL);
+    pre_barrier(addr, false, NULL);
   }
 
   if (type == objectType)
@@ -749,6 +749,10 @@
 
 void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   assert(x->number_of_arguments() == 5, "wrong type");
+
+  // Make all state_for calls early since they can emit code
+  CodeEmitInfo* info = state_for(x, x->state());
+
   // Note: spill caller save before setting the item
   LIRItem src     (x->argument_at(0), this);
   LIRItem src_pos (x->argument_at(1), this);
@@ -767,7 +771,6 @@
   ciArrayKlass* expected_type;
   arraycopy_helper(x, &flags, &expected_type);
 
-  CodeEmitInfo* info = state_for(x, x->state());
   __ arraycopy(src.result(), src_pos.result(), dst.result(), dst_pos.result(),
                length.result(), rlock_callee_saved(T_INT),
                expected_type, flags, info);
@@ -878,6 +881,9 @@
 
 
 void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
+  // Evaluate state_for early since it may emit code
+  CodeEmitInfo* info = state_for(x, x->state());
+
   LIRItem length(x->length(), this);
   length.load_item();
 
@@ -890,9 +896,8 @@
   LIR_Opr len = length.result();
   BasicType elem_type = x->elt_type();
 
-  __ oop2reg(ciTypeArrayKlass::make(elem_type)->encoding(), klass_reg);
+  __ oop2reg(ciTypeArrayKlass::make(elem_type)->constant_encoding(), klass_reg);
 
-  CodeEmitInfo* info = state_for(x, x->state());
   CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info);
   __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path);
 
@@ -902,7 +907,8 @@
 
 
 void LIRGenerator::do_NewObjectArray(NewObjectArray* x) {
-  LIRItem length(x->length(), this);
+  // Evaluate state_for early since it may emit code.
+  CodeEmitInfo* info = state_for(x, x->state());
   // in case of patching (i.e., object class is not yet loaded), we need to reexecute the instruction
   // and therefore provide the state before the parameters have been consumed
   CodeEmitInfo* patching_info = NULL;
@@ -910,6 +916,7 @@
     patching_info = state_for(x, x->state_before());
   }
 
+  LIRItem length(x->length(), this);
   length.load_item();
 
   const LIR_Opr reg = result_register_for(x->type());
@@ -919,7 +926,6 @@
   LIR_Opr tmp4 = FrameMap::O1_oop_opr;
   LIR_Opr klass_reg = FrameMap::G5_oop_opr;
   LIR_Opr len = length.result();
-  CodeEmitInfo* info = state_for(x, x->state());
 
   CodeStub* slow_path = new NewObjectArrayStub(klass_reg, len, reg, info);
   ciObject* obj = (ciObject*) ciObjArrayKlass::make(x->klass());
@@ -943,25 +949,22 @@
     items->at_put(i, size);
   }
 
-  // need to get the info before, as the items may become invalid through item_free
+  // Evaluate state_for early since it may emit code.
   CodeEmitInfo* patching_info = NULL;
   if (!x->klass()->is_loaded() || PatchALot) {
     patching_info = state_for(x, x->state_before());
 
     // cannot re-use same xhandlers for multiple CodeEmitInfos, so
-    // clone all handlers
+    // clone all handlers.  This is handled transparently in other
+    // places by the CodeEmitInfo cloning logic but is handled
+    // specially here because a stub isn't being used.
     x->set_exception_handlers(new XHandlers(x->exception_handlers()));
   }
+  CodeEmitInfo* info = state_for(x, x->state());
 
   i = dims->length();
   while (i-- > 0) {
     LIRItem* size = items->at(i);
-    // if a patching_info was generated above then debug information for the state before
-    // the call is going to be emitted.  The LIRGenerator calls above may have left some values
-    // in registers and that's been recorded in the CodeEmitInfo.  In that case the items
-    // for those values can't simply be freed if they are registers because the values
-    // might be destroyed by store_stack_parameter.  So in the case of patching, delay the
-    // freeing of the items that already were in registers
     size->load_item();
     store_stack_parameter (size->result(),
                            in_ByteSize(STACK_BIAS +
@@ -972,8 +975,6 @@
   // This instruction can be deoptimized in the slow path : use
   // O0 as result register.
   const LIR_Opr reg = result_register_for(x->type());
-  CodeEmitInfo* info = state_for(x, x->state());
-
   jobject2reg_with_patching(reg, x->klass(), patching_info);
   LIR_Opr rank = FrameMap::O1_opr;
   __ move(LIR_OprFact::intConst(x->rank()), rank);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/c1_globals_sparc.hpp
--- a/src/cpu/sparc/vm/c1_globals_sparc.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/c1_globals_sparc.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,10 +22,9 @@
  *
  */
 
-//
 // Sets the default values for platform dependent flags used by the client compiler.
 // (see c1_globals.hpp)
-//
+
 #ifndef TIERED
 define_pd_global(bool, BackgroundCompilation,        true );
 define_pd_global(bool, CICompileOSR,                 true );
@@ -48,27 +47,24 @@
 define_pd_global(bool, UseTLAB,                      true );
 define_pd_global(bool, ProfileInterpreter,           false);
 define_pd_global(intx, FreqInlineSize,               325  );
-define_pd_global(intx, NewRatio,                     8    ); // Design center runs on 1.3.1
 define_pd_global(bool, ResizeTLAB,                   true );
 define_pd_global(intx, ReservedCodeCacheSize,        32*M );
 define_pd_global(intx, CodeCacheExpansionSize,       32*K );
 define_pd_global(uintx,CodeCacheMinBlockLength,      1);
-define_pd_global(uintx, PermSize,                    12*M );
-define_pd_global(uintx, MaxPermSize,                 64*M );
-define_pd_global(bool, NeverActAsServerClassMachine, true);
+define_pd_global(uintx,PermSize,                     12*M );
+define_pd_global(uintx,MaxPermSize,                  64*M );
+define_pd_global(bool, NeverActAsServerClassMachine, true );
 define_pd_global(intx, NewSizeThreadIncrease,        16*K );
-define_pd_global(uintx, DefaultMaxRAM,               1*G);
+define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
 define_pd_global(intx, InitialCodeCacheSize,         160*K);
-#endif // TIERED
+#endif // !TIERED
 
 define_pd_global(bool, UseTypeProfile,               false);
 define_pd_global(bool, RoundFPResults,               false);
 
-
-define_pd_global(bool, LIRFillDelaySlots,            true);
+define_pd_global(bool, LIRFillDelaySlots,            true );
 define_pd_global(bool, OptimizeSinglePrecision,      false);
-define_pd_global(bool, CSEArrayLength,               true);
+define_pd_global(bool, CSEArrayLength,               true );
 define_pd_global(bool, TwoOperandLIRForm,            false);
 
-
-define_pd_global(intx, SafepointPollOffset, 0);
+define_pd_global(intx, SafepointPollOffset,          0    );
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/c2_globals_sparc.hpp
--- a/src/cpu/sparc/vm/c2_globals_sparc.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/c2_globals_sparc.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -59,7 +59,6 @@
 define_pd_global(intx, FreqInlineSize,               175);
 define_pd_global(intx, INTPRESSURE,                  48);  // large register set
 define_pd_global(intx, InteriorEntryAlignment,       16);  // = CodeEntryAlignment
-define_pd_global(intx, NewRatio,                     2);
 define_pd_global(intx, NewSizeThreadIncrease, ScaleForWordSize(4*K));
 // The default setting 16/16 seems to work best.
 // (For _228_jack 16/16 is 2% better than 4/4, 16/4, 32/32, 32/16, or 16/32.)
@@ -83,25 +82,25 @@
 // sequence of instructions to load a 64 bit pointer.
 //
 // InitialCodeCacheSize derived from specjbb2000 run.
-define_pd_global(intx, InitialCodeCacheSize,     2048*K); // Integral multiple of CodeCacheExpansionSize
-define_pd_global(intx, ReservedCodeCacheSize,    48*M);
-define_pd_global(intx, CodeCacheExpansionSize,   64*K);
+define_pd_global(intx, InitialCodeCacheSize,         2048*K); // Integral multiple of CodeCacheExpansionSize
+define_pd_global(intx, ReservedCodeCacheSize,        48*M);
+define_pd_global(intx, CodeCacheExpansionSize,       64*K);
 
 // Ergonomics related flags
-define_pd_global(uintx, DefaultMaxRAM,           32*G);
+define_pd_global(uint64_t,MaxRAM,                    128ULL*G);
 #else
 // InitialCodeCacheSize derived from specjbb2000 run.
-define_pd_global(intx, InitialCodeCacheSize,     1536*K); // Integral multiple of CodeCacheExpansionSize
-define_pd_global(intx, ReservedCodeCacheSize,    32*M);
-define_pd_global(intx, CodeCacheExpansionSize,   32*K);
+define_pd_global(intx, InitialCodeCacheSize,         1536*K); // Integral multiple of CodeCacheExpansionSize
+define_pd_global(intx, ReservedCodeCacheSize,        32*M);
+define_pd_global(intx, CodeCacheExpansionSize,       32*K);
 // Ergonomics related flags
-define_pd_global(uintx, DefaultMaxRAM,           1*G);
+define_pd_global(uint64_t,MaxRAM,                    4ULL*G);
 #endif
-define_pd_global(uintx,CodeCacheMinBlockLength,  4);
+define_pd_global(uintx,CodeCacheMinBlockLength,      4);
 
 // Heap related flags
-define_pd_global(uintx, PermSize,    ScaleForWordSize(16*M));
-define_pd_global(uintx, MaxPermSize, ScaleForWordSize(64*M));
+define_pd_global(uintx,PermSize,    ScaleForWordSize(16*M));
+define_pd_global(uintx,MaxPermSize, ScaleForWordSize(64*M));
 
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/frame_sparc.cpp
--- a/src/cpu/sparc/vm/frame_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/frame_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -366,8 +366,9 @@
   // as get_original_pc() needs correct value for unextended_sp()
   if (_pc != NULL) {
     _cb = CodeCache::find_blob(_pc);
-    if (_cb != NULL && _cb->is_nmethod() && ((nmethod*)_cb)->is_deopt_pc(_pc)) {
-      _pc = ((nmethod*)_cb)->get_original_pc(this);
+    address original_pc = nmethod::get_deopt_original_pc(this);
+    if (original_pc != NULL) {
+      _pc = original_pc;
       _deopt_state = is_deoptimized;
     } else {
       _deopt_state = not_deoptimized;
@@ -519,9 +520,9 @@
   _cb = CodeCache::find_blob(pc);
   *O7_addr() = pc - pc_return_offset;
   _cb = CodeCache::find_blob(_pc);
-  if (_cb != NULL && _cb->is_nmethod() && ((nmethod*)_cb)->is_deopt_pc(_pc)) {
-    address orig = ((nmethod*)_cb)->get_original_pc(this);
-    assert(orig == _pc, "expected original to be stored before patching");
+  address original_pc = nmethod::get_deopt_original_pc(this);
+  if (original_pc != NULL) {
+    assert(original_pc == _pc, "expected original to be stored before patching");
     _deopt_state = is_deoptimized;
   } else {
     _deopt_state = not_deoptimized;
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/globals_sparc.hpp
--- a/src/cpu/sparc/vm/globals_sparc.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/globals_sparc.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,10 +22,8 @@
  *
  */
 
-//
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
-//
 
 // For sparc we do not do call backs when a thread is in the interpreter, because the
 // interpreter dispatch needs at least two instructions - first to load the dispatch address
@@ -41,26 +39,23 @@
 define_pd_global(bool, ImplicitNullChecks,          true);  // Generate code for implicit null checks
 define_pd_global(bool, UncommonNullCast,            true);  // Uncommon-trap NULLs past to check cast
 
-define_pd_global(intx,  CodeEntryAlignment,    32);
-define_pd_global(uintx, TLABSize,              0);
-define_pd_global(uintx, NewSize, ScaleForWordSize((2048 * K) + (2 * (64 * K))));
-define_pd_global(intx,  SurvivorRatio,         8);
-define_pd_global(intx,  InlineFrequencyCount,  50);  // we can use more inlining on the SPARC
-define_pd_global(intx,  InlineSmallCode,       1500);
+define_pd_global(intx, CodeEntryAlignment,    32);
+define_pd_global(intx, InlineFrequencyCount,  50);  // we can use more inlining on the SPARC
+define_pd_global(intx, InlineSmallCode,       1500);
 #ifdef _LP64
 // Stack slots are 2X larger in LP64 than in the 32 bit VM.
-define_pd_global(intx,  ThreadStackSize,       1024);
-define_pd_global(intx,  VMThreadStackSize,     1024);
+define_pd_global(intx, ThreadStackSize,       1024);
+define_pd_global(intx, VMThreadStackSize,     1024);
 #else
-define_pd_global(intx,  ThreadStackSize,       512);
-define_pd_global(intx,  VMThreadStackSize,     512);
+define_pd_global(intx, ThreadStackSize,       512);
+define_pd_global(intx, VMThreadStackSize,     512);
 #endif
 
 define_pd_global(intx, StackYellowPages, 2);
 define_pd_global(intx, StackRedPages, 1);
 define_pd_global(intx, StackShadowPages, 3 DEBUG_ONLY(+1));
 
-define_pd_global(intx,  PreInflateSpin,        40);  // Determined by running design center
+define_pd_global(intx, PreInflateSpin,       40);  // Determined by running design center
 
 define_pd_global(bool, RewriteBytecodes,     true);
 define_pd_global(bool, RewriteFrequentPairs, true);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/interp_masm_sparc.cpp
--- a/src/cpu/sparc/vm/interp_masm_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/interp_masm_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -1681,11 +1681,8 @@
     // If no method data exists, go to profile_continue.
     test_method_data_pointer(profile_continue);
 
-    // We are making a call.  Increment the count.
-    increment_mdp_data_at(in_bytes(CounterData::count_offset()), scratch);
-
     // Record the receiver type.
-    record_klass_in_profile(receiver, scratch);
+    record_klass_in_profile(receiver, scratch, true);
 
     // The method data pointer needs to be updated to reflect the new target.
     update_mdp_by_constant(in_bytes(VirtualCallData::virtual_call_data_size()));
@@ -1695,7 +1692,14 @@
 
 void InterpreterMacroAssembler::record_klass_in_profile_helper(
                                         Register receiver, Register scratch,
-                                        int start_row, Label& done) {
+                                        int start_row, Label& done, bool is_virtual_call) {
+  if (TypeProfileWidth == 0) {
+    if (is_virtual_call) {
+      increment_mdp_data_at(in_bytes(CounterData::count_offset()), scratch);
+    }
+    return;
+  }
+
   int last_row = VirtualCallData::row_limit() - 1;
   assert(start_row <= last_row, "must be work left to do");
   // Test this row for both the receiver and for null.
@@ -1711,6 +1715,7 @@
     // See if the receiver is receiver[n].
     int recvr_offset = in_bytes(VirtualCallData::receiver_offset(row));
     test_mdp_data_at(recvr_offset, receiver, next_test, scratch);
+    // delayed()->tst(scratch);
 
     // The receiver is receiver[n].  Increment count[n].
     int count_offset = in_bytes(VirtualCallData::receiver_count_offset(row));
@@ -1720,20 +1725,31 @@
     bind(next_test);
 
     if (test_for_null_also) {
+      Label found_null;
       // Failed the equality check on receiver[n]...  Test for null.
       if (start_row == last_row) {
         // The only thing left to do is handle the null case.
-        brx(Assembler::notZero, false, Assembler::pt, done);
-        delayed()->nop();
+        if (is_virtual_call) {
+          brx(Assembler::zero, false, Assembler::pn, found_null);
+          delayed()->nop();
+          // Receiver did not match any saved receiver and there is no empty row for it.
+          // Increment total counter to indicate polymorphic case.
+          increment_mdp_data_at(in_bytes(CounterData::count_offset()), scratch);
+          ba(false, done);
+          delayed()->nop();
+          bind(found_null);
+        } else {
+          brx(Assembler::notZero, false, Assembler::pt, done);
+          delayed()->nop();
+        }
         break;
       }
       // Since null is rare, make it be the branch-taken case.
-      Label found_null;
       brx(Assembler::zero, false, Assembler::pn, found_null);
       delayed()->nop();
 
       // Put all the "Case 3" tests here.
-      record_klass_in_profile_helper(receiver, scratch, start_row + 1, done);
+      record_klass_in_profile_helper(receiver, scratch, start_row + 1, done, is_virtual_call);
 
       // Found a null.  Keep searching for a matching receiver,
       // but remember that this is an empty (unused) slot.
@@ -1750,16 +1766,18 @@
   int count_offset = in_bytes(VirtualCallData::receiver_count_offset(start_row));
   mov(DataLayout::counter_increment, scratch);
   set_mdp_data_at(count_offset, scratch);
-  ba(false, done);
-  delayed()->nop();
+  if (start_row > 0) {
+    ba(false, done);
+    delayed()->nop();
+  }
 }
 
 void InterpreterMacroAssembler::record_klass_in_profile(Register receiver,
-                                                        Register scratch) {
+                                                        Register scratch, bool is_virtual_call) {
   assert(ProfileInterpreter, "must be profiling");
   Label done;
 
-  record_klass_in_profile_helper(receiver, scratch, 0, done);
+  record_klass_in_profile_helper(receiver, scratch, 0, done, is_virtual_call);
 
   bind (done);
 }
@@ -1837,7 +1855,7 @@
       mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size());
 
       // Record the object type.
-      record_klass_in_profile(klass, scratch);
+      record_klass_in_profile(klass, scratch, false);
     }
 
     // The method data pointer needs to be updated.
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/interp_masm_sparc.hpp
--- a/src/cpu/sparc/vm/interp_masm_sparc.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/interp_masm_sparc.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -290,9 +290,9 @@
   void test_mdp_data_at(int offset, Register value, Label& not_equal_continue,
                         Register scratch);
 
-  void record_klass_in_profile(Register receiver, Register scratch);
+  void record_klass_in_profile(Register receiver, Register scratch, bool is_virtual_call);
   void record_klass_in_profile_helper(Register receiver, Register scratch,
-                                      int start_row, Label& done);
+                                      int start_row, Label& done, bool is_virtual_call);
 
   void update_mdp_by_offset(int offset_of_disp, Register scratch);
   void update_mdp_by_offset(Register reg, int offset_of_disp,
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/interpreter_sparc.cpp
--- a/src/cpu/sparc/vm/interpreter_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/interpreter_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -394,6 +394,11 @@
 }
 
 
+bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+  // No special entry points that preclude compilation
+  return true;
+}
+
 // This method tells the deoptimizer how big an interpreted frame must be:
 int AbstractInterpreter::size_activation(methodOop method,
                                          int tempcount,
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/sharedRuntime_sparc.cpp
--- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -107,7 +107,7 @@
   // are saved in register windows - I's and L's in the caller's frame and O's in the stub frame
   // (as the stub's I's) when the runtime routine called by the stub creates its frame.
   int i;
-  // Always make the frame size 16 bytr aligned.
+  // Always make the frame size 16 byte aligned.
   int frame_size = round_to(additional_frame_words + register_save_size, 16);
   // OopMap frame size is in c2 stack slots (sizeof(jint)) not bytes or words
   int frame_size_in_slots = frame_size / sizeof(jint);
@@ -201,15 +201,14 @@
   __ stx(G5, SP, ccr_offset+STACK_BIAS);
   __ stxfsr(SP, fsr_offset+STACK_BIAS);
 
-  // Save all the FP registers
+  // Save all the FP registers: 32 doubles (32 floats correspond to the 2 halves of the first 16 doubles)
   int offset = d00_offset;
-  for( int i=0; i<64; i+=2 ) {
+  for( int i=0; i<FloatRegisterImpl::number_of_registers; i+=2 ) {
     FloatRegister f = as_FloatRegister(i);
     __ stf(FloatRegisterImpl::D,  f, SP, offset+STACK_BIAS);
+    // Record as callee saved both halves of double registers (2 float registers).
     map->set_callee_saved(VMRegImpl::stack2reg(offset>>2), f->as_VMReg());
-    if (true) {
-      map->set_callee_saved(VMRegImpl::stack2reg((offset + sizeof(float))>>2), f->as_VMReg()->next());
-    }
+    map->set_callee_saved(VMRegImpl::stack2reg((offset + sizeof(float))>>2), f->as_VMReg()->next());
     offset += sizeof(double);
   }
 
@@ -224,7 +223,7 @@
 void RegisterSaver::restore_live_registers(MacroAssembler* masm) {
 
   // Restore all the FP registers
-  for( int i=0; i<64; i+=2 ) {
+  for( int i=0; i<FloatRegisterImpl::number_of_registers; i+=2 ) {
     __ ldf(FloatRegisterImpl::D, SP, d00_offset+i*sizeof(float)+STACK_BIAS, as_FloatRegister(i));
   }
 
@@ -540,14 +539,12 @@
 
 }
 
-// Helper class mostly to avoid passing masm everywhere, and handle store
-// displacement overflow logic for LP64
+// Helper class mostly to avoid passing masm everywhere, and handle
+// store displacement overflow logic.
 class AdapterGenerator {
   MacroAssembler *masm;
-#ifdef _LP64
   Register Rdisp;
   void set_Rdisp(Register r)  { Rdisp = r; }
-#endif // _LP64
 
   void patch_callers_callsite();
   void tag_c2i_arg(frame::Tag t, Register base, int st_off, Register scratch);
@@ -558,15 +555,18 @@
     return st_off - Interpreter::stackElementSize() + Interpreter::value_offset_in_bytes();
   }
 
-#ifdef _LP64
-  // On _LP64 argument slot values are loaded first into a register
-  // because they might not fit into displacement.
-  Register arg_slot(const int st_off);
-  Register next_arg_slot(const int st_off);
-#else
-  int arg_slot(const int st_off)      { return arg_offset(st_off); }
-  int next_arg_slot(const int st_off) { return next_arg_offset(st_off); }
-#endif // _LP64
+  int tag_offset(const int st_off) { return st_off + Interpreter::tag_offset_in_bytes(); }
+  int next_tag_offset(const int st_off) {
+    return st_off - Interpreter::stackElementSize() + Interpreter::tag_offset_in_bytes();
+  }
+
+  // Argument slot values may be loaded first into a register because
+  // they might not fit into displacement.
+  RegisterOrConstant arg_slot(const int st_off);
+  RegisterOrConstant next_arg_slot(const int st_off);
+
+  RegisterOrConstant tag_slot(const int st_off);
+  RegisterOrConstant next_tag_slot(const int st_off);
 
   // Stores long into offset pointed to by base
   void store_c2i_long(Register r, Register base,
@@ -656,44 +656,42 @@
 void AdapterGenerator::tag_c2i_arg(frame::Tag t, Register base, int st_off,
                  Register scratch) {
   if (TaggedStackInterpreter) {
-    int tag_off = st_off + Interpreter::tag_offset_in_bytes();
-#ifdef _LP64
-    Register tag_slot = Rdisp;
-    __ set(tag_off, tag_slot);
-#else
-    int tag_slot = tag_off;
-#endif // _LP64
+    RegisterOrConstant slot = tag_slot(st_off);
     // have to store zero because local slots can be reused (rats!)
     if (t == frame::TagValue) {
-      __ st_ptr(G0, base, tag_slot);
+      __ st_ptr(G0, base, slot);
     } else if (t == frame::TagCategory2) {
-      __ st_ptr(G0, base, tag_slot);
-      int next_tag_off  = st_off - Interpreter::stackElementSize() +
-                                   Interpreter::tag_offset_in_bytes();
-#ifdef _LP64
-      __ set(next_tag_off, tag_slot);
-#else
-      tag_slot = next_tag_off;
-#endif // _LP64
-      __ st_ptr(G0, base, tag_slot);
+      __ st_ptr(G0, base, slot);
+      __ st_ptr(G0, base, next_tag_slot(st_off));
     } else {
       __ mov(t, scratch);
-      __ st_ptr(scratch, base, tag_slot);
+      __ st_ptr(scratch, base, slot);
     }
   }
 }
 
-#ifdef _LP64
-Register AdapterGenerator::arg_slot(const int st_off) {
-  __ set( arg_offset(st_off), Rdisp);
-  return Rdisp;
+
+RegisterOrConstant AdapterGenerator::arg_slot(const int st_off) {
+  RegisterOrConstant roc(arg_offset(st_off));
+  return __ ensure_simm13_or_reg(roc, Rdisp);
+}
+
+RegisterOrConstant AdapterGenerator::next_arg_slot(const int st_off) {
+  RegisterOrConstant roc(next_arg_offset(st_off));
+  return __ ensure_simm13_or_reg(roc, Rdisp);
 }
 
-Register AdapterGenerator::next_arg_slot(const int st_off){
-  __ set( next_arg_offset(st_off), Rdisp);
-  return Rdisp;
+
+RegisterOrConstant AdapterGenerator::tag_slot(const int st_off) {
+  RegisterOrConstant roc(tag_offset(st_off));
+  return __ ensure_simm13_or_reg(roc, Rdisp);
 }
-#endif // _LP64
+
+RegisterOrConstant AdapterGenerator::next_tag_slot(const int st_off) {
+  RegisterOrConstant roc(next_tag_offset(st_off));
+  return __ ensure_simm13_or_reg(roc, Rdisp);
+}
+
 
 // Stores long into offset pointed to by base
 void AdapterGenerator::store_c2i_long(Register r, Register base,
@@ -853,10 +851,10 @@
       __ set(reg2offset(r_1) + extraspace + bias, ld_off);
 #else
       int ld_off = reg2offset(r_1) + extraspace + bias;
+#endif // _LP64
 #ifdef ASSERT
       G1_forced = true;
 #endif // ASSERT
-#endif // _LP64
       r_1 = G1_scratch->as_VMReg();// as part of the load/store shuffle
       if (!r_2->is_valid()) __ ld (base, ld_off, G1_scratch);
       else                  __ ldx(base, ld_off, G1_scratch);
@@ -867,9 +865,11 @@
       if (sig_bt[i] == T_OBJECT || sig_bt[i] == T_ARRAY) {
         store_c2i_object(r, base, st_off);
       } else if (sig_bt[i] == T_LONG || sig_bt[i] == T_DOUBLE) {
+#ifndef _LP64
         if (TieredCompilation) {
           assert(G1_forced || sig_bt[i] != T_LONG, "should not use register args for longs");
         }
+#endif // _LP64
         store_c2i_long(r, base, st_off, r_2->is_stack());
       } else {
         store_c2i_int(r, base, st_off);
@@ -1052,9 +1052,7 @@
 
     // Load in argument order going down.
     const int ld_off = (total_args_passed-i)*Interpreter::stackElementSize();
-#ifdef _LP64
     set_Rdisp(G1_scratch);
-#endif // _LP64
 
     VMReg r_1 = regs[i].first();
     VMReg r_2 = regs[i].second();
@@ -1074,7 +1072,7 @@
 #ifdef _LP64
         // In V9, longs are given 2 64-bit slots in the interpreter, but the
         // data is passed in only 1 slot.
-        Register slot = (sig_bt[i]==T_LONG) ?
+        RegisterOrConstant slot = (sig_bt[i] == T_LONG) ?
               next_arg_slot(ld_off) : arg_slot(ld_off);
         __ ldx(Gargs, slot, r);
 #else
@@ -1092,7 +1090,7 @@
         // data is passed in only 1 slot.  This code also handles longs that
         // are passed on the stack, but need a stack-to-stack move through a
         // spare float register.
-        Register slot = (sig_bt[i]==T_LONG || sig_bt[i] == T_DOUBLE) ?
+        RegisterOrConstant slot = (sig_bt[i] == T_LONG || sig_bt[i] == T_DOUBLE) ?
               next_arg_slot(ld_off) : arg_slot(ld_off);
         __ ldf(FloatRegisterImpl::D, Gargs, slot, r_1->as_FloatRegister());
 #else
@@ -1109,8 +1107,9 @@
       // Convert stack slot to an SP offset
       int st_off = reg2offset(regs[i].first()) + STACK_BIAS;
       // Store down the shuffled stack word.  Target address _is_ aligned.
-      if (!r_2->is_valid()) __ stf(FloatRegisterImpl::S, r_1->as_FloatRegister(), SP, st_off);
-      else                  __ stf(FloatRegisterImpl::D, r_1->as_FloatRegister(), SP, st_off);
+      RegisterOrConstant slot = __ ensure_simm13_or_reg(st_off, Rdisp);
+      if (!r_2->is_valid()) __ stf(FloatRegisterImpl::S, r_1->as_FloatRegister(), SP, slot);
+      else                  __ stf(FloatRegisterImpl::D, r_1->as_FloatRegister(), SP, slot);
     }
   }
   bool made_space = false;
@@ -1192,7 +1191,8 @@
                                                             // VMReg max_arg,
                                                             int comp_args_on_stack, // VMRegStackSlots
                                                             const BasicType *sig_bt,
-                                                            const VMRegPair *regs) {
+                                                            const VMRegPair *regs,
+                                                            AdapterFingerPrint* fingerprint) {
   address i2c_entry = __ pc();
 
   AdapterGenerator agen(masm);
@@ -1261,7 +1261,7 @@
   agen.gen_c2i_adapter(total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
 
   __ flush();
-  return new AdapterHandlerEntry(i2c_entry, c2i_entry, c2i_unverified_entry);
+  return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
 
 }
 
@@ -3216,9 +3216,8 @@
   Register        Oreturn0           = O0;
   Register        Oreturn1           = O1;
   Register        O2UnrollBlock      = O2;
-  Register        O3tmp              = O3;
-  Register        I5exception_tmp    = I5;
-  Register        G4exception_tmp    = G4_scratch;
+  Register        L0deopt_mode       = L0;
+  Register        G4deopt_mode       = G4_scratch;
   int             frame_size_words;
   Address         saved_Freturn0_addr(FP, -sizeof(double) + STACK_BIAS);
 #if !defined(_LP64) && defined(COMPILER2)
@@ -3268,7 +3267,7 @@
 
   map = RegisterSaver::save_live_registers(masm, 0, &frame_size_words);
   __ ba(false, cont);
-  __ delayed()->mov(Deoptimization::Unpack_deopt, I5exception_tmp);
+  __ delayed()->mov(Deoptimization::Unpack_deopt, L0deopt_mode);
 
   int exception_offset = __ offset() - start;
 
@@ -3319,7 +3318,7 @@
 #endif
 
   __ ba(false, cont);
-  __ delayed()->mov(Deoptimization::Unpack_exception, I5exception_tmp);;
+  __ delayed()->mov(Deoptimization::Unpack_exception, L0deopt_mode);;
 
   //
   // Reexecute entry, similar to c2 uncommon trap
@@ -3329,7 +3328,7 @@
   // No need to update oop_map  as each call to save_live_registers will produce identical oopmap
   (void) RegisterSaver::save_live_registers(masm, 0, &frame_size_words);
 
-  __ mov(Deoptimization::Unpack_reexecute, I5exception_tmp);
+  __ mov(Deoptimization::Unpack_reexecute, L0deopt_mode);
 
   __ bind(cont);
 
@@ -3352,14 +3351,14 @@
   // NOTE: we know that only O0/O1 will be reloaded by restore_result_registers
   // so this move will survive
 
-  __ mov(I5exception_tmp, G4exception_tmp);
+  __ mov(L0deopt_mode, G4deopt_mode);
 
   __ mov(O0, O2UnrollBlock->after_save());
 
   RegisterSaver::restore_result_registers(masm);
 
   Label noException;
-  __ cmp(G4exception_tmp, Deoptimization::Unpack_exception);   // Was exception pending?
+  __ cmp(G4deopt_mode, Deoptimization::Unpack_exception);   // Was exception pending?
   __ br(Assembler::notEqual, false, Assembler::pt, noException);
   __ delayed()->nop();
 
@@ -3393,10 +3392,10 @@
   }
 #endif
   __ set_last_Java_frame(SP, noreg);
-  __ call_VM_leaf(L7_thread_cache, CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames), G2_thread, G4exception_tmp);
+  __ call_VM_leaf(L7_thread_cache, CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames), G2_thread, G4deopt_mode);
 #else
   // LP64 uses g4 in set_last_Java_frame
-  __ mov(G4exception_tmp, O1);
+  __ mov(G4deopt_mode, O1);
   __ set_last_Java_frame(SP, G0);
   __ call_VM_leaf(L7_thread_cache, CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames), G2_thread, O1);
 #endif
@@ -3449,7 +3448,6 @@
 #endif
   MacroAssembler* masm               = new MacroAssembler(&buffer);
   Register        O2UnrollBlock      = O2;
-  Register        O3tmp              = O3;
   Register        O2klass_index      = O2;
 
   //
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/sparc.ad
--- a/src/cpu/sparc/vm/sparc.ad	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/sparc.ad	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 //
-// Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+// Copyright 1998-2010 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
@@ -193,38 +193,38 @@
 // I believe we can't handle callee-save doubles D32 and up until
 // the place in the sparc stack crawler that asserts on the 255 is
 // fixed up.
-reg_def R_D32x(SOC, SOC, Op_RegD,255, F32->as_VMReg());
-reg_def R_D32 (SOC, SOC, Op_RegD,  1, F32->as_VMReg()->next());
-reg_def R_D34x(SOC, SOC, Op_RegD,255, F34->as_VMReg());
-reg_def R_D34 (SOC, SOC, Op_RegD,  3, F34->as_VMReg()->next());
-reg_def R_D36x(SOC, SOC, Op_RegD,255, F36->as_VMReg());
-reg_def R_D36 (SOC, SOC, Op_RegD,  5, F36->as_VMReg()->next());
-reg_def R_D38x(SOC, SOC, Op_RegD,255, F38->as_VMReg());
-reg_def R_D38 (SOC, SOC, Op_RegD,  7, F38->as_VMReg()->next());
-reg_def R_D40x(SOC, SOC, Op_RegD,255, F40->as_VMReg());
-reg_def R_D40 (SOC, SOC, Op_RegD,  9, F40->as_VMReg()->next());
-reg_def R_D42x(SOC, SOC, Op_RegD,255, F42->as_VMReg());
-reg_def R_D42 (SOC, SOC, Op_RegD, 11, F42->as_VMReg()->next());
-reg_def R_D44x(SOC, SOC, Op_RegD,255, F44->as_VMReg());
-reg_def R_D44 (SOC, SOC, Op_RegD, 13, F44->as_VMReg()->next());
-reg_def R_D46x(SOC, SOC, Op_RegD,255, F46->as_VMReg());
-reg_def R_D46 (SOC, SOC, Op_RegD, 15, F46->as_VMReg()->next());
-reg_def R_D48x(SOC, SOC, Op_RegD,255, F48->as_VMReg());
-reg_def R_D48 (SOC, SOC, Op_RegD, 17, F48->as_VMReg()->next());
-reg_def R_D50x(SOC, SOC, Op_RegD,255, F50->as_VMReg());
-reg_def R_D50 (SOC, SOC, Op_RegD, 19, F50->as_VMReg()->next());
-reg_def R_D52x(SOC, SOC, Op_RegD,255, F52->as_VMReg());
-reg_def R_D52 (SOC, SOC, Op_RegD, 21, F52->as_VMReg()->next());
-reg_def R_D54x(SOC, SOC, Op_RegD,255, F54->as_VMReg());
-reg_def R_D54 (SOC, SOC, Op_RegD, 23, F54->as_VMReg()->next());
-reg_def R_D56x(SOC, SOC, Op_RegD,255, F56->as_VMReg());
-reg_def R_D56 (SOC, SOC, Op_RegD, 25, F56->as_VMReg()->next());
-reg_def R_D58x(SOC, SOC, Op_RegD,255, F58->as_VMReg());
-reg_def R_D58 (SOC, SOC, Op_RegD, 27, F58->as_VMReg()->next());
-reg_def R_D60x(SOC, SOC, Op_RegD,255, F60->as_VMReg());
-reg_def R_D60 (SOC, SOC, Op_RegD, 29, F60->as_VMReg()->next());
-reg_def R_D62x(SOC, SOC, Op_RegD,255, F62->as_VMReg());
-reg_def R_D62 (SOC, SOC, Op_RegD, 31, F62->as_VMReg()->next());
+reg_def R_D32 (SOC, SOC, Op_RegD,  1, F32->as_VMReg());
+reg_def R_D32x(SOC, SOC, Op_RegD,255, F32->as_VMReg()->next());
+reg_def R_D34 (SOC, SOC, Op_RegD,  3, F34->as_VMReg());
+reg_def R_D34x(SOC, SOC, Op_RegD,255, F34->as_VMReg()->next());
+reg_def R_D36 (SOC, SOC, Op_RegD,  5, F36->as_VMReg());
+reg_def R_D36x(SOC, SOC, Op_RegD,255, F36->as_VMReg()->next());
+reg_def R_D38 (SOC, SOC, Op_RegD,  7, F38->as_VMReg());
+reg_def R_D38x(SOC, SOC, Op_RegD,255, F38->as_VMReg()->next());
+reg_def R_D40 (SOC, SOC, Op_RegD,  9, F40->as_VMReg());
+reg_def R_D40x(SOC, SOC, Op_RegD,255, F40->as_VMReg()->next());
+reg_def R_D42 (SOC, SOC, Op_RegD, 11, F42->as_VMReg());
+reg_def R_D42x(SOC, SOC, Op_RegD,255, F42->as_VMReg()->next());
+reg_def R_D44 (SOC, SOC, Op_RegD, 13, F44->as_VMReg());
+reg_def R_D44x(SOC, SOC, Op_RegD,255, F44->as_VMReg()->next());
+reg_def R_D46 (SOC, SOC, Op_RegD, 15, F46->as_VMReg());
+reg_def R_D46x(SOC, SOC, Op_RegD,255, F46->as_VMReg()->next());
+reg_def R_D48 (SOC, SOC, Op_RegD, 17, F48->as_VMReg());
+reg_def R_D48x(SOC, SOC, Op_RegD,255, F48->as_VMReg()->next());
+reg_def R_D50 (SOC, SOC, Op_RegD, 19, F50->as_VMReg());
+reg_def R_D50x(SOC, SOC, Op_RegD,255, F50->as_VMReg()->next());
+reg_def R_D52 (SOC, SOC, Op_RegD, 21, F52->as_VMReg());
+reg_def R_D52x(SOC, SOC, Op_RegD,255, F52->as_VMReg()->next());
+reg_def R_D54 (SOC, SOC, Op_RegD, 23, F54->as_VMReg());
+reg_def R_D54x(SOC, SOC, Op_RegD,255, F54->as_VMReg()->next());
+reg_def R_D56 (SOC, SOC, Op_RegD, 25, F56->as_VMReg());
+reg_def R_D56x(SOC, SOC, Op_RegD,255, F56->as_VMReg()->next());
+reg_def R_D58 (SOC, SOC, Op_RegD, 27, F58->as_VMReg());
+reg_def R_D58x(SOC, SOC, Op_RegD,255, F58->as_VMReg()->next());
+reg_def R_D60 (SOC, SOC, Op_RegD, 29, F60->as_VMReg());
+reg_def R_D60x(SOC, SOC, Op_RegD,255, F60->as_VMReg()->next());
+reg_def R_D62 (SOC, SOC, Op_RegD, 31, F62->as_VMReg());
+reg_def R_D62x(SOC, SOC, Op_RegD,255, F62->as_VMReg()->next());
 
 
 // ----------------------------
@@ -1803,8 +1803,9 @@
 // to implement the UseStrictFP mode.
 const bool Matcher::strict_fp_requires_explicit_rounding = false;
 
-// Do floats take an entire double register or just half?
-const bool Matcher::float_in_double = false;
+// Are floats conerted to double when stored to stack during deoptimization?
+// Sparc does not handle callee-save floats.
+bool Matcher::float_in_double() { return false; }
 
 // Do ints take an entire long register or just half?
 // Note that we if-def off of _LP64.
@@ -1885,6 +1886,10 @@
   return RegMask();
 }
 
+const RegMask Matcher::method_handle_invoke_SP_save_mask() {
+  return RegMask();
+}
+
 %}
 
 
@@ -2838,63 +2843,41 @@
   %}
 
 
-  enc_class enc_String_Compare(o0RegP str1, o1RegP str2, g3RegP tmp1, g4RegP tmp2, notemp_iRegI result) %{
+  enc_class enc_String_Compare(o0RegP str1, o1RegP str2, g3RegI cnt1, g4RegI cnt2, notemp_iRegI result) %{
     Label Ldone, Lloop;
     MacroAssembler _masm(&cbuf);
 
     Register   str1_reg = reg_to_register_object($str1$$reg);
     Register   str2_reg = reg_to_register_object($str2$$reg);
-    Register   tmp1_reg = reg_to_register_object($tmp1$$reg);
-    Register   tmp2_reg = reg_to_register_object($tmp2$$reg);
+    Register   cnt1_reg = reg_to_register_object($cnt1$$reg);
+    Register   cnt2_reg = reg_to_register_object($cnt2$$reg);
     Register result_reg = reg_to_register_object($result$$reg);
 
-    // Get the first character position in both strings
-    //         [8] char array, [12] offset, [16] count
-    int  value_offset = java_lang_String:: value_offset_in_bytes();
-    int offset_offset = java_lang_String::offset_offset_in_bytes();
-    int  count_offset = java_lang_String:: count_offset_in_bytes();
-
-    // load str1 (jchar*) base address into tmp1_reg
-    __ load_heap_oop(str1_reg, value_offset, tmp1_reg);
-    __ ld(str1_reg, offset_offset, result_reg);
-    __ add(tmp1_reg, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp1_reg);
-    __   ld(str1_reg, count_offset, str1_reg); // hoisted
-    __ sll(result_reg, exact_log2(sizeof(jchar)), result_reg);
-    __   load_heap_oop(str2_reg, value_offset, tmp2_reg); // hoisted
-    __ add(result_reg, tmp1_reg, tmp1_reg);
-
-    // load str2 (jchar*) base address into tmp2_reg
-    // __ ld_ptr(str2_reg, value_offset, tmp2_reg); // hoisted
-    __ ld(str2_reg, offset_offset, result_reg);
-    __ add(tmp2_reg, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp2_reg);
-    __   ld(str2_reg, count_offset, str2_reg); // hoisted
-    __ sll(result_reg, exact_log2(sizeof(jchar)), result_reg);
-    __   subcc(str1_reg, str2_reg, O7); // hoisted
-    __ add(result_reg, tmp2_reg, tmp2_reg);
+    assert(result_reg != str1_reg &&
+           result_reg != str2_reg &&
+           result_reg != cnt1_reg &&
+           result_reg != cnt2_reg ,
+           "need different registers");
 
     // Compute the minimum of the string lengths(str1_reg) and the
     // difference of the string lengths (stack)
 
-    // discard string base pointers, after loading up the lengths
-    // __ ld(str1_reg, count_offset, str1_reg); // hoisted
-    // __ ld(str2_reg, count_offset, str2_reg); // hoisted
-
     // See if the lengths are different, and calculate min in str1_reg.
     // Stash diff in O7 in case we need it for a tie-breaker.
     Label Lskip;
-    // __ subcc(str1_reg, str2_reg, O7); // hoisted
-    __ sll(str1_reg, exact_log2(sizeof(jchar)), str1_reg); // scale the limit
+    __ subcc(cnt1_reg, cnt2_reg, O7);
+    __ sll(cnt1_reg, exact_log2(sizeof(jchar)), cnt1_reg); // scale the limit
     __ br(Assembler::greater, true, Assembler::pt, Lskip);
-    // str2 is shorter, so use its count:
-    __ delayed()->sll(str2_reg, exact_log2(sizeof(jchar)), str1_reg); // scale the limit
+    // cnt2 is shorter, so use its count:
+    __ delayed()->sll(cnt2_reg, exact_log2(sizeof(jchar)), cnt1_reg); // scale the limit
     __ bind(Lskip);
 
-    // reallocate str1_reg, str2_reg, result_reg
+    // reallocate cnt1_reg, cnt2_reg, result_reg
     // Note:  limit_reg holds the string length pre-scaled by 2
-    Register limit_reg =   str1_reg;
-    Register  chr2_reg =   str2_reg;
+    Register limit_reg =   cnt1_reg;
+    Register  chr2_reg =   cnt2_reg;
     Register  chr1_reg = result_reg;
-    // tmp{12} are the base pointers
+    // str{12} are the base pointers
 
     // Is the minimum length zero?
     __ cmp(limit_reg, (int)(0 * sizeof(jchar))); // use cast to resolve overloading ambiguity
@@ -2902,8 +2885,8 @@
     __ delayed()->mov(O7, result_reg);  // result is difference in lengths
 
     // Load first characters
-    __ lduh(tmp1_reg, 0, chr1_reg);
-    __ lduh(tmp2_reg, 0, chr2_reg);
+    __ lduh(str1_reg, 0, chr1_reg);
+    __ lduh(str2_reg, 0, chr2_reg);
 
     // Compare first characters
     __ subcc(chr1_reg, chr2_reg, chr1_reg);
@@ -2915,7 +2898,7 @@
       // Check after comparing first character to see if strings are equivalent
       Label LSkip2;
       // Check if the strings start at same location
-      __ cmp(tmp1_reg, tmp2_reg);
+      __ cmp(str1_reg, str2_reg);
       __ brx(Assembler::notEqual, true, Assembler::pt, LSkip2);
       __ delayed()->nop();
 
@@ -2932,23 +2915,23 @@
     __ br(Assembler::equal, true, Assembler::pn, Ldone);
     __ delayed()->mov(O7, result_reg);  // result is difference in lengths
 
-    // Shift tmp1_reg and tmp2_reg to the end of the arrays, negate limit
-    __ add(tmp1_reg, limit_reg, tmp1_reg);
-    __ add(tmp2_reg, limit_reg, tmp2_reg);
+    // Shift str1_reg and str2_reg to the end of the arrays, negate limit
+    __ add(str1_reg, limit_reg, str1_reg);
+    __ add(str2_reg, limit_reg, str2_reg);
     __ neg(chr1_reg, limit_reg);  // limit = -(limit-2)
 
     // Compare the rest of the characters
-    __ lduh(tmp1_reg, limit_reg, chr1_reg);
+    __ lduh(str1_reg, limit_reg, chr1_reg);
     __ bind(Lloop);
-    // __ lduh(tmp1_reg, limit_reg, chr1_reg); // hoisted
-    __ lduh(tmp2_reg, limit_reg, chr2_reg);
+    // __ lduh(str1_reg, limit_reg, chr1_reg); // hoisted
+    __ lduh(str2_reg, limit_reg, chr2_reg);
     __ subcc(chr1_reg, chr2_reg, chr1_reg);
     __ br(Assembler::notZero, false, Assembler::pt, Ldone);
     assert(chr1_reg == result_reg, "result must be pre-placed");
     __ delayed()->inccc(limit_reg, sizeof(jchar));
     // annul LDUH if branch is not taken to prevent access past end of string
     __ br(Assembler::notZero, true, Assembler::pt, Lloop);
-    __ delayed()->lduh(tmp1_reg, limit_reg, chr1_reg); // hoisted
+    __ delayed()->lduh(str1_reg, limit_reg, chr1_reg); // hoisted
 
     // If strings are equal up to min length, return the length difference.
     __ mov(O7, result_reg);
@@ -2957,125 +2940,80 @@
     __ bind(Ldone);
   %}
 
-enc_class enc_String_Equals(o0RegP str1, o1RegP str2, g3RegP tmp1, g4RegP tmp2, notemp_iRegI result) %{
-    Label Lword, Lword_loop, Lpost_word, Lchar, Lchar_loop, Ldone;
+enc_class enc_String_Equals(o0RegP str1, o1RegP str2, g3RegI cnt, notemp_iRegI result) %{
+    Label Lword_loop, Lpost_word, Lchar, Lchar_loop, Ldone;
     MacroAssembler _masm(&cbuf);
 
     Register   str1_reg = reg_to_register_object($str1$$reg);
     Register   str2_reg = reg_to_register_object($str2$$reg);
-    Register   tmp1_reg = reg_to_register_object($tmp1$$reg);
-    Register   tmp2_reg = reg_to_register_object($tmp2$$reg);
+    Register    cnt_reg = reg_to_register_object($cnt$$reg);
+    Register   tmp1_reg = O7;
     Register result_reg = reg_to_register_object($result$$reg);
 
-    // Get the first character position in both strings
-    //         [8] char array, [12] offset, [16] count
-    int  value_offset = java_lang_String:: value_offset_in_bytes();
-    int offset_offset = java_lang_String::offset_offset_in_bytes();
-    int  count_offset = java_lang_String:: count_offset_in_bytes();
-
-    // load str1 (jchar*) base address into tmp1_reg
-    __ load_heap_oop(Address(str1_reg, value_offset), tmp1_reg);
-    __ ld(Address(str1_reg, offset_offset), result_reg);
-    __ add(tmp1_reg, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp1_reg);
-    __    ld(Address(str1_reg, count_offset), str1_reg); // hoisted
-    __ sll(result_reg, exact_log2(sizeof(jchar)), result_reg);
-    __    load_heap_oop(Address(str2_reg, value_offset), tmp2_reg); // hoisted
-    __ add(result_reg, tmp1_reg, tmp1_reg);
-
-    // load str2 (jchar*) base address into tmp2_reg
-    // __ ld_ptr(Address(str2_reg, value_offset), tmp2_reg); // hoisted
-    __ ld(Address(str2_reg, offset_offset), result_reg);
-    __ add(tmp2_reg, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp2_reg);
-    __    ld(Address(str2_reg, count_offset), str2_reg); // hoisted
-    __ sll(result_reg, exact_log2(sizeof(jchar)), result_reg);
-    __   cmp(str1_reg, str2_reg); // hoisted
-    __ add(result_reg, tmp2_reg, tmp2_reg);
-
-    __ sll(str1_reg, exact_log2(sizeof(jchar)), str1_reg);
-    __ br(Assembler::notEqual, true, Assembler::pt, Ldone);
-    __ delayed()->mov(G0, result_reg);    // not equal
-
-    __ br_zero(Assembler::equal, true, Assembler::pn, str1_reg, Ldone);
-    __ delayed()->add(G0, 1, result_reg); //equals
-
-    __ cmp(tmp1_reg, tmp2_reg); //same string ?
+    assert(result_reg != str1_reg &&
+           result_reg != str2_reg &&
+           result_reg !=  cnt_reg &&
+           result_reg != tmp1_reg ,
+           "need different registers");
+
+    __ cmp(str1_reg, str2_reg); //same char[] ?
     __ brx(Assembler::equal, true, Assembler::pn, Ldone);
     __ delayed()->add(G0, 1, result_reg);
 
+    __ br_on_reg_cond(Assembler::rc_z, true, Assembler::pn, cnt_reg, Ldone);
+    __ delayed()->add(G0, 1, result_reg); // count == 0
+
     //rename registers
-    Register limit_reg =   str1_reg;
-    Register  chr2_reg =   str2_reg;
+    Register limit_reg =    cnt_reg;
     Register  chr1_reg = result_reg;
-    // tmp{12} are the base pointers
+    Register  chr2_reg =   tmp1_reg;
 
     //check for alignment and position the pointers to the ends
-    __ or3(tmp1_reg, tmp2_reg, chr1_reg);
-    __ andcc(chr1_reg, 0x3, chr1_reg); // notZero means at least one not 4-byte aligned
-    __ br(Assembler::notZero, false, Assembler::pn, Lchar);
-    __ delayed()->nop();
-
-    __ bind(Lword);
-    __ and3(limit_reg, 0x2, O7); //remember the remainder (either 0 or 2)
-    __ andn(limit_reg, 0x3, limit_reg);
-    __ br_zero(Assembler::zero, false, Assembler::pn, limit_reg, Lpost_word);
-    __ delayed()->nop();
-
-    __ add(tmp1_reg, limit_reg, tmp1_reg);
-    __ add(tmp2_reg, limit_reg, tmp2_reg);
-    __ neg(limit_reg);
-
-    __ lduw(tmp1_reg, limit_reg, chr1_reg);
-    __ bind(Lword_loop);
-    __ lduw(tmp2_reg, limit_reg, chr2_reg);
-    __ cmp(chr1_reg, chr2_reg);
-    __ br(Assembler::notEqual, true, Assembler::pt, Ldone);
-    __ delayed()->mov(G0, result_reg);
-    __ inccc(limit_reg, 2*sizeof(jchar));
-    // annul LDUW if branch i  s not taken to prevent access past end of string
-    __ br(Assembler::notZero, true, Assembler::pt, Lword_loop); //annul on taken
-    __ delayed()->lduw(tmp1_reg, limit_reg, chr1_reg); // hoisted
-
-    __ bind(Lpost_word);
-    __ br_zero(Assembler::zero, true, Assembler::pt, O7, Ldone);
-    __ delayed()->add(G0, 1, result_reg);
-
-    __ lduh(tmp1_reg, 0, chr1_reg);
-    __ lduh(tmp2_reg, 0, chr2_reg);
-    __ cmp (chr1_reg, chr2_reg);
-    __ br(Assembler::notEqual, true, Assembler::pt, Ldone);
-    __ delayed()->mov(G0, result_reg);
+    __ or3(str1_reg, str2_reg, chr1_reg);
+    __ andcc(chr1_reg, 0x3, chr1_reg);
+    // notZero means at least one not 4-byte aligned.
+    // We could optimize the case when both arrays are not aligned
+    // but it is not frequent case and it requires additional checks.
+    __ br(Assembler::notZero, false, Assembler::pn, Lchar); // char by char compare
+    __ delayed()->sll(limit_reg, exact_log2(sizeof(jchar)), limit_reg); // set byte count
+
+    // Compare char[] arrays aligned to 4 bytes.
+    __ char_arrays_equals(str1_reg, str2_reg, limit_reg, result_reg,
+                          chr1_reg, chr2_reg, Ldone);
     __ ba(false,Ldone);
     __ delayed()->add(G0, 1, result_reg);
 
+    // char by char compare
     __ bind(Lchar);
-    __ add(tmp1_reg, limit_reg, tmp1_reg);
-    __ add(tmp2_reg, limit_reg, tmp2_reg);
+    __ add(str1_reg, limit_reg, str1_reg);
+    __ add(str2_reg, limit_reg, str2_reg);
     __ neg(limit_reg); //negate count
 
-    __ lduh(tmp1_reg, limit_reg, chr1_reg);
+    __ lduh(str1_reg, limit_reg, chr1_reg);
+    // Lchar_loop
     __ bind(Lchar_loop);
-    __ lduh(tmp2_reg, limit_reg, chr2_reg);
+    __ lduh(str2_reg, limit_reg, chr2_reg);
     __ cmp(chr1_reg, chr2_reg);
     __ br(Assembler::notEqual, true, Assembler::pt, Ldone);
     __ delayed()->mov(G0, result_reg); //not equal
     __ inccc(limit_reg, sizeof(jchar));
     // annul LDUH if branch is not taken to prevent access past end of string
-    __ br(Assembler::notZero, true, Assembler::pt, Lchar_loop); //annul on taken
-    __ delayed()->lduh(tmp1_reg, limit_reg, chr1_reg); // hoisted
+    __ br(Assembler::notZero, true, Assembler::pt, Lchar_loop);
+    __ delayed()->lduh(str1_reg, limit_reg, chr1_reg); // hoisted
 
     __ add(G0, 1, result_reg);  //equal
 
     __ bind(Ldone);
   %}
 
-enc_class enc_Array_Equals(o0RegP ary1, o1RegP ary2, g3RegP tmp1, g4RegP tmp2, notemp_iRegI result) %{
+enc_class enc_Array_Equals(o0RegP ary1, o1RegP ary2, g3RegP tmp1, notemp_iRegI result) %{
     Label Lvector, Ldone, Lloop;
     MacroAssembler _masm(&cbuf);
 
     Register   ary1_reg = reg_to_register_object($ary1$$reg);
     Register   ary2_reg = reg_to_register_object($ary2$$reg);
     Register   tmp1_reg = reg_to_register_object($tmp1$$reg);
-    Register   tmp2_reg = reg_to_register_object($tmp2$$reg);
+    Register   tmp2_reg = O7;
     Register result_reg = reg_to_register_object($result$$reg);
 
     int length_offset  = arrayOopDesc::length_offset_in_bytes();
@@ -3083,7 +3021,7 @@
 
     // return true if the same array
     __ cmp(ary1_reg, ary2_reg);
-    __ br(Assembler::equal, true, Assembler::pn, Ldone);
+    __ brx(Assembler::equal, true, Assembler::pn, Ldone);
     __ delayed()->add(G0, 1, result_reg); // equal
 
     __ br_null(ary1_reg, true, Assembler::pn, Ldone);
@@ -3101,7 +3039,7 @@
     __ br(Assembler::notEqual, true, Assembler::pn, Ldone);
     __ delayed()->mov(G0, result_reg);     // not equal
 
-    __ br_zero(Assembler::zero, true, Assembler::pn, tmp1_reg, Ldone);
+    __ br_on_reg_cond(Assembler::rc_z, true, Assembler::pn, tmp1_reg, Ldone);
     __ delayed()->add(G0, 1, result_reg); // zero-length arrays are equal
 
     // load array addresses
@@ -3109,45 +3047,16 @@
     __ add(ary2_reg, base_offset, ary2_reg);
 
     // renaming registers
-    Register chr1_reg  =  tmp2_reg;   // for characters in ary1
-    Register chr2_reg  =  result_reg; // for characters in ary2
+    Register chr1_reg  =  result_reg; // for characters in ary1
+    Register chr2_reg  =  tmp2_reg;   // for characters in ary2
     Register limit_reg =  tmp1_reg;   // length
 
     // set byte count
     __ sll(limit_reg, exact_log2(sizeof(jchar)), limit_reg);
-    __ andcc(limit_reg, 0x2, chr1_reg); //trailing character ?
-    __ br(Assembler::zero, false, Assembler::pt, Lvector);
-    __ delayed()->nop();
-
-    //compare the trailing char
-    __ sub(limit_reg, sizeof(jchar), limit_reg);
-    __ lduh(ary1_reg, limit_reg, chr1_reg);
-    __ lduh(ary2_reg, limit_reg, chr2_reg);
-    __ cmp(chr1_reg, chr2_reg);
-    __ br(Assembler::notEqual, true, Assembler::pt, Ldone);
-    __ delayed()->mov(G0, result_reg);     // not equal
-
-    // only one char ?
-    __ br_zero(Assembler::zero, true, Assembler::pn, limit_reg, Ldone);
-    __ delayed()->add(G0, 1, result_reg); // zero-length arrays are equal
-
-    __ bind(Lvector);
-    // Shift ary1_reg and ary2_reg to the end of the arrays, negate limit
-    __ add(ary1_reg, limit_reg, ary1_reg);
-    __ add(ary2_reg, limit_reg, ary2_reg);
-    __ neg(limit_reg, limit_reg);
-
-    __ lduw(ary1_reg, limit_reg, chr1_reg);
-    __ bind(Lloop);
-    __ lduw(ary2_reg, limit_reg, chr2_reg);
-    __ cmp(chr1_reg, chr2_reg);
-    __ br(Assembler::notEqual, false, Assembler::pt, Ldone);
-    __ delayed()->mov(G0, result_reg);     // not equal
-    __ inccc(limit_reg, 2*sizeof(jchar));
-    // annul LDUW if branch is not taken to prevent access past end of string
-    __ br(Assembler::notZero, true, Assembler::pt, Lloop); //annul on taken
-    __ delayed()->lduw(ary1_reg, limit_reg, chr1_reg); // hoisted
-
+
+    // Compare char[] arrays aligned to 4 bytes.
+    __ char_arrays_equals(ary1_reg, ary2_reg, limit_reg, result_reg,
+                          chr1_reg, chr2_reg, Ldone);
     __ add(G0, 1, result_reg); // equals
 
     __ bind(Ldone);
@@ -5707,7 +5616,7 @@
   effect(TEMP dst, TEMP tmp);
   ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST);
 
-  size(3*4);
+  size((3+1)*4);  // set may use two instructions.
   format %{ "LDUH   $mem,$dst\t! ushort/char & 16-bit mask -> long\n\t"
             "SET    $mask,$tmp\n\t"
             "AND    $dst,$tmp,$dst" %}
@@ -5851,7 +5760,7 @@
   effect(TEMP dst, TEMP tmp);
   ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST);
 
-  size(3*4);
+  size((3+1)*4);  // set may use two instructions.
   format %{ "LDUW   $mem,$dst\t! int & 32-bit mask -> long\n\t"
             "SET    $mask,$tmp\n\t"
             "AND    $dst,$tmp,$dst" %}
@@ -6760,7 +6669,7 @@
   ins_pipe(ialu_imm);
 %}
 
-instruct cmovII_U_reg(cmpOpU cmp, flagsRegU icc, iRegI dst, iRegI src) %{
+instruct cmovIIu_reg(cmpOpU cmp, flagsRegU icc, iRegI dst, iRegI src) %{
   match(Set dst (CMoveI (Binary cmp icc) (Binary dst src)));
   ins_cost(150);
   size(4);
@@ -6769,7 +6678,7 @@
   ins_pipe(ialu_reg);
 %}
 
-instruct cmovII_U_imm(cmpOpU cmp, flagsRegU icc, iRegI dst, immI11 src) %{
+instruct cmovIIu_imm(cmpOpU cmp, flagsRegU icc, iRegI dst, immI11 src) %{
   match(Set dst (CMoveI (Binary cmp icc) (Binary dst src)));
   ins_cost(140);
   size(4);
@@ -6815,6 +6724,16 @@
   ins_pipe(ialu_reg);
 %}
 
+// This instruction also works with CmpN so we don't need cmovNN_reg.
+instruct cmovNIu_reg(cmpOpU cmp, flagsRegU icc, iRegN dst, iRegN src) %{
+  match(Set dst (CMoveN (Binary cmp icc) (Binary dst src)));
+  ins_cost(150);
+  size(4);
+  format %{ "MOV$cmp  $icc,$src,$dst" %}
+  ins_encode( enc_cmov_reg(cmp,dst,src, (Assembler::icc)) );
+  ins_pipe(ialu_reg);
+%}
+
 instruct cmovNF_reg(cmpOpF cmp, flagsRegF fcc, iRegN dst, iRegN src) %{
   match(Set dst (CMoveN (Binary cmp fcc) (Binary dst src)));
   ins_cost(150);
@@ -6852,6 +6771,16 @@
   ins_pipe(ialu_reg);
 %}
 
+instruct cmovPIu_reg(cmpOpU cmp, flagsRegU icc, iRegP dst, iRegP src) %{
+  match(Set dst (CMoveP (Binary cmp icc) (Binary dst src)));
+  ins_cost(150);
+
+  size(4);
+  format %{ "MOV$cmp  $icc,$src,$dst\t! ptr" %}
+  ins_encode( enc_cmov_reg(cmp,dst,src, (Assembler::icc)) );
+  ins_pipe(ialu_reg);
+%}
+
 instruct cmovPI_imm(cmpOp cmp, flagsReg icc, iRegP dst, immP0 src) %{
   match(Set dst (CMoveP (Binary cmp icc) (Binary dst src)));
   ins_cost(140);
@@ -6862,6 +6791,16 @@
   ins_pipe(ialu_imm);
 %}
 
+instruct cmovPIu_imm(cmpOpU cmp, flagsRegU icc, iRegP dst, immP0 src) %{
+  match(Set dst (CMoveP (Binary cmp icc) (Binary dst src)));
+  ins_cost(140);
+
+  size(4);
+  format %{ "MOV$cmp  $icc,$src,$dst\t! ptr" %}
+  ins_encode( enc_cmov_imm(cmp,dst,src, (Assembler::icc)) );
+  ins_pipe(ialu_imm);
+%}
+
 instruct cmovPF_reg(cmpOpF cmp, flagsRegF fcc, iRegP dst, iRegP src) %{
   match(Set dst (CMoveP (Binary cmp fcc) (Binary dst src)));
   ins_cost(150);
@@ -6901,6 +6840,17 @@
   ins_pipe(int_conditional_float_move);
 %}
 
+instruct cmovFIu_reg(cmpOpU cmp, flagsRegU icc, regF dst, regF src) %{
+  match(Set dst (CMoveF (Binary cmp icc) (Binary dst src)));
+  ins_cost(150);
+
+  size(4);
+  format %{ "FMOVS$cmp $icc,$src,$dst" %}
+  opcode(0x101);
+  ins_encode( enc_cmovf_reg(cmp,dst,src, (Assembler::icc)) );
+  ins_pipe(int_conditional_float_move);
+%}
+
 // Conditional move,
 instruct cmovFF_reg(cmpOpF cmp, flagsRegF fcc, regF dst, regF src) %{
   match(Set dst (CMoveF (Binary cmp fcc) (Binary dst src)));
@@ -6934,6 +6884,17 @@
   ins_pipe(int_conditional_double_move);
 %}
 
+instruct cmovDIu_reg(cmpOpU cmp, flagsRegU icc, regD dst, regD src) %{
+  match(Set dst (CMoveD (Binary cmp icc) (Binary dst src)));
+  ins_cost(150);
+
+  size(4);
+  format %{ "FMOVD$cmp $icc,$src,$dst" %}
+  opcode(0x102);
+  ins_encode( enc_cmovf_reg(cmp,dst,src, (Assembler::icc)) );
+  ins_pipe(int_conditional_double_move);
+%}
+
 // Conditional move,
 instruct cmovDF_reg(cmpOpF cmp, flagsRegF fcc, regD dst, regD src) %{
   match(Set dst (CMoveD (Binary cmp fcc) (Binary dst src)));
@@ -6973,6 +6934,17 @@
 %}
 
 
+instruct cmovLIu_reg(cmpOpU cmp, flagsRegU icc, iRegL dst, iRegL src) %{
+  match(Set dst (CMoveL (Binary cmp icc) (Binary dst src)));
+  ins_cost(150);
+
+  size(4);
+  format %{ "MOV$cmp  $icc,$src,$dst\t! long" %}
+  ins_encode( enc_cmov_reg(cmp,dst,src, (Assembler::icc)) );
+  ins_pipe(ialu_reg);
+%}
+
+
 instruct cmovLF_reg(cmpOpF cmp, flagsRegF fcc, iRegL dst, iRegL src) %{
   match(Set dst (CMoveL (Binary cmp fcc) (Binary dst src)));
   ins_cost(150);
@@ -9471,33 +9443,33 @@
   ins_pipe(long_memory_op);
 %}
 
-instruct string_compare(o0RegP str1, o1RegP str2, g3RegP tmp1, g4RegP tmp2, notemp_iRegI result,
-                        o7RegI tmp3, flagsReg ccr) %{
-  match(Set result (StrComp str1 str2));
-  effect(USE_KILL str1, USE_KILL str2, KILL tmp1, KILL tmp2, KILL ccr, KILL tmp3);
+instruct string_compare(o0RegP str1, o1RegP str2, g3RegI cnt1, g4RegI cnt2, notemp_iRegI result,
+                        o7RegI tmp, flagsReg ccr) %{
+  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL ccr, KILL tmp);
   ins_cost(300);
-  format %{ "String Compare $str1,$str2 -> $result" %}
-  ins_encode( enc_String_Compare(str1, str2, tmp1, tmp2, result) );
+  format %{ "String Compare $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp" %}
+  ins_encode( enc_String_Compare(str1, str2, cnt1, cnt2, result) );
   ins_pipe(long_memory_op);
 %}
 
-instruct string_equals(o0RegP str1, o1RegP str2, g3RegP tmp1, g4RegP tmp2, notemp_iRegI result,
-                       o7RegI tmp3, flagsReg ccr) %{
-  match(Set result (StrEquals str1 str2));
-  effect(USE_KILL str1, USE_KILL str2, KILL tmp1, KILL tmp2, KILL ccr, KILL tmp3);
+instruct string_equals(o0RegP str1, o1RegP str2, g3RegI cnt, notemp_iRegI result,
+                       o7RegI tmp, flagsReg ccr) %{
+  match(Set result (StrEquals (Binary str1 str2) cnt));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL tmp, KILL ccr);
   ins_cost(300);
-  format %{ "String Equals $str1,$str2 -> $result" %}
-  ins_encode( enc_String_Equals(str1, str2, tmp1, tmp2, result) );
+  format %{ "String Equals $str1,$str2,$cnt -> $result   // KILL $tmp" %}
+  ins_encode( enc_String_Equals(str1, str2, cnt, result) );
   ins_pipe(long_memory_op);
 %}
 
-instruct array_equals(o0RegP ary1, o1RegP ary2, g3RegP tmp1, g4RegP tmp2, notemp_iRegI result,
-                        flagsReg ccr) %{
+instruct array_equals(o0RegP ary1, o1RegP ary2, g3RegI tmp1, notemp_iRegI result,
+                      o7RegI tmp2, flagsReg ccr) %{
   match(Set result (AryEq ary1 ary2));
   effect(USE_KILL ary1, USE_KILL ary2, KILL tmp1, KILL tmp2, KILL ccr);
   ins_cost(300);
-  format %{ "Array Equals $ary1,$ary2 -> $result" %}
-  ins_encode( enc_Array_Equals(ary1, ary2, tmp1, tmp2, result));
+  format %{ "Array Equals $ary1,$ary2 -> $result   // KILL $tmp1,$tmp2" %}
+  ins_encode( enc_Array_Equals(ary1, ary2, tmp1, result));
   ins_pipe(long_memory_op);
 %}
 
@@ -9515,8 +9487,9 @@
   // x |= (x >> 8);
   // x |= (x >> 16);
   // return (WORDBITS - popc(x));
-  format %{ "SRL     $src,1,$dst\t! count leading zeros (int)\n\t"
-            "OR      $src,$tmp,$dst\n\t"
+  format %{ "SRL     $src,1,$tmp\t! count leading zeros (int)\n\t"
+            "SRL     $src,0,$dst\t! 32-bit zero extend\n\t"
+            "OR      $dst,$tmp,$dst\n\t"
             "SRL     $dst,2,$tmp\n\t"
             "OR      $dst,$tmp,$dst\n\t"
             "SRL     $dst,4,$tmp\n\t"
@@ -9533,7 +9506,8 @@
     Register Rsrc = $src$$Register;
     Register Rtmp = $tmp$$Register;
     __ srl(Rsrc, 1, Rtmp);
-    __ or3(Rsrc, Rtmp, Rdst);
+    __ srl(Rsrc, 0, Rdst);
+    __ or3(Rdst, Rtmp, Rdst);
     __ srl(Rdst, 2, Rtmp);
     __ or3(Rdst, Rtmp, Rdst);
     __ srl(Rdst, 4, Rtmp);
@@ -9561,7 +9535,7 @@
   // x |= (x >> 16);
   // x |= (x >> 32);
   // return (WORDBITS - popc(x));
-  format %{ "SRLX    $src,1,$dst\t! count leading zeros (long)\n\t"
+  format %{ "SRLX    $src,1,$tmp\t! count leading zeros (long)\n\t"
             "OR      $src,$tmp,$dst\n\t"
             "SRLX    $dst,2,$tmp\n\t"
             "OR      $dst,$tmp,$dst\n\t"
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/stubGenerator_sparc.cpp
--- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -2862,6 +2862,9 @@
 
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
+
+    // Don't initialize the platform math functions since sparc
+    // doesn't have intrinsics for these operations.
   }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/sparc/vm/templateInterpreter_sparc.cpp
--- a/src/cpu/sparc/vm/templateInterpreter_sparc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/sparc/vm/templateInterpreter_sparc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -150,8 +150,7 @@
 }
 
 
-address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, bool unbox) {
-  assert(!unbox, "NYI");//6815692//
+address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step) {
   address compiled_entry = __ pc();
   Label cont;
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/assembler_x86.cpp
--- a/src/cpu/x86/vm/assembler_x86.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/assembler_x86.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -2251,6 +2251,7 @@
   emit_byte(0x9D);
 }
 
+#ifndef _LP64 // no 32bit push/pop on amd64
 void Assembler::popl(Address dst) {
   // NOTE: this will adjust stack by 8byte on 64bits
   InstructionMark im(this);
@@ -2258,6 +2259,7 @@
   emit_byte(0x8F);
   emit_operand(rax, dst);
 }
+#endif
 
 void Assembler::prefetch_prefix(Address src) {
   prefix(src);
@@ -2428,6 +2430,7 @@
   emit_byte(0x9C);
 }
 
+#ifndef _LP64 // no 32bit push/pop on amd64
 void Assembler::pushl(Address src) {
   // Note this will push 64bit on 64bit
   InstructionMark im(this);
@@ -2435,6 +2438,7 @@
   emit_byte(0xFF);
   emit_operand(rsi, src);
 }
+#endif
 
 void Assembler::pxor(XMMRegister dst, Address src) {
   NOT_LP64(assert(VM_Version::supports_sse2(), ""));
@@ -5591,7 +5595,12 @@
 }
 
 void MacroAssembler::andpd(XMMRegister dst, AddressLiteral src) {
-  andpd(dst, as_Address(src));
+  if (reachable(src)) {
+    andpd(dst, as_Address(src));
+  } else {
+    lea(rscratch1, src);
+    andpd(dst, Address(rscratch1, 0));
+  }
 }
 
 void MacroAssembler::andptr(Register dst, int32_t imm32) {
@@ -6078,11 +6087,21 @@
 }
 
 void MacroAssembler::comisd(XMMRegister dst, AddressLiteral src) {
-  comisd(dst, as_Address(src));
+  if (reachable(src)) {
+    comisd(dst, as_Address(src));
+  } else {
+    lea(rscratch1, src);
+    comisd(dst, Address(rscratch1, 0));
+  }
 }
 
 void MacroAssembler::comiss(XMMRegister dst, AddressLiteral src) {
-  comiss(dst, as_Address(src));
+  if (reachable(src)) {
+    comiss(dst, as_Address(src));
+  } else {
+    lea(rscratch1, src);
+    comiss(dst, Address(rscratch1, 0));
+  }
 }
 
 
@@ -7647,7 +7666,7 @@
 
 #ifdef ASSERT
   Label L;
-  testl(tmp, tmp);
+  testptr(tmp, tmp);
   jccb(Assembler::notZero, L);
   hlt();
   bind(L);
@@ -8214,6 +8233,15 @@
   }
 }
 
+// Used for storing NULLs.
+void MacroAssembler::store_heap_oop_null(Address dst) {
+  if (UseCompressedOops) {
+    movl(dst, (int32_t)NULL_WORD);
+  } else {
+    movslq(dst, (int32_t)NULL_WORD);
+  }
+}
+
 // Algorithm must match oop.inline.hpp encode_heap_oop.
 void MacroAssembler::encode_heap_oop(Register r) {
   assert (UseCompressedOops, "should be compressed");
@@ -8404,6 +8432,321 @@
 }
 #endif // _LP64
 
+// IndexOf substring.
+void MacroAssembler::string_indexof(Register str1, Register str2,
+                                    Register cnt1, Register cnt2, Register result,
+                                    XMMRegister vec, Register tmp) {
+  assert(UseSSE42Intrinsics, "SSE4.2 is required");
+
+  Label RELOAD_SUBSTR, PREP_FOR_SCAN, SCAN_TO_SUBSTR,
+        SCAN_SUBSTR, RET_NOT_FOUND, CLEANUP;
+
+  push(str1); // string addr
+  push(str2); // substr addr
+  push(cnt2); // substr count
+  jmpb(PREP_FOR_SCAN);
+
+  // Substr count saved at sp
+  // Substr saved at sp+1*wordSize
+  // String saved at sp+2*wordSize
+
+  // Reload substr for rescan
+  bind(RELOAD_SUBSTR);
+  movl(cnt2, Address(rsp, 0));
+  movptr(str2, Address(rsp, wordSize));
+  // We came here after the beginninig of the substring was
+  // matched but the rest of it was not so we need to search
+  // again. Start from the next element after the previous match.
+  subptr(str1, result); // Restore counter
+  shrl(str1, 1);
+  addl(cnt1, str1);
+  lea(str1, Address(result, 2)); // Reload string
+
+  // Load substr
+  bind(PREP_FOR_SCAN);
+  movdqu(vec, Address(str2, 0));
+  addl(cnt1, 8);  // prime the loop
+  subptr(str1, 16);
+
+  // Scan string for substr in 16-byte vectors
+  bind(SCAN_TO_SUBSTR);
+  subl(cnt1, 8);
+  addptr(str1, 16);
+
+  // pcmpestri
+  //   inputs:
+  //     xmm - substring
+  //     rax - substring length (elements count)
+  //     mem - scaned string
+  //     rdx - string length (elements count)
+  //     0xd - mode: 1100 (substring search) + 01 (unsigned shorts)
+  //   outputs:
+  //     rcx - matched index in string
+  assert(cnt1 == rdx && cnt2 == rax && tmp == rcx, "pcmpestri");
+
+  pcmpestri(vec, Address(str1, 0), 0x0d);
+  jcc(Assembler::above, SCAN_TO_SUBSTR);      // CF == 0 && ZF == 0
+  jccb(Assembler::aboveEqual, RET_NOT_FOUND); // CF == 0
+
+  // Fallthrough: found a potential substr
+
+  // Make sure string is still long enough
+  subl(cnt1, tmp);
+  cmpl(cnt1, cnt2);
+  jccb(Assembler::negative, RET_NOT_FOUND);
+  // Compute start addr of substr
+  lea(str1, Address(str1, tmp, Address::times_2));
+  movptr(result, str1); // save
+
+  // Compare potential substr
+  addl(cnt1, 8);     // prime the loop
+  addl(cnt2, 8);
+  subptr(str1, 16);
+  subptr(str2, 16);
+
+  // Scan 16-byte vectors of string and substr
+  bind(SCAN_SUBSTR);
+  subl(cnt1, 8);
+  subl(cnt2, 8);
+  addptr(str1, 16);
+  addptr(str2, 16);
+  movdqu(vec, Address(str2, 0));
+  pcmpestri(vec, Address(str1, 0), 0x0d);
+  jcc(Assembler::noOverflow, RELOAD_SUBSTR); // OF == 0
+  jcc(Assembler::positive, SCAN_SUBSTR);     // SF == 0
+
+  // Compute substr offset
+  subptr(result, Address(rsp, 2*wordSize));
+  shrl(result, 1); // index
+  jmpb(CLEANUP);
+
+  bind(RET_NOT_FOUND);
+  movl(result, -1);
+
+  bind(CLEANUP);
+  addptr(rsp, 3*wordSize);
+}
+
+// Compare strings.
+void MacroAssembler::string_compare(Register str1, Register str2,
+                                    Register cnt1, Register cnt2, Register result,
+                                    XMMRegister vec1, XMMRegister vec2) {
+  Label LENGTH_DIFF_LABEL, POP_LABEL, DONE_LABEL, WHILE_HEAD_LABEL;
+
+  // Compute the minimum of the string lengths and the
+  // difference of the string lengths (stack).
+  // Do the conditional move stuff
+  movl(result, cnt1);
+  subl(cnt1, cnt2);
+  push(cnt1);
+  if (VM_Version::supports_cmov()) {
+    cmovl(Assembler::lessEqual, cnt2, result);
+  } else {
+    Label GT_LABEL;
+    jccb(Assembler::greater, GT_LABEL);
+    movl(cnt2, result);
+    bind(GT_LABEL);
+  }
+
+  // Is the minimum length zero?
+  testl(cnt2, cnt2);
+  jcc(Assembler::zero, LENGTH_DIFF_LABEL);
+
+  // Load first characters
+  load_unsigned_short(result, Address(str1, 0));
+  load_unsigned_short(cnt1, Address(str2, 0));
+
+  // Compare first characters
+  subl(result, cnt1);
+  jcc(Assembler::notZero,  POP_LABEL);
+  decrementl(cnt2);
+  jcc(Assembler::zero, LENGTH_DIFF_LABEL);
+
+  {
+    // Check after comparing first character to see if strings are equivalent
+    Label LSkip2;
+    // Check if the strings start at same location
+    cmpptr(str1, str2);
+    jccb(Assembler::notEqual, LSkip2);
+
+    // Check if the length difference is zero (from stack)
+    cmpl(Address(rsp, 0), 0x0);
+    jcc(Assembler::equal,  LENGTH_DIFF_LABEL);
+
+    // Strings might not be equivalent
+    bind(LSkip2);
+  }
+
+  // Advance to next character
+  addptr(str1, 2);
+  addptr(str2, 2);
+
+  if (UseSSE42Intrinsics) {
+    // With SSE4.2, use double quad vector compare
+    Label COMPARE_VECTORS, VECTOR_NOT_EQUAL, COMPARE_TAIL;
+    // Setup to compare 16-byte vectors
+    movl(cnt1, cnt2);
+    andl(cnt2, 0xfffffff8); // cnt2 holds the vector count
+    andl(cnt1, 0x00000007); // cnt1 holds the tail count
+    testl(cnt2, cnt2);
+    jccb(Assembler::zero, COMPARE_TAIL);
+
+    lea(str2, Address(str2, cnt2, Address::times_2));
+    lea(str1, Address(str1, cnt2, Address::times_2));
+    negptr(cnt2);
+
+    bind(COMPARE_VECTORS);
+    movdqu(vec1, Address(str1, cnt2, Address::times_2));
+    movdqu(vec2, Address(str2, cnt2, Address::times_2));
+    pxor(vec1, vec2);
+    ptest(vec1, vec1);
+    jccb(Assembler::notZero, VECTOR_NOT_EQUAL);
+    addptr(cnt2, 8);
+    jcc(Assembler::notZero, COMPARE_VECTORS);
+    jmpb(COMPARE_TAIL);
+
+    // Mismatched characters in the vectors
+    bind(VECTOR_NOT_EQUAL);
+    lea(str1, Address(str1, cnt2, Address::times_2));
+    lea(str2, Address(str2, cnt2, Address::times_2));
+    movl(cnt1, 8);
+
+    // Compare tail (< 8 chars), or rescan last vectors to
+    // find 1st mismatched characters
+    bind(COMPARE_TAIL);
+    testl(cnt1, cnt1);
+    jccb(Assembler::zero, LENGTH_DIFF_LABEL);
+    movl(cnt2, cnt1);
+    // Fallthru to tail compare
+  }
+
+  // Shift str2 and str1 to the end of the arrays, negate min
+  lea(str1, Address(str1, cnt2, Address::times_2, 0));
+  lea(str2, Address(str2, cnt2, Address::times_2, 0));
+  negptr(cnt2);
+
+    // Compare the rest of the characters
+  bind(WHILE_HEAD_LABEL);
+  load_unsigned_short(result, Address(str1, cnt2, Address::times_2, 0));
+  load_unsigned_short(cnt1, Address(str2, cnt2, Address::times_2, 0));
+  subl(result, cnt1);
+  jccb(Assembler::notZero, POP_LABEL);
+  increment(cnt2);
+  jcc(Assembler::notZero, WHILE_HEAD_LABEL);
+
+  // Strings are equal up to min length.  Return the length difference.
+  bind(LENGTH_DIFF_LABEL);
+  pop(result);
+  jmpb(DONE_LABEL);
+
+  // Discard the stored length difference
+  bind(POP_LABEL);
+  addptr(rsp, wordSize);
+
+  // That's it
+  bind(DONE_LABEL);
+}
+
+// Compare char[] arrays aligned to 4 bytes or substrings.
+void MacroAssembler::char_arrays_equals(bool is_array_equ, Register ary1, Register ary2,
+                                        Register limit, Register result, Register chr,
+                                        XMMRegister vec1, XMMRegister vec2) {
+  Label TRUE_LABEL, FALSE_LABEL, DONE, COMPARE_VECTORS, COMPARE_CHAR;
+
+  int length_offset  = arrayOopDesc::length_offset_in_bytes();
+  int base_offset    = arrayOopDesc::base_offset_in_bytes(T_CHAR);
+
+  // Check the input args
+  cmpptr(ary1, ary2);
+  jcc(Assembler::equal, TRUE_LABEL);
+
+  if (is_array_equ) {
+    // Need additional checks for arrays_equals.
+    testptr(ary1, ary1);
+    jcc(Assembler::zero, FALSE_LABEL);
+    testptr(ary2, ary2);
+    jcc(Assembler::zero, FALSE_LABEL);
+
+    // Check the lengths
+    movl(limit, Address(ary1, length_offset));
+    cmpl(limit, Address(ary2, length_offset));
+    jcc(Assembler::notEqual, FALSE_LABEL);
+  }
+
+  // count == 0
+  testl(limit, limit);
+  jcc(Assembler::zero, TRUE_LABEL);
+
+  if (is_array_equ) {
+    // Load array address
+    lea(ary1, Address(ary1, base_offset));
+    lea(ary2, Address(ary2, base_offset));
+  }
+
+  shll(limit, 1);      // byte count != 0
+  movl(result, limit); // copy
+
+  if (UseSSE42Intrinsics) {
+    // With SSE4.2, use double quad vector compare
+    Label COMPARE_WIDE_VECTORS, COMPARE_TAIL;
+    // Compare 16-byte vectors
+    andl(result, 0x0000000e);  //   tail count (in bytes)
+    andl(limit, 0xfffffff0);   // vector count (in bytes)
+    jccb(Assembler::zero, COMPARE_TAIL);
+
+    lea(ary1, Address(ary1, limit, Address::times_1));
+    lea(ary2, Address(ary2, limit, Address::times_1));
+    negptr(limit);
+
+    bind(COMPARE_WIDE_VECTORS);
+    movdqu(vec1, Address(ary1, limit, Address::times_1));
+    movdqu(vec2, Address(ary2, limit, Address::times_1));
+    pxor(vec1, vec2);
+    ptest(vec1, vec1);
+    jccb(Assembler::notZero, FALSE_LABEL);
+    addptr(limit, 16);
+    jcc(Assembler::notZero, COMPARE_WIDE_VECTORS);
+
+    bind(COMPARE_TAIL); // limit is zero
+    movl(limit, result);
+    // Fallthru to tail compare
+  }
+
+  // Compare 4-byte vectors
+  andl(limit, 0xfffffffc); // vector count (in bytes)
+  jccb(Assembler::zero, COMPARE_CHAR);
+
+  lea(ary1, Address(ary1, limit, Address::times_1));
+  lea(ary2, Address(ary2, limit, Address::times_1));
+  negptr(limit);
+
+  bind(COMPARE_VECTORS);
+  movl(chr, Address(ary1, limit, Address::times_1));
+  cmpl(chr, Address(ary2, limit, Address::times_1));
+  jccb(Assembler::notEqual, FALSE_LABEL);
+  addptr(limit, 4);
+  jcc(Assembler::notZero, COMPARE_VECTORS);
+
+  // Compare trailing char (final 2 bytes), if any
+  bind(COMPARE_CHAR);
+  testl(result, 0x2);   // tail  char
+  jccb(Assembler::zero, TRUE_LABEL);
+  load_unsigned_short(chr, Address(ary1, 0));
+  load_unsigned_short(limit, Address(ary2, 0));
+  cmpl(chr, limit);
+  jccb(Assembler::notEqual, FALSE_LABEL);
+
+  bind(TRUE_LABEL);
+  movl(result, 1);   // return true
+  jmpb(DONE);
+
+  bind(FALSE_LABEL);
+  xorl(result, result); // return false
+
+  // That's it
+  bind(DONE);
+}
+
 Assembler::Condition MacroAssembler::negate_condition(Assembler::Condition cond) {
   switch (cond) {
     // Note some conditions are synonyms for others
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/assembler_x86.hpp
--- a/src/cpu/x86/vm/assembler_x86.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/assembler_x86.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1244,7 +1244,9 @@
   void pcmpestri(XMMRegister xmm1, XMMRegister xmm2, int imm8);
   void pcmpestri(XMMRegister xmm1, Address src, int imm8);
 
+#ifndef _LP64 // no 32bit push/pop on amd64
   void popl(Address dst);
+#endif
 
 #ifdef _LP64
   void popq(Address dst);
@@ -1285,7 +1287,9 @@
   // Interleave Low Bytes
   void punpcklbw(XMMRegister dst, XMMRegister src);
 
+#ifndef _LP64 // no 32bit push/pop on amd64
   void pushl(Address src);
+#endif
 
   void pushq(Address src);
 
@@ -1682,6 +1686,17 @@
 
   void load_heap_oop(Register dst, Address src);
   void store_heap_oop(Address dst, Register src);
+
+  // This dummy is to prevent a call to store_heap_oop from
+  // converting a zero (like NULL) into a Register by giving
+  // the compiler two choices it can't resolve
+
+  void store_heap_oop(Address dst, void* dummy);
+
+  // Used for storing NULL. All other oop constants should be
+  // stored using routines that take a jobject.
+  void store_heap_oop_null(Address dst);
+
   void encode_heap_oop(Register r);
   void decode_heap_oop(Register r);
   void encode_heap_oop_not_null(Register r);
@@ -2206,6 +2221,20 @@
   void movl2ptr(Register dst, Address src) { LP64_ONLY(movslq(dst, src)) NOT_LP64(movl(dst, src)); }
   void movl2ptr(Register dst, Register src) { LP64_ONLY(movslq(dst, src)) NOT_LP64(if (dst != src) movl(dst, src)); }
 
+  // IndexOf strings.
+  void string_indexof(Register str1, Register str2,
+                      Register cnt1, Register cnt2, Register result,
+                      XMMRegister vec, Register tmp);
+
+  // Compare strings.
+  void string_compare(Register str1, Register str2,
+                      Register cnt1, Register cnt2, Register result,
+                      XMMRegister vec1, XMMRegister vec2);
+
+  // Compare char[] arrays.
+  void char_arrays_equals(bool is_array_equ, Register ary1, Register ary2,
+                          Register limit, Register result, Register chr,
+                          XMMRegister vec1, XMMRegister vec2);
 
 #undef VIRTUAL
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
--- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2010 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
@@ -301,22 +301,25 @@
   Register OSR_buf = osrBufferPointer()->as_pointer_register();
   { assert(frame::interpreter_frame_monitor_size() == BasicObjectLock::size(), "adjust code below");
     int monitor_offset = BytesPerWord * method()->max_locals() +
-      (BasicObjectLock::size() * BytesPerWord) * (number_of_locks - 1);
+      (2 * BytesPerWord) * (number_of_locks - 1);
+    // SharedRuntime::OSR_migration_begin() packs BasicObjectLocks in
+    // the OSR buffer using 2 word entries: first the lock and then
+    // the oop.
     for (int i = 0; i < number_of_locks; i++) {
-      int slot_offset = monitor_offset - ((i * BasicObjectLock::size()) * BytesPerWord);
+      int slot_offset = monitor_offset - ((i * 2) * BytesPerWord);
 #ifdef ASSERT
       // verify the interpreter's monitor has a non-null object
       {
         Label L;
-        __ cmpptr(Address(OSR_buf, slot_offset + BasicObjectLock::obj_offset_in_bytes()), (int32_t)NULL_WORD);
+        __ cmpptr(Address(OSR_buf, slot_offset + 1*BytesPerWord), (int32_t)NULL_WORD);
         __ jcc(Assembler::notZero, L);
         __ stop("locked object is NULL");
         __ bind(L);
       }
 #endif
-      __ movptr(rbx, Address(OSR_buf, slot_offset + BasicObjectLock::lock_offset_in_bytes()));
+      __ movptr(rbx, Address(OSR_buf, slot_offset + 0));
       __ movptr(frame_map()->address_for_monitor_lock(i), rbx);
-      __ movptr(rbx, Address(OSR_buf, slot_offset + BasicObjectLock::obj_offset_in_bytes()));
+      __ movptr(rbx, Address(OSR_buf, slot_offset + 1*BytesPerWord));
       __ movptr(frame_map()->address_for_monitor_object(i), rbx);
     }
   }
@@ -415,13 +418,12 @@
 }
 
 
-void LIR_Assembler::emit_exception_handler() {
+int LIR_Assembler::emit_exception_handler() {
   // if the last instruction is a call (typically to do a throw which
   // is coming at the end after block reordering) the return address
   // must still point into the code area in order to avoid assertion
   // failures when searching for the corresponding bci => add a nop
   // (was bug 5/14/1999 - gri)
-
   __ nop();
 
   // generate code for exception handler
@@ -429,17 +431,14 @@
   if (handler_base == NULL) {
     // not enough space left for the handler
     bailout("exception handler overflow");
-    return;
+    return -1;
   }
-#ifdef ASSERT
+
   int offset = code_offset();
-#endif // ASSERT
-
-  compilation()->offsets()->set_value(CodeOffsets::Exceptions, code_offset());
 
   // if the method does not have an exception handler, then there is
   // no reason to search for one
-  if (compilation()->has_exception_handlers() || compilation()->env()->jvmti_can_post_exceptions()) {
+  if (compilation()->has_exception_handlers() || compilation()->env()->jvmti_can_post_on_exceptions()) {
     // the exception oop and pc are in rax, and rdx
     // no other registers need to be preserved, so invalidate them
     __ invalidate_registers(false, true, true, false, true, true);
@@ -471,19 +470,19 @@
   // unwind activation and forward exception to caller
   // rax,: exception
   __ jump(RuntimeAddress(Runtime1::entry_for(Runtime1::unwind_exception_id)));
-
   assert(code_offset() - offset <= exception_handler_size, "overflow");
-
   __ end_a_stub();
+
+  return offset;
 }
 
-void LIR_Assembler::emit_deopt_handler() {
+
+int LIR_Assembler::emit_deopt_handler() {
   // if the last instruction is a call (typically to do a throw which
   // is coming at the end after block reordering) the return address
   // must still point into the code area in order to avoid assertion
   // failures when searching for the corresponding bci => add a nop
   // (was bug 5/14/1999 - gri)
-
   __ nop();
 
   // generate code for exception handler
@@ -491,23 +490,17 @@
   if (handler_base == NULL) {
     // not enough space left for the handler
     bailout("deopt handler overflow");
-    return;
+    return -1;
   }
-#ifdef ASSERT
+
   int offset = code_offset();
-#endif // ASSERT
-
-  compilation()->offsets()->set_value(CodeOffsets::Deopt, code_offset());
-
   InternalAddress here(__ pc());
   __ pushptr(here.addr());
-
   __ jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
-
   assert(code_offset() - offset <= deopt_handler_size, "overflow");
-
   __ end_a_stub();
 
+  return offset;
 }
 
 
@@ -785,7 +778,13 @@
           ShouldNotReachHere();
           __ movoop(as_Address(addr, noreg), c->as_jobject());
         } else {
+#ifdef _LP64
+          __ movoop(rscratch1, c->as_jobject());
+          null_check_here = code_offset();
+          __ movptr(as_Address_lo(addr), rscratch1);
+#else
           __ movoop(as_Address(addr), c->as_jobject());
+#endif
         }
       }
       break;
@@ -1118,8 +1117,14 @@
       __ pushptr(frame_map()->address_for_slot(src ->single_stack_ix()));
       __ popptr (frame_map()->address_for_slot(dest->single_stack_ix()));
     } else {
+#ifndef _LP64
       __ pushl(frame_map()->address_for_slot(src ->single_stack_ix()));
       __ popl (frame_map()->address_for_slot(dest->single_stack_ix()));
+#else
+      //no pushl on 64bits
+      __ movl(rscratch1, frame_map()->address_for_slot(src ->single_stack_ix()));
+      __ movl(frame_map()->address_for_slot(dest->single_stack_ix()), rscratch1);
+#endif
     }
 
   } else if (src->is_double_stack()) {
@@ -1638,7 +1643,7 @@
       jobject2reg_with_patching(k_RInfo, op->info_for_patch());
     } else {
 #ifdef _LP64
-      __ movoop(k_RInfo, k->encoding());
+      __ movoop(k_RInfo, k->constant_encoding());
 #else
       k_RInfo = noreg;
 #endif // _LP64
@@ -1661,7 +1666,7 @@
       assert(data != NULL,       "need data for checkcast");
       assert(data->is_BitData(), "need BitData for checkcast");
       Register mdo  = klass_RInfo;
-      __ movoop(mdo, md->encoding());
+      __ movoop(mdo, md->constant_encoding());
       Address data_addr(mdo, md->byte_offset_of_slot(data, DataLayout::header_offset()));
       int header_bits = DataLayout::flag_mask_to_header_mask(BitData::null_seen_byte_constant());
       __ orl(data_addr, header_bits);
@@ -1679,7 +1684,7 @@
 #ifdef _LP64
         __ cmpptr(k_RInfo, Address(obj, oopDesc::klass_offset_in_bytes()));
 #else
-        __ cmpoop(Address(obj, oopDesc::klass_offset_in_bytes()), k->encoding());
+        __ cmpoop(Address(obj, oopDesc::klass_offset_in_bytes()), k->constant_encoding());
 #endif // _LP64
       } else {
         __ cmpptr(k_RInfo, Address(obj, oopDesc::klass_offset_in_bytes()));
@@ -1696,7 +1701,7 @@
 #ifdef _LP64
         __ cmpptr(k_RInfo, Address(klass_RInfo, k->super_check_offset()));
 #else
-        __ cmpoop(Address(klass_RInfo, k->super_check_offset()), k->encoding());
+        __ cmpoop(Address(klass_RInfo, k->super_check_offset()), k->constant_encoding());
 #endif // _LP64
         if (sizeof(oopDesc) + Klass::secondary_super_cache_offset_in_bytes() != k->super_check_offset()) {
           __ jcc(Assembler::notEqual, *stub->entry());
@@ -1707,7 +1712,7 @@
 #ifdef _LP64
           __ cmpptr(klass_RInfo, k_RInfo);
 #else
-          __ cmpoop(klass_RInfo, k->encoding());
+          __ cmpoop(klass_RInfo, k->constant_encoding());
 #endif // _LP64
           __ jcc(Assembler::equal, done);
 
@@ -1715,7 +1720,7 @@
 #ifdef _LP64
           __ push(k_RInfo);
 #else
-          __ pushoop(k->encoding());
+          __ pushoop(k->constant_encoding());
 #endif // _LP64
           __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::slow_subtype_check_id)));
           __ pop(klass_RInfo);
@@ -1763,7 +1768,7 @@
     if (!k->is_loaded()) {
       jobject2reg_with_patching(k_RInfo, op->info_for_patch());
     } else {
-      LP64_ONLY(__ movoop(k_RInfo, k->encoding()));
+      LP64_ONLY(__ movoop(k_RInfo, k->constant_encoding()));
     }
     assert(obj != k_RInfo, "must be different");
 
@@ -1774,7 +1779,7 @@
       // get object class
       // not a safepoint as obj null check happens earlier
       if (LP64_ONLY(false &&) k->is_loaded()) {
-        NOT_LP64(__ cmpoop(Address(obj, oopDesc::klass_offset_in_bytes()), k->encoding()));
+        NOT_LP64(__ cmpoop(Address(obj, oopDesc::klass_offset_in_bytes()), k->constant_encoding()));
         k_RInfo = noreg;
       } else {
         __ cmpptr(k_RInfo, Address(obj, oopDesc::klass_offset_in_bytes()));
@@ -1791,14 +1796,14 @@
 #ifndef _LP64
       if (k->is_loaded()) {
         // See if we get an immediate positive hit
-        __ cmpoop(Address(klass_RInfo, k->super_check_offset()), k->encoding());
+        __ cmpoop(Address(klass_RInfo, k->super_check_offset()), k->constant_encoding());
         __ jcc(Assembler::equal, one);
         if (sizeof(oopDesc) + Klass::secondary_super_cache_offset_in_bytes() == k->super_check_offset()) {
           // check for self
-          __ cmpoop(klass_RInfo, k->encoding());
+          __ cmpoop(klass_RInfo, k->constant_encoding());
           __ jcc(Assembler::equal, one);
           __ push(klass_RInfo);
-          __ pushoop(k->encoding());
+          __ pushoop(k->constant_encoding());
           __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::slow_subtype_check_id)));
           __ pop(klass_RInfo);
           __ pop(dst);
@@ -3112,7 +3117,7 @@
     // subtype which we can't check or src is the same array as dst
     // but not necessarily exactly of type default_type.
     Label known_ok, halt;
-    __ movoop(tmp, default_type->encoding());
+    __ movoop(tmp, default_type->constant_encoding());
     if (basic_type != T_OBJECT) {
       __ cmpptr(tmp, dst_klass_addr);
       __ jcc(Assembler::notEqual, halt);
@@ -3136,8 +3141,10 @@
 
 #ifdef _LP64
   assert_different_registers(c_rarg0, dst, dst_pos, length);
+  __ movl2ptr(src_pos, src_pos); //higher 32bits must be null
   __ lea(c_rarg0, Address(src, src_pos, scale, arrayOopDesc::base_offset_in_bytes(basic_type)));
   assert_different_registers(c_rarg1, length);
+  __ movl2ptr(dst_pos, dst_pos); //higher 32bits must be null
   __ lea(c_rarg1, Address(dst, dst_pos, scale, arrayOopDesc::base_offset_in_bytes(basic_type)));
   __ mov(c_rarg2, length);
 
@@ -3200,9 +3207,8 @@
   assert(data->is_CounterData(), "need CounterData for calls");
   assert(op->mdo()->is_single_cpu(),  "mdo must be allocated");
   Register mdo  = op->mdo()->as_register();
-  __ movoop(mdo, md->encoding());
+  __ movoop(mdo, md->constant_encoding());
   Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
-  __ addl(counter_addr, DataLayout::counter_increment);
   Bytecodes::Code bc = method->java_code_at_bci(bci);
   // Perform additional virtual call profiling for invokevirtual and
   // invokeinterface bytecodes
@@ -3240,7 +3246,7 @@
         ciKlass* receiver = vc_data->receiver(i);
         if (receiver == NULL) {
           Address recv_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_offset(i)));
-          __ movoop(recv_addr, known_klass->encoding());
+          __ movoop(recv_addr, known_klass->constant_encoding());
           Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)));
           __ addl(data_addr, DataLayout::counter_increment);
           return;
@@ -3269,14 +3275,18 @@
         __ jcc(Assembler::notEqual, next_test);
         __ movptr(recv_addr, recv);
         __ movl(Address(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i))), DataLayout::counter_increment);
-        if (i < (VirtualCallData::row_limit() - 1)) {
-          __ jmp(update_done);
-        }
+        __ jmp(update_done);
         __ bind(next_test);
       }
+      // Receiver did not match any saved receiver and there is no empty row for it.
+      // Increment total counter to indicate polymorphic case.
+      __ addl(counter_addr, DataLayout::counter_increment);
 
       __ bind(update_done);
     }
+  } else {
+    // Static call
+    __ addl(counter_addr, DataLayout::counter_increment);
   }
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
--- a/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 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
@@ -755,8 +755,19 @@
   }
 
   LIR_Opr addr = new_pointer_register();
-  __ move(obj.result(), addr);
-  __ add(addr, offset.result(), addr);
+  LIR_Address* a;
+  if(offset.result()->is_constant()) {
+    a = new LIR_Address(obj.result(),
+                        NOT_LP64(offset.result()->as_constant_ptr()->as_jint()) LP64_ONLY((int)offset.result()->as_constant_ptr()->as_jlong()),
+                        as_BasicType(type));
+  } else {
+    a = new LIR_Address(obj.result(),
+                        offset.result(),
+                        LIR_Address::times_1,
+                        0,
+                        as_BasicType(type));
+  }
+  __ leal(LIR_OprFact::address(a), addr);
 
   if (type == objectType) {  // Write-barrier needed for Object fields.
     // Do the pre-write barrier, if any.
@@ -827,8 +838,8 @@
     case vmIntrinsics::_dsin:   __ sin  (calc_input, calc_result, tmp1, tmp2);              break;
     case vmIntrinsics::_dcos:   __ cos  (calc_input, calc_result, tmp1, tmp2);              break;
     case vmIntrinsics::_dtan:   __ tan  (calc_input, calc_result, tmp1, tmp2);              break;
-    case vmIntrinsics::_dlog:   __ log  (calc_input, calc_result, LIR_OprFact::illegalOpr); break;
-    case vmIntrinsics::_dlog10: __ log10(calc_input, calc_result, LIR_OprFact::illegalOpr); break;
+    case vmIntrinsics::_dlog:   __ log  (calc_input, calc_result, tmp1);                    break;
+    case vmIntrinsics::_dlog10: __ log10(calc_input, calc_result, tmp1);                    break;
     default:                    ShouldNotReachHere();
   }
 
@@ -994,7 +1005,7 @@
   LIR_Opr len = length.result();
   BasicType elem_type = x->elt_type();
 
-  __ oop2reg(ciTypeArrayKlass::make(elem_type)->encoding(), klass_reg);
+  __ oop2reg(ciTypeArrayKlass::make(elem_type)->constant_encoding(), klass_reg);
 
   CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info);
   __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path);
@@ -1047,16 +1058,17 @@
     items->at_put(i, size);
   }
 
-  // need to get the info before, as the items may become invalid through item_free
+  // Evaluate state_for early since it may emit code.
   CodeEmitInfo* patching_info = NULL;
   if (!x->klass()->is_loaded() || PatchALot) {
     patching_info = state_for(x, x->state_before());
 
     // cannot re-use same xhandlers for multiple CodeEmitInfos, so
-    // clone all handlers.
+    // clone all handlers.  This is handled transparently in other
+    // places by the CodeEmitInfo cloning logic but is handled
+    // specially here because a stub isn't being used.
     x->set_exception_handlers(new XHandlers(x->exception_handlers()));
   }
-
   CodeEmitInfo* info = state_for(x, x->state());
 
   i = dims->length();
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/c1_LinearScan_x86.cpp
--- a/src/cpu/x86/vm/c1_LinearScan_x86.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/c1_LinearScan_x86.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -764,8 +764,6 @@
       break;
     }
 
-    case lir_log:
-    case lir_log10:
     case lir_abs:
     case lir_sqrt: {
       // Right argument appears to be unused
@@ -785,6 +783,30 @@
       break;
     }
 
+    case lir_log:
+    case lir_log10: {
+      // log and log10 needs one temporary fpu stack slot, so there is ontemporary
+      // registers stored in temp of the operation.
+      // the stack allocator must guarantee that the stack slots are really free,
+      // otherwise there might be a stack overflow.
+      assert(right->is_illegal(), "must be");
+      assert(left->is_fpu_register(), "must be");
+      assert(res->is_fpu_register(), "must be");
+      assert(op2->tmp_opr()->is_fpu_register(), "must be");
+
+      insert_free_if_dead(op2->tmp_opr());
+      insert_free_if_dead(res, left);
+      insert_exchange(left);
+      do_rename(left, res);
+
+      new_left = to_fpu_stack_top(res);
+      new_res = new_left;
+
+      op2->set_fpu_stack_size(sim()->stack_size());
+      assert(sim()->stack_size() <= 7, "at least one stack slot must be free");
+      break;
+    }
+
 
     case lir_tan:
     case lir_sin:
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/c1_globals_x86.hpp
--- a/src/cpu/x86/vm/c1_globals_x86.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/c1_globals_x86.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,10 +22,8 @@
  *
  */
 
-//
 // Sets the default values for platform dependent flags used by the client compiler.
 // (see c1_globals.hpp)
-//
 
 #ifndef TIERED
 define_pd_global(bool, BackgroundCompilation,        true );
@@ -48,27 +46,24 @@
 
 define_pd_global(intx, OnStackReplacePercentage,     933  );
 define_pd_global(intx, FreqInlineSize,               325  );
-define_pd_global(intx, NewRatio,                     12   );
 define_pd_global(intx, NewSizeThreadIncrease,        4*K  );
 define_pd_global(intx, InitialCodeCacheSize,         160*K);
 define_pd_global(intx, ReservedCodeCacheSize,        32*M );
 define_pd_global(bool, ProfileInterpreter,           false);
 define_pd_global(intx, CodeCacheExpansionSize,       32*K );
 define_pd_global(uintx,CodeCacheMinBlockLength,      1);
-define_pd_global(uintx, PermSize,                    12*M );
-define_pd_global(uintx, MaxPermSize,                 64*M );
-define_pd_global(bool, NeverActAsServerClassMachine, true);
-define_pd_global(uintx, DefaultMaxRAM,               1*G);
+define_pd_global(uintx,PermSize,                     12*M );
+define_pd_global(uintx,MaxPermSize,                  64*M );
+define_pd_global(bool, NeverActAsServerClassMachine, true );
+define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
 define_pd_global(bool, CICompileOSR,                 true );
-#endif // TIERED
+#endif // !TIERED
 define_pd_global(bool, UseTypeProfile,               false);
 define_pd_global(bool, RoundFPResults,               true );
 
-
 define_pd_global(bool, LIRFillDelaySlots,            false);
-define_pd_global(bool, OptimizeSinglePrecision,      true);
+define_pd_global(bool, OptimizeSinglePrecision,      true );
 define_pd_global(bool, CSEArrayLength,               false);
-define_pd_global(bool, TwoOperandLIRForm,            true);
+define_pd_global(bool, TwoOperandLIRForm,            true );
 
-
-define_pd_global(intx, SafepointPollOffset, 256);
+define_pd_global(intx, SafepointPollOffset,          256  );
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/c2_globals_x86.hpp
--- a/src/cpu/x86/vm/c2_globals_x86.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/c2_globals_x86.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,7 +22,6 @@
  *
  */
 
-//
 // Sets the default values for platform dependent flags used by the server compiler.
 // (see c2_globals.hpp).  Alpha-sorted.
 
@@ -46,8 +45,8 @@
 define_pd_global(intx, CompileThreshold,             10000);
 #endif // TIERED
 define_pd_global(intx, Tier2CompileThreshold,        10000);
-define_pd_global(intx, Tier3CompileThreshold,        20000 );
-define_pd_global(intx, Tier4CompileThreshold,        40000 );
+define_pd_global(intx, Tier3CompileThreshold,        20000);
+define_pd_global(intx, Tier4CompileThreshold,        40000);
 
 define_pd_global(intx, BackEdgeThreshold,            100000);
 define_pd_global(intx, Tier2BackEdgeThreshold,       100000);
@@ -61,7 +60,6 @@
 #ifdef AMD64
 define_pd_global(intx, INTPRESSURE,                  13);
 define_pd_global(intx, InteriorEntryAlignment,       16);
-define_pd_global(intx, NewRatio,                     2);
 define_pd_global(intx, NewSizeThreadIncrease, ScaleForWordSize(4*K));
 define_pd_global(intx, LoopUnrollLimit,              60);
 // InitialCodeCacheSize derived from specjbb2000 run.
@@ -69,19 +67,18 @@
 define_pd_global(intx, CodeCacheExpansionSize,       64*K);
 
 // Ergonomics related flags
-define_pd_global(uintx, DefaultMaxRAM, 32*G);
+define_pd_global(uint64_t,MaxRAM,                    128ULL*G);
 #else
 define_pd_global(intx, INTPRESSURE,                  6);
 define_pd_global(intx, InteriorEntryAlignment,       4);
-define_pd_global(intx, NewRatio,                     8); // Design center runs on 1.3.1
 define_pd_global(intx, NewSizeThreadIncrease,        4*K);
-define_pd_global(intx, LoopUnrollLimit,              50); // Design center runs on 1.3.1
+define_pd_global(intx, LoopUnrollLimit,              50);     // Design center runs on 1.3.1
 // InitialCodeCacheSize derived from specjbb2000 run.
 define_pd_global(intx, InitialCodeCacheSize,         2304*K); // Integral multiple of CodeCacheExpansionSize
 define_pd_global(intx, CodeCacheExpansionSize,       32*K);
 
 // Ergonomics related flags
-define_pd_global(uintx, DefaultMaxRAM, 1*G);
+define_pd_global(uint64_t,MaxRAM,                    4ULL*G);
 #endif // AMD64
 define_pd_global(intx, OptoLoopAlignment,            16);
 define_pd_global(intx, RegisterCostAreaRatio,        16000);
@@ -97,8 +94,8 @@
 define_pd_global(uintx,CodeCacheMinBlockLength,      4);
 
 // Heap related flags
-define_pd_global(uintx, PermSize,    ScaleForWordSize(16*M));
-define_pd_global(uintx, MaxPermSize, ScaleForWordSize(64*M));
+define_pd_global(uintx,PermSize,    ScaleForWordSize(16*M));
+define_pd_global(uintx,MaxPermSize, ScaleForWordSize(64*M));
 
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/frame_x86.cpp
--- a/src/cpu/x86/vm/frame_x86.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/frame_x86.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -222,9 +222,9 @@
   }
   ((address *)sp())[-1] = pc;
   _cb = CodeCache::find_blob(pc);
-  if (_cb != NULL && _cb->is_nmethod() && ((nmethod*)_cb)->is_deopt_pc(_pc)) {
-    address orig = (((nmethod*)_cb)->get_original_pc(this));
-    assert(orig == _pc, "expected original to be stored before patching");
+  address original_pc = nmethod::get_deopt_original_pc(this);
+  if (original_pc != NULL) {
+    assert(original_pc == _pc, "expected original PC to be stored before patching");
     _deopt_state = is_deoptimized;
     // leave _pc as is
   } else {
@@ -323,13 +323,63 @@
   return fr;
 }
 
+
+//------------------------------------------------------------------------------
+// frame::verify_deopt_original_pc
+//
+// Verifies the calculated original PC of a deoptimization PC for the
+// given unextended SP.  The unextended SP might also be the saved SP
+// for MethodHandle call sites.
+#if ASSERT
+void frame::verify_deopt_original_pc(nmethod* nm, intptr_t* unextended_sp, bool is_method_handle_return) {
+  frame fr;
+
+  // This is ugly but it's better than to change {get,set}_original_pc
+  // to take an SP value as argument.  And it's only a debugging
+  // method anyway.
+  fr._unextended_sp = unextended_sp;
+
+  address original_pc = nm->get_original_pc(&fr);
+  assert(nm->code_contains(original_pc), "original PC must be in nmethod");
+  assert(nm->is_method_handle_return(original_pc) == is_method_handle_return, "must be");
+}
+#endif
+
+
+//------------------------------------------------------------------------------
+// frame::sender_for_interpreter_frame
 frame frame::sender_for_interpreter_frame(RegisterMap* map) const {
-  // sp is the raw sp from the sender after adapter or interpreter extension
-  intptr_t* sp = (intptr_t*) addr_at(sender_sp_offset);
+  // SP is the raw SP from the sender after adapter or interpreter
+  // extension.
+  intptr_t* sender_sp = this->sender_sp();
 
   // This is the sp before any possible extension (adapter/locals).
   intptr_t* unextended_sp = interpreter_frame_sender_sp();
 
+  // Stored FP.
+  intptr_t* saved_fp = link();
+
+  address sender_pc = this->sender_pc();
+  CodeBlob* sender_cb = CodeCache::find_blob_unsafe(sender_pc);
+  assert(sender_cb, "sanity");
+  nmethod* sender_nm = sender_cb->as_nmethod_or_null();
+
+  if (sender_nm != NULL) {
+    // If the sender PC is a deoptimization point, get the original
+    // PC.  For MethodHandle call site the unextended_sp is stored in
+    // saved_fp.
+    if (sender_nm->is_deopt_mh_entry(sender_pc)) {
+      DEBUG_ONLY(verify_deopt_mh_original_pc(sender_nm, saved_fp));
+      unextended_sp = saved_fp;
+    }
+    else if (sender_nm->is_deopt_entry(sender_pc)) {
+      DEBUG_ONLY(verify_deopt_original_pc(sender_nm, unextended_sp));
+    }
+    else if (sender_nm->is_method_handle_return(sender_pc)) {
+      unextended_sp = saved_fp;
+    }
+  }
+
   // The interpreter and compiler(s) always save EBP/RBP in a known
   // location on entry. We must record where that location is
   // so this if EBP/RBP was live on callout from c2 we can find
@@ -351,29 +401,52 @@
     }
 #endif // AMD64
   }
-#endif /* COMPILER2 */
-  return frame(sp, unextended_sp, link(), sender_pc());
+#endif // COMPILER2
+
+  return frame(sender_sp, unextended_sp, saved_fp, sender_pc);
 }
 
 
-//------------------------------sender_for_compiled_frame-----------------------
+//------------------------------------------------------------------------------
+// frame::sender_for_compiled_frame
 frame frame::sender_for_compiled_frame(RegisterMap* map) const {
   assert(map != NULL, "map must be set");
-  const bool c1_compiled = _cb->is_compiled_by_c1();
 
   // frame owned by optimizing compiler
-  intptr_t* sender_sp = NULL;
-
   assert(_cb->frame_size() >= 0, "must have non-zero frame size");
-  sender_sp = unextended_sp() + _cb->frame_size();
+  intptr_t* sender_sp = unextended_sp() + _cb->frame_size();
+  intptr_t* unextended_sp = sender_sp;
 
   // On Intel the return_address is always the word on the stack
   address sender_pc = (address) *(sender_sp-1);
 
-  // This is the saved value of ebp which may or may not really be an fp.
-  // it is only an fp if the sender is an interpreter frame (or c1?)
+  // This is the saved value of EBP which may or may not really be an FP.
+  // It is only an FP if the sender is an interpreter frame (or C1?).
+  intptr_t* saved_fp = (intptr_t*) *(sender_sp - frame::sender_sp_offset);
+
+  // If we are returning to a compiled MethodHandle call site, the
+  // saved_fp will in fact be a saved value of the unextended SP.  The
+  // simplest way to tell whether we are returning to such a call site
+  // is as follows:
+  CodeBlob* sender_cb = CodeCache::find_blob_unsafe(sender_pc);
+  assert(sender_cb, "sanity");
+  nmethod* sender_nm = sender_cb->as_nmethod_or_null();
 
-  intptr_t *saved_fp = (intptr_t*)*(sender_sp - frame::sender_sp_offset);
+  if (sender_nm != NULL) {
+    // If the sender PC is a deoptimization point, get the original
+    // PC.  For MethodHandle call site the unextended_sp is stored in
+    // saved_fp.
+    if (sender_nm->is_deopt_mh_entry(sender_pc)) {
+      DEBUG_ONLY(verify_deopt_mh_original_pc(sender_nm, saved_fp));
+      unextended_sp = saved_fp;
+    }
+    else if (sender_nm->is_deopt_entry(sender_pc)) {
+      DEBUG_ONLY(verify_deopt_original_pc(sender_nm, unextended_sp));
+    }
+    else if (sender_nm->is_method_handle_return(sender_pc)) {
+      unextended_sp = saved_fp;
+    }
+  }
 
   if (map->update_map()) {
     // Tell GC to use argument oopmaps for some runtime stubs that need it.
@@ -383,7 +456,7 @@
     if (_cb->oop_maps() != NULL) {
       OopMapSet::update_register_map(this, map);
     }
-    // Since the prolog does the save and restore of epb there is no oopmap
+    // Since the prolog does the save and restore of EBP there is no oopmap
     // for it so we must fill in its location as if there was an oopmap entry
     // since if our caller was compiled code there could be live jvm state in it.
     map->set_location(rbp->as_VMReg(), (address) (sender_sp - frame::sender_sp_offset));
@@ -399,9 +472,12 @@
   }
 
   assert(sender_sp != sp(), "must have changed");
-  return frame(sender_sp, saved_fp, sender_pc);
+  return frame(sender_sp, unextended_sp, saved_fp, sender_pc);
 }
 
+
+//------------------------------------------------------------------------------
+// frame::sender
 frame frame::sender(RegisterMap* map) const {
   // Default is we done have to follow them. The sender_for_xxx will
   // update it accordingly
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/frame_x86.hpp
--- a/src/cpu/x86/vm/frame_x86.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/frame_x86.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -163,6 +163,14 @@
     return (intptr_t*) addr_at(offset);
   }
 
+#if ASSERT
+  // Used in frame::sender_for_{interpreter,compiled}_frame
+  static void verify_deopt_original_pc(   nmethod* nm, intptr_t* unextended_sp, bool is_method_handle_return = false);
+  static void verify_deopt_mh_original_pc(nmethod* nm, intptr_t* unextended_sp) {
+    verify_deopt_original_pc(nm, unextended_sp, true);
+  }
+#endif
+
  public:
   // Constructors
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/frame_x86.inline.hpp
--- a/src/cpu/x86/vm/frame_x86.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/frame_x86.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -35,32 +35,35 @@
   _deopt_state = unknown;
 }
 
-inline frame:: frame(intptr_t* sp, intptr_t* fp, address pc) {
+inline frame::frame(intptr_t* sp, intptr_t* fp, address pc) {
   _sp = sp;
   _unextended_sp = sp;
   _fp = fp;
   _pc = pc;
   assert(pc != NULL, "no pc?");
   _cb = CodeCache::find_blob(pc);
-  _deopt_state = not_deoptimized;
-  if (_cb != NULL && _cb->is_nmethod() && ((nmethod*)_cb)->is_deopt_pc(_pc)) {
-    _pc = (((nmethod*)_cb)->get_original_pc(this));
+
+  address original_pc = nmethod::get_deopt_original_pc(this);
+  if (original_pc != NULL) {
+    _pc = original_pc;
     _deopt_state = is_deoptimized;
   } else {
     _deopt_state = not_deoptimized;
   }
 }
 
-inline frame:: frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc) {
+inline frame::frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc) {
   _sp = sp;
   _unextended_sp = unextended_sp;
   _fp = fp;
   _pc = pc;
   assert(pc != NULL, "no pc?");
   _cb = CodeCache::find_blob(pc);
-  _deopt_state = not_deoptimized;
-  if (_cb != NULL && _cb->is_nmethod() && ((nmethod*)_cb)->is_deopt_pc(_pc)) {
-    _pc = (((nmethod*)_cb)->get_original_pc(this));
+
+  address original_pc = nmethod::get_deopt_original_pc(this);
+  if (original_pc != NULL) {
+    _pc = original_pc;
+    assert(((nmethod*)_cb)->code_contains(_pc), "original PC must be in nmethod");
     _deopt_state = is_deoptimized;
   } else {
     _deopt_state = not_deoptimized;
@@ -86,9 +89,9 @@
 
   _cb = CodeCache::find_blob(_pc);
 
-  _deopt_state = not_deoptimized;
-  if (_cb != NULL && _cb->is_nmethod() && ((nmethod*)_cb)->is_deopt_pc(_pc)) {
-    _pc = (((nmethod*)_cb)->get_original_pc(this));
+  address original_pc = nmethod::get_deopt_original_pc(this);
+  if (original_pc != NULL) {
+    _pc = original_pc;
     _deopt_state = is_deoptimized;
   } else {
     _deopt_state = not_deoptimized;
@@ -225,11 +228,13 @@
 // top of expression stack
 inline intptr_t* frame::interpreter_frame_tos_address() const {
   intptr_t* last_sp = interpreter_frame_last_sp();
-  if (last_sp == NULL ) {
+  if (last_sp == NULL) {
     return sp();
   } else {
-    // sp() may have been extended by an adapter
-    assert(last_sp < fp() && last_sp >= sp(), "bad tos");
+    // sp() may have been extended or shrunk by an adapter.  At least
+    // check that we don't fall behind the legal region.
+    // For top deoptimized frame last_sp == interpreter_frame_monitor_end.
+    assert(last_sp <= (intptr_t*) interpreter_frame_monitor_end(), "bad tos");
     return last_sp;
   }
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/globals_x86.hpp
--- a/src/cpu/x86/vm/globals_x86.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/globals_x86.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,17 +22,16 @@
  *
  */
 
-//
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
-//
 
-define_pd_global(bool,  ConvertSleepToYield,      true);
-define_pd_global(bool,  ShareVtableStubs,         true);
-define_pd_global(bool,  CountInterpCalls,         true);
+define_pd_global(bool, ConvertSleepToYield,      true);
+define_pd_global(bool, ShareVtableStubs,         true);
+define_pd_global(bool, CountInterpCalls,         true);
+define_pd_global(bool, NeedsDeoptSuspend,        false); // only register window machines need this
 
-define_pd_global(bool, ImplicitNullChecks,          true);  // Generate code for implicit null checks
-define_pd_global(bool, UncommonNullCast,            true);  // Uncommon-trap NULLs past to check cast
+define_pd_global(bool, ImplicitNullChecks,       true);  // Generate code for implicit null checks
+define_pd_global(bool, UncommonNullCast,         true);  // Uncommon-trap NULLs past to check cast
 
 // See 4827828 for this change. There is no globals_core_i486.hpp. I can't
 // assign a different value for C2 without touching a number of files. Use
@@ -42,29 +41,24 @@
 // the uep and the vep doesn't get real alignment but just slops on by
 // only assured that the entry instruction meets the 5 byte size requirement.
 #ifdef COMPILER2
-define_pd_global(intx,  CodeEntryAlignment,       32);
+define_pd_global(intx, CodeEntryAlignment,       32);
 #else
-define_pd_global(intx,  CodeEntryAlignment,       16);
+define_pd_global(intx, CodeEntryAlignment,       16);
 #endif // COMPILER2
+define_pd_global(intx, InlineFrequencyCount,     100);
+define_pd_global(intx, InlineSmallCode,          1000);
 
-define_pd_global(bool, NeedsDeoptSuspend,           false); // only register window machines need this
-
-define_pd_global(uintx, TLABSize,                 0);
+define_pd_global(intx, StackYellowPages, 2);
+define_pd_global(intx, StackRedPages, 1);
 #ifdef AMD64
-define_pd_global(uintx, NewSize, ScaleForWordSize(2048 * K));
 // Very large C++ stack frames using solaris-amd64 optimized builds
 // due to lack of optimization caused by C++ compiler bugs
 define_pd_global(intx, StackShadowPages, SOLARIS_ONLY(20) NOT_SOLARIS(6) DEBUG_ONLY(+2));
 #else
-define_pd_global(uintx, NewSize,                  1024 * K);
 define_pd_global(intx, StackShadowPages, 3 DEBUG_ONLY(+1));
 #endif // AMD64
-define_pd_global(intx,  InlineFrequencyCount,     100);
-define_pd_global(intx,  InlineSmallCode,          1000);
-define_pd_global(intx,  PreInflateSpin,           10);
 
-define_pd_global(intx, StackYellowPages, 2);
-define_pd_global(intx, StackRedPages, 1);
+define_pd_global(intx, PreInflateSpin,           10);
 
 define_pd_global(bool, RewriteBytecodes,     true);
 define_pd_global(bool, RewriteFrequentPairs, true);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/interp_masm_x86_32.cpp
--- a/src/cpu/x86/vm/interp_masm_x86_32.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/interp_masm_x86_32.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -196,6 +196,9 @@
   } else {
     assert(EnableInvokeDynamic, "giant index used only for EnableInvokeDynamic");
     movl(reg, Address(rsi, bcp_offset));
+    // Check if the secondary index definition is still ~x, otherwise
+    // we have to change the following assembler code to calculate the
+    // plain index.
     assert(constantPoolCacheOopDesc::decode_secondary_index(~123) == 123, "else change next line");
     notl(reg);  // convert to plain index
   }
@@ -1236,17 +1239,19 @@
     // If no method data exists, go to profile_continue.
     test_method_data_pointer(mdp, profile_continue);
 
-    // We are making a call.  Increment the count.
-    increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
-
     Label skip_receiver_profile;
     if (receiver_can_be_null) {
+      Label not_null;
       testptr(receiver, receiver);
-      jcc(Assembler::zero, skip_receiver_profile);
+      jccb(Assembler::notZero, not_null);
+      // We are making a call.  Increment the count for null receiver.
+      increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+      jmp(skip_receiver_profile);
+      bind(not_null);
     }
 
     // Record the receiver type.
-    record_klass_in_profile(receiver, mdp, reg2);
+    record_klass_in_profile(receiver, mdp, reg2, true);
     bind(skip_receiver_profile);
 
     // The method data pointer needs to be updated to reflect the new target.
@@ -1260,8 +1265,15 @@
 
 void InterpreterMacroAssembler::record_klass_in_profile_helper(
                                         Register receiver, Register mdp,
-                                        Register reg2,
-                                        int start_row, Label& done) {
+                                        Register reg2, int start_row,
+                                        Label& done, bool is_virtual_call) {
+  if (TypeProfileWidth == 0) {
+    if (is_virtual_call) {
+      increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+    }
+    return;
+  }
+
   int last_row = VirtualCallData::row_limit() - 1;
   assert(start_row <= last_row, "must be work left to do");
   // Test this row for both the receiver and for null.
@@ -1288,19 +1300,28 @@
     bind(next_test);
 
     if (row == start_row) {
+      Label found_null;
       // Failed the equality check on receiver[n]...  Test for null.
       testptr(reg2, reg2);
       if (start_row == last_row) {
         // The only thing left to do is handle the null case.
-        jcc(Assembler::notZero, done);
+        if (is_virtual_call) {
+          jccb(Assembler::zero, found_null);
+          // Receiver did not match any saved receiver and there is no empty row for it.
+          // Increment total counter to indicate polymorphic case.
+          increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+          jmp(done);
+          bind(found_null);
+        } else {
+          jcc(Assembler::notZero, done);
+        }
         break;
       }
       // Since null is rare, make it be the branch-taken case.
-      Label found_null;
       jcc(Assembler::zero, found_null);
 
       // Put all the "Case 3" tests here.
-      record_klass_in_profile_helper(receiver, mdp, reg2, start_row + 1, done);
+      record_klass_in_profile_helper(receiver, mdp, reg2, start_row + 1, done, is_virtual_call);
 
       // Found a null.  Keep searching for a matching receiver,
       // but remember that this is an empty (unused) slot.
@@ -1317,16 +1338,18 @@
   int count_offset = in_bytes(VirtualCallData::receiver_count_offset(start_row));
   movptr(reg2, (int32_t)DataLayout::counter_increment);
   set_mdp_data_at(mdp, count_offset, reg2);
-  jmp(done);
+  if (start_row > 0) {
+    jmp(done);
+  }
 }
 
 void InterpreterMacroAssembler::record_klass_in_profile(Register receiver,
-                                                        Register mdp,
-                                                        Register reg2) {
+                                                        Register mdp, Register reg2,
+                                                        bool is_virtual_call) {
   assert(ProfileInterpreter, "must be profiling");
   Label done;
 
-  record_klass_in_profile_helper(receiver, mdp, reg2, 0, done);
+  record_klass_in_profile_helper(receiver, mdp, reg2, 0, done, is_virtual_call);
 
   bind (done);
 }
@@ -1419,7 +1442,7 @@
       mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size());
 
       // Record the object type.
-      record_klass_in_profile(klass, mdp, reg2);
+      record_klass_in_profile(klass, mdp, reg2, false);
       assert(reg2 == rdi, "we know how to fix this blown reg");
       restore_locals();         // Restore EDI
     }
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/interp_masm_x86_32.hpp
--- a/src/cpu/x86/vm/interp_masm_x86_32.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/interp_masm_x86_32.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -213,10 +213,10 @@
                         Label& not_equal_continue);
 
   void record_klass_in_profile(Register receiver, Register mdp,
-                               Register reg2);
+                               Register reg2, bool is_virtual_call);
   void record_klass_in_profile_helper(Register receiver, Register mdp,
-                                      Register reg2,
-                                      int start_row, Label& done);
+                                      Register reg2, int start_row,
+                                      Label& done, bool is_virtual_call);
 
   void update_mdp_by_offset(Register mdp_in, int offset_of_offset);
   void update_mdp_by_offset(Register mdp_in, Register reg, int offset_of_disp);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/interp_masm_x86_64.cpp
--- a/src/cpu/x86/vm/interp_masm_x86_64.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/interp_masm_x86_64.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -185,12 +185,30 @@
 }
 
 
+void InterpreterMacroAssembler::get_cache_index_at_bcp(Register index,
+                                                       int bcp_offset,
+                                                       bool giant_index) {
+  assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
+  if (!giant_index) {
+    load_unsigned_short(index, Address(r13, bcp_offset));
+  } else {
+    assert(EnableInvokeDynamic, "giant index used only for EnableInvokeDynamic");
+    movl(index, Address(r13, bcp_offset));
+    // Check if the secondary index definition is still ~x, otherwise
+    // we have to change the following assembler code to calculate the
+    // plain index.
+    assert(constantPoolCacheOopDesc::decode_secondary_index(~123) == 123, "else change next line");
+    notl(index);  // convert to plain index
+  }
+}
+
+
 void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache,
                                                            Register index,
-                                                           int bcp_offset) {
-  assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
+                                                           int bcp_offset,
+                                                           bool giant_index) {
   assert(cache != index, "must use different registers");
-  load_unsigned_short(index, Address(r13, bcp_offset));
+  get_cache_index_at_bcp(index, bcp_offset, giant_index);
   movptr(cache, Address(rbp, frame::interpreter_frame_cache_offset * wordSize));
   assert(sizeof(ConstantPoolCacheEntry) == 4 * wordSize, "adjust code below");
   // convert from field index to ConstantPoolCacheEntry index
@@ -200,10 +218,10 @@
 
 void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache,
                                                                Register tmp,
-                                                               int bcp_offset) {
-  assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
+                                                               int bcp_offset,
+                                                               bool giant_index) {
   assert(cache != tmp, "must use different register");
-  load_unsigned_short(tmp, Address(r13, bcp_offset));
+  get_cache_index_at_bcp(tmp, bcp_offset, giant_index);
   assert(sizeof(ConstantPoolCacheEntry) == 4 * wordSize, "adjust code below");
   // convert from field index to ConstantPoolCacheEntry index
   // and from word offset to byte offset
@@ -1236,18 +1254,28 @@
 
 void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
                                                      Register mdp,
-                                                     Register reg2) {
+                                                     Register reg2,
+                                                     bool receiver_can_be_null) {
   if (ProfileInterpreter) {
     Label profile_continue;
 
     // If no method data exists, go to profile_continue.
     test_method_data_pointer(mdp, profile_continue);
 
-    // We are making a call.  Increment the count.
-    increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+    Label skip_receiver_profile;
+    if (receiver_can_be_null) {
+      Label not_null;
+      testptr(receiver, receiver);
+      jccb(Assembler::notZero, not_null);
+      // We are making a call.  Increment the count for null receiver.
+      increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+      jmp(skip_receiver_profile);
+      bind(not_null);
+    }
 
     // Record the receiver type.
-    record_klass_in_profile(receiver, mdp, reg2);
+    record_klass_in_profile(receiver, mdp, reg2, true);
+    bind(skip_receiver_profile);
 
     // The method data pointer needs to be updated to reflect the new target.
     update_mdp_by_constant(mdp,
@@ -1270,8 +1298,15 @@
 // See below for example code.
 void InterpreterMacroAssembler::record_klass_in_profile_helper(
                                         Register receiver, Register mdp,
-                                        Register reg2,
-                                        int start_row, Label& done) {
+                                        Register reg2, int start_row,
+                                        Label& done, bool is_virtual_call) {
+  if (TypeProfileWidth == 0) {
+    if (is_virtual_call) {
+      increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+    }
+    return;
+  }
+
   int last_row = VirtualCallData::row_limit() - 1;
   assert(start_row <= last_row, "must be work left to do");
   // Test this row for both the receiver and for null.
@@ -1298,19 +1333,28 @@
     bind(next_test);
 
     if (test_for_null_also) {
+      Label found_null;
       // Failed the equality check on receiver[n]...  Test for null.
       testptr(reg2, reg2);
       if (start_row == last_row) {
         // The only thing left to do is handle the null case.
-        jcc(Assembler::notZero, done);
+        if (is_virtual_call) {
+          jccb(Assembler::zero, found_null);
+          // Receiver did not match any saved receiver and there is no empty row for it.
+          // Increment total counter to indicate polymorphic case.
+          increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+          jmp(done);
+          bind(found_null);
+        } else {
+          jcc(Assembler::notZero, done);
+        }
         break;
       }
       // Since null is rare, make it be the branch-taken case.
-      Label found_null;
       jcc(Assembler::zero, found_null);
 
       // Put all the "Case 3" tests here.
-      record_klass_in_profile_helper(receiver, mdp, reg2, start_row + 1, done);
+      record_klass_in_profile_helper(receiver, mdp, reg2, start_row + 1, done, is_virtual_call);
 
       // Found a null.  Keep searching for a matching receiver,
       // but remember that this is an empty (unused) slot.
@@ -1327,7 +1371,9 @@
   int count_offset = in_bytes(VirtualCallData::receiver_count_offset(start_row));
   movl(reg2, DataLayout::counter_increment);
   set_mdp_data_at(mdp, count_offset, reg2);
-  jmp(done);
+  if (start_row > 0) {
+    jmp(done);
+  }
 }
 
 // Example state machine code for three profile rows:
@@ -1339,7 +1385,7 @@
 //     if (row[1].rec != NULL) {
 //       // degenerate decision tree, rooted at row[2]
 //       if (row[2].rec == rec) { row[2].incr(); goto done; }
-//       if (row[2].rec != NULL) { goto done; } // overflow
+//       if (row[2].rec != NULL) { count.incr(); goto done; } // overflow
 //       row[2].init(rec); goto done;
 //     } else {
 //       // remember row[1] is empty
@@ -1352,14 +1398,15 @@
 //     if (row[2].rec == rec) { row[2].incr(); goto done; }
 //     row[0].init(rec); goto done;
 //   }
+//   done:
 
 void InterpreterMacroAssembler::record_klass_in_profile(Register receiver,
-                                                        Register mdp,
-                                                        Register reg2) {
+                                                        Register mdp, Register reg2,
+                                                        bool is_virtual_call) {
   assert(ProfileInterpreter, "must be profiling");
   Label done;
 
-  record_klass_in_profile_helper(receiver, mdp, reg2, 0, done);
+  record_klass_in_profile_helper(receiver, mdp, reg2, 0, done, is_virtual_call);
 
   bind (done);
 }
@@ -1455,7 +1502,7 @@
       mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size());
 
       // Record the object type.
-      record_klass_in_profile(klass, mdp, reg2);
+      record_klass_in_profile(klass, mdp, reg2, false);
     }
     update_mdp_by_constant(mdp, mdp_delta);
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/interp_masm_x86_64.hpp
--- a/src/cpu/x86/vm/interp_masm_x86_64.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/interp_masm_x86_64.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -95,9 +95,10 @@
 
   void get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset);
   void get_cache_and_index_at_bcp(Register cache, Register index,
-                                  int bcp_offset);
+                                  int bcp_offset, bool giant_index = false);
   void get_cache_entry_pointer_at_bcp(Register cache, Register tmp,
-                                      int bcp_offset);
+                                      int bcp_offset, bool giant_index = false);
+  void get_cache_index_at_bcp(Register index, int bcp_offset, bool giant_index = false);
 
 
   void pop_ptr(Register r = rax);
@@ -221,10 +222,10 @@
                         Label& not_equal_continue);
 
   void record_klass_in_profile(Register receiver, Register mdp,
-                               Register reg2);
+                               Register reg2, bool is_virtual_call);
   void record_klass_in_profile_helper(Register receiver, Register mdp,
-                                      Register reg2,
-                                      int start_row, Label& done);
+                                      Register reg2, int start_row,
+                                      Label& done, bool is_virtual_call);
 
   void update_mdp_by_offset(Register mdp_in, int offset_of_offset);
   void update_mdp_by_offset(Register mdp_in, Register reg, int offset_of_disp);
@@ -236,7 +237,8 @@
   void profile_call(Register mdp);
   void profile_final_call(Register mdp);
   void profile_virtual_call(Register receiver, Register mdp,
-                            Register scratch2);
+                            Register scratch2,
+                            bool receiver_can_be_null = false);
   void profile_ret(Register return_bci, Register mdp);
   void profile_null_seen(Register mdp);
   void profile_typecheck(Register mdp, Register klass, Register scratch);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/interpreter_x86_64.cpp
--- a/src/cpu/x86/vm/interpreter_x86_64.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/interpreter_x86_64.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -277,12 +277,11 @@
   address entry_point = __ pc();
 
   // abstract method entry
-  // remove return address. Not really needed, since exception
-  // handling throws away expression stack
-  __ pop(rbx);
 
-  // adjust stack to what a normal return would do
-  __ mov(rsp, r13);
+  //  pop return address, reset last_sp to NULL
+  __ empty_expression_stack();
+  __ restore_bcp();      // rsi must be correct for exception handler   (was destroyed)
+  __ restore_locals();   // make sure locals pointer is correct as well (was destroyed)
 
   // throw exception
   __ call_VM(noreg, CAST_FROM_FN_PTR(address,
@@ -300,7 +299,10 @@
   if (!EnableMethodHandles) {
     return generate_abstract_entry();
   }
-  return generate_abstract_entry(); //6815692//
+
+  address entry_point = MethodHandles::generate_method_handle_interpreter_entry(_masm);
+
+  return entry_point;
 }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/methodHandles_x86.cpp
--- a/src/cpu/x86/vm/methodHandles_x86.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/methodHandles_x86.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -65,9 +65,9 @@
   // Verify that argslot lies within (rsp, rbp].
   Label L_ok, L_bad;
   __ cmpptr(rax_argslot, rbp);
-  __ jcc(Assembler::above, L_bad);
+  __ jccb(Assembler::above, L_bad);
   __ cmpptr(rsp, rax_argslot);
-  __ jcc(Assembler::below, L_ok);
+  __ jccb(Assembler::below, L_ok);
   __ bind(L_bad);
   __ stop(error_message);
   __ bind(L_ok);
@@ -136,9 +136,9 @@
   if (arg_slots.is_register()) {
     Label L_ok, L_bad;
     __ cmpptr(arg_slots.as_register(), (int32_t) NULL_WORD);
-    __ jcc(Assembler::greater, L_bad);
+    __ jccb(Assembler::greater, L_bad);
     __ testl(arg_slots.as_register(), -stack_move_unit() - 1);
-    __ jcc(Assembler::zero, L_ok);
+    __ jccb(Assembler::zero, L_ok);
     __ bind(L_bad);
     __ stop("assert arg_slots <= 0 and clear low bits");
     __ bind(L_ok);
@@ -173,7 +173,7 @@
     __ movptr(Address(rdx_temp, arg_slots, Address::times_ptr), rbx_temp);
     __ addptr(rdx_temp, wordSize);
     __ cmpptr(rdx_temp, rax_argslot);
-    __ jcc(Assembler::less, loop);
+    __ jccb(Assembler::less, loop);
   }
 
   // Now move the argslot down, to point to the opened-up space.
@@ -211,9 +211,9 @@
     Label L_ok, L_bad;
     __ lea(rbx_temp, Address(rax_argslot, arg_slots, Address::times_ptr));
     __ cmpptr(rbx_temp, rbp);
-    __ jcc(Assembler::above, L_bad);
+    __ jccb(Assembler::above, L_bad);
     __ cmpptr(rsp, rax_argslot);
-    __ jcc(Assembler::below, L_ok);
+    __ jccb(Assembler::below, L_ok);
     __ bind(L_bad);
     __ stop("deleted argument(s) must fall within current frame");
     __ bind(L_ok);
@@ -221,9 +221,9 @@
   if (arg_slots.is_register()) {
     Label L_ok, L_bad;
     __ cmpptr(arg_slots.as_register(), (int32_t) NULL_WORD);
-    __ jcc(Assembler::less, L_bad);
+    __ jccb(Assembler::less, L_bad);
     __ testl(arg_slots.as_register(), -stack_move_unit() - 1);
-    __ jcc(Assembler::zero, L_ok);
+    __ jccb(Assembler::zero, L_ok);
     __ bind(L_bad);
     __ stop("assert arg_slots >= 0 and clear low bits");
     __ bind(L_ok);
@@ -258,7 +258,7 @@
     __ movptr(Address(rdx_temp, arg_slots, Address::times_ptr), rbx_temp);
     __ addptr(rdx_temp, -wordSize);
     __ cmpptr(rdx_temp, rsp);
-    __ jcc(Assembler::greaterEqual, loop);
+    __ jccb(Assembler::greaterEqual, loop);
   }
 
   // Now move the argslot up, to point to the just-copied block.
@@ -268,12 +268,20 @@
 }
 
 #ifndef PRODUCT
+extern "C" void print_method_handle(oop mh);
 void trace_method_handle_stub(const char* adaptername,
-                              oopDesc* mh,
+                              oop mh,
                               intptr_t* entry_sp,
-                              intptr_t* saved_sp) {
+                              intptr_t* saved_sp,
+                              intptr_t* saved_bp) {
   // called as a leaf from native code: do not block the JVM!
-  printf("MH %s "PTR_FORMAT" "PTR_FORMAT" "INTX_FORMAT"\n", adaptername, (void*)mh, entry_sp, entry_sp - saved_sp);
+  intptr_t* last_sp = (intptr_t*) saved_bp[frame::interpreter_frame_last_sp_offset];
+  intptr_t* base_sp = (intptr_t*) saved_bp[frame::interpreter_frame_monitor_block_top_offset];
+  printf("MH %s mh="INTPTR_FORMAT" sp=("INTPTR_FORMAT"+"INTX_FORMAT") stack_size="INTX_FORMAT" bp="INTPTR_FORMAT"\n",
+         adaptername, (intptr_t)mh, (intptr_t)entry_sp, (intptr_t)(saved_sp - entry_sp), (intptr_t)(base_sp - last_sp), (intptr_t)saved_bp);
+  if (last_sp != saved_sp)
+    printf("*** last_sp="INTPTR_FORMAT"\n", (intptr_t)last_sp);
+  if (Verbose)  print_method_handle(mh);
 }
 #endif //PRODUCT
 
@@ -293,6 +301,10 @@
   Register rbx_temp    = rbx;
   Register rdx_temp    = rdx;
 
+  // This guy is set up by prepare_to_jump_from_interpreted (from interpreted calls)
+  // and gen_c2i_adapter (from compiled calls):
+  Register saved_last_sp = LP64_ONLY(r13) NOT_LP64(rsi);
+
   guarantee(java_dyn_MethodHandle::vmentry_offset_in_bytes() != 0, "must have offsets");
 
   // some handy addresses
@@ -315,6 +327,8 @@
     assert(tag_offset = wordSize, "stack grows as expected");
   }
 
+  const int java_mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes();
+
   if (have_entry(ek)) {
     __ nop();                   // empty stubs make SG sick
     return;
@@ -328,45 +342,65 @@
     __ push(rax); __ push(rbx); __ push(rcx); __ push(rdx); __ push(rsi); __ push(rdi);
     __ lea(rax, Address(rsp, wordSize*6)); // entry_sp
     // arguments:
+    __ push(rbp);               // interpreter frame pointer
     __ push(rsi);               // saved_sp
     __ push(rax);               // entry_sp
     __ push(rcx);               // mh
     __ push(rcx);
     __ movptr(Address(rsp, 0), (intptr_t)entry_name(ek));
-    __ call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub), 4);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub), 5);
     __ pop(rdi); __ pop(rsi); __ pop(rdx); __ pop(rcx); __ pop(rbx); __ pop(rax);
   }
 #endif //PRODUCT
 
   switch ((int) ek) {
-  case _check_mtype:
+  case _raise_exception:
     {
-      // this stub is special, because it requires a live mtype argument
-      Register rax_mtype = rax;
+      // Not a real MH entry, but rather shared code for raising an exception.
+      // Extra local arguments are pushed on stack, as required type at TOS+8,
+      // failing object (or NULL) at TOS+4, failing bytecode type at TOS.
+      // Beyond those local arguments are the PC, of course.
+      Register rdx_code = rdx_temp;
+      Register rcx_fail = rcx_recv;
+      Register rax_want = rax_argslot;
+      Register rdi_pc   = rdi;
+      __ pop(rdx_code);  // TOS+0
+      __ pop(rcx_fail);  // TOS+4
+      __ pop(rax_want);  // TOS+8
+      __ pop(rdi_pc);    // caller PC
 
-      // emit WrongMethodType path first, to enable jccb back-branch
-      Label wrong_method_type;
-      __ bind(wrong_method_type);
-      __ movptr(rdx_temp, ExternalAddress((address) &_entries[_wrong_method_type]));
-      __ jmp(Address(rdx_temp, MethodHandleEntry::from_interpreted_entry_offset_in_bytes()));
-      __ hlt();
+      __ mov(rsp, rsi);   // cut the stack back to where the caller started
 
-      interp_entry = __ pc();
-      __ check_method_handle_type(rax_mtype, rcx_recv, rdx_temp, wrong_method_type);
-      // now rax_mtype is dead; subsequent stubs will use it as a temp
-
-      __ jump_to_method_handle_entry(rcx_recv, rdx_temp);
-    }
-    break;
+      // Repush the arguments as if coming from the interpreter.
+      if (TaggedStackInterpreter)  __ push(frame::tag_for_basic_type(T_INT));
+      __ push(rdx_code);
+      if (TaggedStackInterpreter)  __ push(frame::tag_for_basic_type(T_OBJECT));
+      __ push(rcx_fail);
+      if (TaggedStackInterpreter)  __ push(frame::tag_for_basic_type(T_OBJECT));
+      __ push(rax_want);
 
-  case _wrong_method_type:
-    {
-      // this stub is special, because it requires a live mtype argument
-      Register rax_mtype = rax;
+      Register rbx_method = rbx_temp;
+      Label no_method;
+      // FIXME: fill in _raise_exception_method with a suitable sun.dyn method
+      __ movptr(rbx_method, ExternalAddress((address) &_raise_exception_method));
+      __ testptr(rbx_method, rbx_method);
+      __ jccb(Assembler::zero, no_method);
+      int jobject_oop_offset = 0;
+      __ movptr(rbx_method, Address(rbx_method, jobject_oop_offset));  // dereference the jobject
+      __ testptr(rbx_method, rbx_method);
+      __ jccb(Assembler::zero, no_method);
+      __ verify_oop(rbx_method);
+      __ push(rdi_pc);          // and restore caller PC
+      __ jmp(rbx_method_fie);
 
-      interp_entry = __ pc();
-      __ push(rax_mtype);       // required mtype
-      __ push(rcx_recv);        // random mh (1st stacked argument)
+      // If we get here, the Java runtime did not do its job of creating the exception.
+      // Do something that is at least causes a valid throw from the interpreter.
+      __ bind(no_method);
+      __ pop(rax_want);
+      if (TaggedStackInterpreter)  __ pop(rcx_fail);
+      __ pop(rcx_fail);
+      __ push(rax_want);
+      __ push(rcx_fail);
       __ jump(ExternalAddress(Interpreter::throw_WrongMethodType_entry()));
     }
     break;
@@ -416,7 +450,7 @@
                                 rbx_index, Address::times_ptr,
                                 base + vtableEntry::method_offset_in_bytes());
       Register rbx_method = rbx_temp;
-      __ movl(rbx_method, vtable_entry_addr);
+      __ movptr(rbx_method, vtable_entry_addr);
 
       __ verify_oop(rbx_method);
       __ jmp(rbx_method_fie);
@@ -442,7 +476,7 @@
       __ load_klass(rax_klass, rcx_recv);
       __ verify_oop(rax_klass);
 
-      Register rcx_temp   = rcx_recv;
+      Register rdi_temp   = rdi;
       Register rbx_method = rbx_index;
 
       // get interface klass
@@ -451,7 +485,7 @@
       __ lookup_interface_method(rax_klass, rdx_intf,
                                  // note: next two args must be the same:
                                  rbx_index, rbx_method,
-                                 rcx_temp,
+                                 rdi_temp,
                                  no_such_interface);
 
       __ verify_oop(rbx_method);
@@ -461,7 +495,10 @@
       __ bind(no_such_interface);
       // Throw an exception.
       // For historical reasons, it will be IncompatibleClassChangeError.
-      __ should_not_reach_here(); // %%% FIXME NYI
+      __ pushptr(Address(rdx_intf, java_mirror_offset));  // required interface
+      __ push(rcx_recv);        // bad receiver
+      __ push((int)Bytecodes::_invokeinterface);  // who is complaining?
+      __ jump(ExternalAddress(from_interpreted_entry(_raise_exception)));
     }
     break;
 
@@ -498,16 +535,15 @@
       if (arg_type == T_OBJECT) {
         __ movptr(Address(rax_argslot, 0), rbx_temp);
       } else {
-        __ load_sized_value(rbx_temp, prim_value_addr,
+        __ load_sized_value(rdx_temp, prim_value_addr,
                             type2aelembytes(arg_type), is_signed_subword_type(arg_type));
-        __ movptr(Address(rax_argslot, 0), rbx_temp);
+        __ movptr(Address(rax_argslot, 0), rdx_temp);
 #ifndef _LP64
         if (arg_slots == 2) {
-          __ movl(rbx_temp, prim_value_addr.plus_disp(wordSize));
-          __ movl(Address(rax_argslot, Interpreter::stackElementSize()), rbx_temp);
+          __ movl(rdx_temp, prim_value_addr.plus_disp(wordSize));
+          __ movl(Address(rax_argslot, Interpreter::stackElementSize()), rdx_temp);
         }
 #endif //_LP64
-        break;
       }
 
       if (direct_to_method) {
@@ -524,6 +560,7 @@
     break;
 
   case _adapter_retype_only:
+  case _adapter_retype_raw:
     // immediately jump to the next MH layer:
     __ movptr(rcx_recv, rcx_mh_vmtarget);
     __ verify_oop(rcx_recv);
@@ -545,30 +582,32 @@
       __ movptr(rbx_klass, rcx_amh_argument); // this is a Class object!
       __ movptr(rbx_klass, Address(rbx_klass, java_lang_Class::klass_offset_in_bytes()));
 
-      // get the new MH:
-      __ movptr(rcx_recv, rcx_mh_vmtarget);
-      // (now we are done with the old MH)
-
       Label done;
       __ movptr(rdx_temp, vmarg);
-      __ testl(rdx_temp, rdx_temp);
-      __ jcc(Assembler::zero, done);          // no cast if null
+      __ testptr(rdx_temp, rdx_temp);
+      __ jccb(Assembler::zero, done);         // no cast if null
       __ load_klass(rdx_temp, rdx_temp);
 
       // live at this point:
       // - rbx_klass:  klass required by the target method
       // - rdx_temp:   argument klass to test
-      // - rcx_recv:   method handle to invoke (after cast succeeds)
+      // - rcx_recv:   adapter method handle
       __ check_klass_subtype(rdx_temp, rbx_klass, rax_argslot, done);
 
       // If we get here, the type check failed!
       // Call the wrong_method_type stub, passing the failing argument type in rax.
       Register rax_mtype = rax_argslot;
-      __ push(rbx_klass);       // missed klass (required type)
-      __ push(rdx_temp);        // bad actual type (1st stacked argument)
-      __ jump(ExternalAddress(Interpreter::throw_WrongMethodType_entry()));
+      __ movl(rax_argslot, rcx_amh_vmargslot);  // reload argslot field
+      __ movptr(rdx_temp, vmarg);
+
+      __ pushptr(rcx_amh_argument); // required class
+      __ push(rdx_temp);            // bad object
+      __ push((int)Bytecodes::_checkcast);  // who is complaining?
+      __ jump(ExternalAddress(from_interpreted_entry(_raise_exception)));
 
       __ bind(done);
+      // get the new MH:
+      __ movptr(rcx_recv, rcx_mh_vmtarget);
       __ jump_to_method_handle_entry(rcx_recv, rdx_temp);
     }
     break;
@@ -637,24 +676,24 @@
       // (now we are done with the old MH)
 
       // original 32-bit vmdata word must be of this form:
-      //    | MBZ:16 | signBitCount:8 | srcDstTypes:8 | conversionOp:8 |
-      __ xchgl(rcx, rbx_vminfo);                // free rcx for shifts
+      //    | MBZ:6 | signBitCount:8 | srcDstTypes:8 | conversionOp:8 |
+      __ xchgptr(rcx, rbx_vminfo);                // free rcx for shifts
       __ shll(rdx_temp /*, rcx*/);
       Label zero_extend, done;
       __ testl(rcx, CONV_VMINFO_SIGN_FLAG);
-      __ jcc(Assembler::zero, zero_extend);
+      __ jccb(Assembler::zero, zero_extend);
 
       // this path is taken for int->byte, int->short
       __ sarl(rdx_temp /*, rcx*/);
-      __ jmp(done);
+      __ jmpb(done);
 
       __ bind(zero_extend);
       // this is taken for int->char
       __ shrl(rdx_temp /*, rcx*/);
 
       __ bind(done);
-      __ movptr(vmarg, rdx_temp);
-      __ xchgl(rcx, rbx_vminfo);                // restore rcx_recv
+      __ movl(vmarg, rdx_temp);
+      __ xchgptr(rcx, rbx_vminfo);                // restore rcx_recv
 
       __ jump_to_method_handle_entry(rcx_recv, rdx_temp);
     }
@@ -823,7 +862,7 @@
             // Verify that argslot > destslot, by at least swap_bytes.
             Label L_ok;
             __ cmpptr(rax_argslot, rbx_destslot);
-            __ jcc(Assembler::aboveEqual, L_ok);
+            __ jccb(Assembler::aboveEqual, L_ok);
             __ stop("source must be above destination (upward rotation)");
             __ bind(L_ok);
           }
@@ -839,7 +878,7 @@
           __ movptr(Address(rax_argslot, swap_bytes), rdx_temp);
           __ addptr(rax_argslot, -wordSize);
           __ cmpptr(rax_argslot, rbx_destslot);
-          __ jcc(Assembler::aboveEqual, loop);
+          __ jccb(Assembler::aboveEqual, loop);
         } else {
           __ addptr(rax_argslot, swap_bytes);
 #ifdef ASSERT
@@ -847,7 +886,7 @@
             // Verify that argslot < destslot, by at least swap_bytes.
             Label L_ok;
             __ cmpptr(rax_argslot, rbx_destslot);
-            __ jcc(Assembler::belowEqual, L_ok);
+            __ jccb(Assembler::belowEqual, L_ok);
             __ stop("source must be below destination (downward rotation)");
             __ bind(L_ok);
           }
@@ -863,7 +902,7 @@
           __ movptr(Address(rax_argslot, -swap_bytes), rdx_temp);
           __ addptr(rax_argslot, wordSize);
           __ cmpptr(rax_argslot, rbx_destslot);
-          __ jcc(Assembler::belowEqual, loop);
+          __ jccb(Assembler::belowEqual, loop);
         }
 
         // pop the original first chunk into the destination slot, now free
@@ -929,7 +968,7 @@
       __ addptr(rax_argslot, wordSize);
       __ addptr(rdx_newarg, wordSize);
       __ cmpptr(rdx_newarg, rbx_oldarg);
-      __ jcc(Assembler::less, loop);
+      __ jccb(Assembler::less, loop);
 
       __ pop(rdi);              // restore temp
 
@@ -1081,7 +1120,7 @@
         }
         __ addptr(rax_argslot, Interpreter::stackElementSize());
         __ cmpptr(rax_argslot, rdx_argslot_limit);
-        __ jcc(Assembler::less, loop);
+        __ jccb(Assembler::less, loop);
       } else if (length_constant == 0) {
         __ bind(skip_array_check);
         // nothing to copy
@@ -1107,11 +1146,17 @@
 
       __ bind(bad_array_klass);
       UNPUSH_RSI_RDI;
-      __ stop("bad array klass NYI");
+      __ pushptr(Address(rdx_array_klass, java_mirror_offset)); // required type
+      __ pushptr(vmarg);                // bad array
+      __ push((int)Bytecodes::_aaload); // who is complaining?
+      __ jump(ExternalAddress(from_interpreted_entry(_raise_exception)));
 
       __ bind(bad_array_length);
       UNPUSH_RSI_RDI;
-      __ stop("bad array length NYI");
+      __ push(rcx_recv);        // AMH requiring a certain length
+      __ pushptr(vmarg);        // bad array
+      __ push((int)Bytecodes::_arraylength); // who is complaining?
+      __ jump(ExternalAddress(from_interpreted_entry(_raise_exception)));
 
 #undef UNPUSH_RSI_RDI
     }
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/runtime_x86_32.cpp
--- a/src/cpu/x86/vm/runtime_x86_32.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/runtime_x86_32.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -43,11 +43,11 @@
 // This code is entered with a jmp.
 //
 // Arguments:
-//   rax,: exception oop
+//   rax: exception oop
 //   rdx: exception pc
 //
 // Results:
-//   rax,: exception oop
+//   rax: exception oop
 //   rdx: exception pc in caller or ???
 //   destination: exception handler of caller
 //
@@ -113,17 +113,17 @@
   __ addptr(rsp, return_off * wordSize);   // Epilog!
   __ pop(rdx); // Exception pc
 
+  // rax: exception handler for given <exception oop/exception pc>
 
-  // rax,: exception handler for given <exception oop/exception pc>
+  // Restore SP from BP if the exception PC is a MethodHandle call.
+  __ cmpl(Address(rcx, JavaThread::is_method_handle_exception_offset()), 0);
+  __ cmovptr(Assembler::notEqual, rsp, rbp);
 
   // We have a handler in rax, (could be deopt blob)
   // rdx - throwing pc, deopt blob will need it.
 
   __ push(rax);
 
-  // rcx contains handler address
-
-  __ get_thread(rcx);           // TLS
   // Get the exception
   __ movptr(rax, Address(rcx, JavaThread::exception_oop_offset()));
   // Get the exception pc in case we are deoptimized
@@ -137,7 +137,7 @@
 
   __ pop(rcx);
 
-  // rax,: exception oop
+  // rax: exception oop
   // rcx: exception handler
   // rdx: exception pc
   __ jmp (rcx);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/sharedRuntime_x86_32.cpp
--- a/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -907,7 +907,8 @@
                                                             int total_args_passed,
                                                             int comp_args_on_stack,
                                                             const BasicType *sig_bt,
-                                                            const VMRegPair *regs) {
+                                                            const VMRegPair *regs,
+                                                            AdapterFingerPrint* fingerprint) {
   address i2c_entry = __ pc();
 
   gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
@@ -954,7 +955,7 @@
   gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
 
   __ flush();
-  return new AdapterHandlerEntry(i2c_entry, c2i_entry, c2i_unverified_entry);
+  return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
 }
 
 int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
@@ -2381,7 +2382,7 @@
 
   // Save everything in sight.
 
-  map = RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words);
+  map = RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false);
   // Normal deoptimization
   __ push(Deoptimization::Unpack_deopt);
   __ jmp(cont);
@@ -2392,7 +2393,7 @@
   // return address is the pc describes what bci to do re-execute at
 
   // No need to update map as each call to save_live_registers will produce identical oopmap
-  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words);
+  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false);
 
   __ push(Deoptimization::Unpack_reexecute);
   __ jmp(cont);
@@ -2428,7 +2429,7 @@
   // Save everything in sight.
 
   // No need to update map as each call to save_live_registers will produce identical oopmap
-  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words);
+  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false);
 
   // Now it is safe to overwrite any register
 
@@ -2515,6 +2516,11 @@
 
   RegisterSaver::restore_result_registers(masm);
 
+  // Non standard control word may be leaked out through a safepoint blob, and we can
+  // deopt at a poll point with the non standard control word. However, we should make
+  // sure the control word is correct after restore_result_registers.
+  __ fldcw(ExternalAddress(StubRoutines::addr_fpu_cntrl_wrd_std()));
+
   // All of the register save area has been popped of the stack. Only the
   // return address remains.
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/sharedRuntime_x86_64.cpp
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -638,6 +638,10 @@
 
   __ movptr(rax, Address(rsp, 0));
 
+  // Must preserve original SP for loading incoming arguments because
+  // we need to align the outgoing SP for compiled code.
+  __ movptr(r11, rsp);
+
   // Cut-out for having no stack args.  Since up to 2 int/oop args are passed
   // in registers, we will occasionally have no stack args.
   int comp_words_on_stack = 0;
@@ -661,6 +665,10 @@
   // as far as the placement of the call instruction
   __ push(rax);
 
+  // Put saved SP in another register
+  const Register saved_sp = rax;
+  __ movptr(saved_sp, r11);
+
   // Will jump to the compiled code just as if compiled code was doing it.
   // Pre-load the register-jump target early, to schedule it better.
   __ movptr(r11, Address(rbx, in_bytes(methodOopDesc::from_compiled_offset())));
@@ -680,11 +688,7 @@
     assert(!regs[i].second()->is_valid() || regs[i].first()->next() == regs[i].second(),
             "scrambled load targets?");
     // Load in argument order going down.
-    // int ld_off = (total_args_passed + comp_words_on_stack -i)*wordSize;
-    // base ld_off on r13 (sender_sp) as the stack alignment makes offsets from rsp
-    // unpredictable
-    int ld_off = ((total_args_passed - 1) - i)*Interpreter::stackElementSize();
-
+    int ld_off = (total_args_passed - i)*Interpreter::stackElementSize() + Interpreter::value_offset_in_bytes();
     // Point to interpreter value (vs. tag)
     int next_off = ld_off - Interpreter::stackElementSize();
     //
@@ -699,10 +703,14 @@
     if (r_1->is_stack()) {
       // Convert stack slot to an SP offset (+ wordSize to account for return address )
       int st_off = regs[i].first()->reg2stack()*VMRegImpl::stack_slot_size + wordSize;
+
+      // We can use r13 as a temp here because compiled code doesn't need r13 as an input
+      // and if we end up going thru a c2i because of a miss a reasonable value of r13
+      // will be generated.
       if (!r_2->is_valid()) {
         // sign extend???
-        __ movl(rax, Address(r13, ld_off));
-        __ movptr(Address(rsp, st_off), rax);
+        __ movl(r13, Address(saved_sp, ld_off));
+        __ movptr(Address(rsp, st_off), r13);
       } else {
         //
         // We are using two optoregs. This can be either T_OBJECT, T_ADDRESS, T_LONG, or T_DOUBLE
@@ -715,9 +723,9 @@
         // ld_off is MSW so get LSW
         const int offset = (sig_bt[i]==T_LONG||sig_bt[i]==T_DOUBLE)?
                            next_off : ld_off;
-        __ movq(rax, Address(r13, offset));
+        __ movq(r13, Address(saved_sp, offset));
         // st_off is LSW (i.e. reg.first())
-        __ movq(Address(rsp, st_off), rax);
+        __ movq(Address(rsp, st_off), r13);
       }
     } else if (r_1->is_Register()) {  // Register argument
       Register r = r_1->as_Register();
@@ -732,16 +740,16 @@
                            next_off : ld_off;
 
         // this can be a misaligned move
-        __ movq(r, Address(r13, offset));
+        __ movq(r, Address(saved_sp, offset));
       } else {
         // sign extend and use a full word?
-        __ movl(r, Address(r13, ld_off));
+        __ movl(r, Address(saved_sp, ld_off));
       }
     } else {
       if (!r_2->is_valid()) {
-        __ movflt(r_1->as_XMMRegister(), Address(r13, ld_off));
+        __ movflt(r_1->as_XMMRegister(), Address(saved_sp, ld_off));
       } else {
-        __ movdbl(r_1->as_XMMRegister(), Address(r13, next_off));
+        __ movdbl(r_1->as_XMMRegister(), Address(saved_sp, next_off));
       }
     }
   }
@@ -770,7 +778,8 @@
                                                             int total_args_passed,
                                                             int comp_args_on_stack,
                                                             const BasicType *sig_bt,
-                                                            const VMRegPair *regs) {
+                                                            const VMRegPair *regs,
+                                                            AdapterFingerPrint* fingerprint) {
   address i2c_entry = __ pc();
 
   gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
@@ -816,7 +825,7 @@
   gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
 
   __ flush();
-  return new AdapterHandlerEntry(i2c_entry, c2i_entry, c2i_unverified_entry);
+  return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
 }
 
 int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
@@ -3319,6 +3328,10 @@
 
   // rax: exception handler
 
+  // Restore SP from BP if the exception PC is a MethodHandle call.
+  __ cmpl(Address(r15_thread, JavaThread::is_method_handle_exception_offset()), 0);
+  __ cmovptr(Assembler::notEqual, rsp, rbp);
+
   // We have a handler in rax (could be deopt blob).
   __ mov(r8, rax);
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/stubGenerator_x86_32.cpp
--- a/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -718,10 +718,8 @@
       case BarrierSet::G1SATBCTLogging:
         {
           __ pusha();                      // push registers
-          __ push(count);
-          __ push(start);
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_pre)));
-          __ addptr(rsp, 2*wordSize);
+          __ call_VM_leaf(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_pre),
+                          start, count);
           __ popa();
         }
         break;
@@ -752,10 +750,8 @@
       case BarrierSet::G1SATBCTLogging:
         {
           __ pusha();                      // push registers
-          __ push(count);
-          __ push(start);
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post)));
-          __ addptr(rsp, 2*wordSize);
+          __ call_VM_leaf(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post),
+                          start, count);
           __ popa();
         }
         break;
@@ -2030,6 +2026,54 @@
                                entry_checkcast_arraycopy);
   }
 
+  void generate_math_stubs() {
+    {
+      StubCodeMark mark(this, "StubRoutines", "log");
+      StubRoutines::_intrinsic_log = (double (*)(double)) __ pc();
+
+      __ fld_d(Address(rsp, 4));
+      __ flog();
+      __ ret(0);
+    }
+    {
+      StubCodeMark mark(this, "StubRoutines", "log10");
+      StubRoutines::_intrinsic_log10 = (double (*)(double)) __ pc();
+
+      __ fld_d(Address(rsp, 4));
+      __ flog10();
+      __ ret(0);
+    }
+    {
+      StubCodeMark mark(this, "StubRoutines", "sin");
+      StubRoutines::_intrinsic_sin = (double (*)(double))  __ pc();
+
+      __ fld_d(Address(rsp, 4));
+      __ trigfunc('s');
+      __ ret(0);
+    }
+    {
+      StubCodeMark mark(this, "StubRoutines", "cos");
+      StubRoutines::_intrinsic_cos = (double (*)(double)) __ pc();
+
+      __ fld_d(Address(rsp, 4));
+      __ trigfunc('c');
+      __ ret(0);
+    }
+    {
+      StubCodeMark mark(this, "StubRoutines", "tan");
+      StubRoutines::_intrinsic_tan = (double (*)(double)) __ pc();
+
+      __ fld_d(Address(rsp, 4));
+      __ trigfunc('t');
+      __ ret(0);
+    }
+
+    // The intrinsic version of these seem to return the same value as
+    // the strict version.
+    StubRoutines::_intrinsic_exp = SharedRuntime::dexp;
+    StubRoutines::_intrinsic_pow = SharedRuntime::dpow;
+  }
+
  public:
   // Information about frame layout at time of blocking runtime call.
   // Note that we only have to preserve callee-saved registers since
@@ -2228,6 +2272,8 @@
         MethodHandles::generate_method_handle_stub(_masm, ek);
       }
     }
+
+    generate_math_stubs();
   }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/stubGenerator_x86_64.cpp
--- a/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -1172,7 +1172,7 @@
             __ movptr(c_rarg0, addr);
             __ movptr(c_rarg1, count);
           }
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_pre)));
+          __ call_VM_leaf(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_pre), 2);
           __ popa();
         }
         break;
@@ -1212,7 +1212,7 @@
           __ shrptr(scratch, LogBytesPerHeapOop);  // convert to element count
           __ mov(c_rarg0, start);
           __ mov(c_rarg1, scratch);
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post)));
+          __ call_VM_leaf(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post), 2);
           __ popa();
         }
         break;
@@ -2731,6 +2731,79 @@
     StubRoutines::_arrayof_oop_arraycopy             = StubRoutines::_oop_arraycopy;
   }
 
+  void generate_math_stubs() {
+    {
+      StubCodeMark mark(this, "StubRoutines", "log");
+      StubRoutines::_intrinsic_log = (double (*)(double)) __ pc();
+
+      __ subq(rsp, 8);
+      __ movdbl(Address(rsp, 0), xmm0);
+      __ fld_d(Address(rsp, 0));
+      __ flog();
+      __ fstp_d(Address(rsp, 0));
+      __ movdbl(xmm0, Address(rsp, 0));
+      __ addq(rsp, 8);
+      __ ret(0);
+    }
+    {
+      StubCodeMark mark(this, "StubRoutines", "log10");
+      StubRoutines::_intrinsic_log10 = (double (*)(double)) __ pc();
+
+      __ subq(rsp, 8);
+      __ movdbl(Address(rsp, 0), xmm0);
+      __ fld_d(Address(rsp, 0));
+      __ flog10();
+      __ fstp_d(Address(rsp, 0));
+      __ movdbl(xmm0, Address(rsp, 0));
+      __ addq(rsp, 8);
+      __ ret(0);
+    }
+    {
+      StubCodeMark mark(this, "StubRoutines", "sin");
+      StubRoutines::_intrinsic_sin = (double (*)(double)) __ pc();
+
+      __ subq(rsp, 8);
+      __ movdbl(Address(rsp, 0), xmm0);
+      __ fld_d(Address(rsp, 0));
+      __ trigfunc('s');
+      __ fstp_d(Address(rsp, 0));
+      __ movdbl(xmm0, Address(rsp, 0));
+      __ addq(rsp, 8);
+      __ ret(0);
+    }
+    {
+      StubCodeMark mark(this, "StubRoutines", "cos");
+      StubRoutines::_intrinsic_cos = (double (*)(double)) __ pc();
+
+      __ subq(rsp, 8);
+      __ movdbl(Address(rsp, 0), xmm0);
+      __ fld_d(Address(rsp, 0));
+      __ trigfunc('c');
+      __ fstp_d(Address(rsp, 0));
+      __ movdbl(xmm0, Address(rsp, 0));
+      __ addq(rsp, 8);
+      __ ret(0);
+    }
+    {
+      StubCodeMark mark(this, "StubRoutines", "tan");
+      StubRoutines::_intrinsic_tan = (double (*)(double)) __ pc();
+
+      __ subq(rsp, 8);
+      __ movdbl(Address(rsp, 0), xmm0);
+      __ fld_d(Address(rsp, 0));
+      __ trigfunc('t');
+      __ fstp_d(Address(rsp, 0));
+      __ movdbl(xmm0, Address(rsp, 0));
+      __ addq(rsp, 8);
+      __ ret(0);
+    }
+
+    // The intrinsic version of these seem to return the same value as
+    // the strict version.
+    StubRoutines::_intrinsic_exp = SharedRuntime::dexp;
+    StubRoutines::_intrinsic_pow = SharedRuntime::dpow;
+  }
+
 #undef __
 #define __ masm->
 
@@ -2935,6 +3008,18 @@
 
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
+
+    // generic method handle stubs
+    if (EnableMethodHandles && SystemDictionary::MethodHandle_klass() != NULL) {
+      for (MethodHandles::EntryKind ek = MethodHandles::_EK_FIRST;
+           ek < MethodHandles::_EK_LIMIT;
+           ek = MethodHandles::EntryKind(1 + (int)ek)) {
+        StubCodeMark mark(this, "MethodHandle", MethodHandles::entry_name(ek));
+        MethodHandles::generate_method_handle_stub(_masm, ek);
+      }
+    }
+
+    generate_math_stubs();
   }
 
  public:
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/templateInterpreter_x86_32.cpp
--- a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -92,8 +92,7 @@
   return entry;
 }
 
-// Arguments are: required type at TOS+8, failing object (or NULL) at TOS+4.
-// pc at TOS (just for debugging)
+// Arguments are: required type at TOS+4, failing object (or NULL) at TOS.
 address TemplateInterpreterGenerator::generate_WrongMethodType_handler() {
   address entry = __ pc();
 
@@ -156,15 +155,8 @@
 }
 
 
-address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, bool unbox) {
+address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step) {
   TosState incoming_state = state;
-  if (EnableInvokeDynamic) {
-    if (unbox) {
-      incoming_state = atos;
-    }
-  } else {
-    assert(!unbox, "old behavior");
-  }
 
   Label interpreter_entry;
   address compiled_entry = __ pc();
@@ -217,46 +209,6 @@
   __ restore_bcp();
   __ restore_locals();
 
-  Label L_fail;
-
-  if (unbox && state != atos) {
-    // cast and unbox
-    BasicType type = as_BasicType(state);
-    if (type == T_BYTE)  type = T_BOOLEAN; // FIXME
-    KlassHandle boxk = SystemDictionaryHandles::box_klass(type);
-    __ mov32(rbx, ExternalAddress((address) boxk.raw_value()));
-    __ testl(rax, rax);
-    Label L_got_value, L_get_value;
-    // convert nulls to zeroes (avoid NPEs here)
-    if (!(type == T_FLOAT || type == T_DOUBLE)) {
-      // if rax already contains zero bits, forge ahead
-      __ jcc(Assembler::zero, L_got_value);
-    } else {
-      __ jcc(Assembler::notZero, L_get_value);
-      __ fldz();
-      __ jmp(L_got_value);
-    }
-    __ bind(L_get_value);
-    __ cmp32(rbx, Address(rax, oopDesc::klass_offset_in_bytes()));
-    __ jcc(Assembler::notEqual, L_fail);
-    int offset = java_lang_boxing_object::value_offset_in_bytes(type);
-    // Cf. TemplateTable::getfield_or_static
-    switch (type) {
-      case T_BYTE:     // fall through:
-      case T_BOOLEAN:  __ load_signed_byte(rax, Address(rax, offset));    break;
-      case T_CHAR:     __ load_unsigned_short(rax, Address(rax, offset)); break;
-      case T_SHORT:    __ load_signed_short(rax, Address(rax, offset));   break;
-      case T_INT:      __ movl(rax, Address(rax, offset));                break;
-      case T_FLOAT:    __ fld_s(Address(rax, offset));                    break;
-      case T_DOUBLE:   __ fld_d(Address(rax, offset));                    break;
-      // Access to java.lang.Double.value does not need to be atomic:
-      case T_LONG:   { __ movl(rdx, Address(rax, offset + 4));
-                       __ movl(rax, Address(rax, offset + 0));  }         break;
-      default: ShouldNotReachHere();
-    }
-    __ bind(L_got_value);
-  }
-
   Label L_got_cache, L_giant_index;
   if (EnableInvokeDynamic) {
     __ cmpb(Address(rsi, 0), Bytecodes::_invokedynamic);
@@ -264,32 +216,6 @@
   }
   __ get_cache_and_index_at_bcp(rbx, rcx, 1, false);
   __ bind(L_got_cache);
-  if (unbox && state == atos) {
-    // insert a casting conversion, to keep verifier sane
-    Label L_ok, L_ok_pops;
-    __ testl(rax, rax);
-    __ jcc(Assembler::zero, L_ok);
-    __ push(rax);               // save the object to check
-    __ push(rbx);               // save CP cache reference
-    __ movl(rdx, Address(rax, oopDesc::klass_offset_in_bytes()));
-    __ movl(rbx, Address(rbx, rcx,
-                      Address::times_4, constantPoolCacheOopDesc::base_offset() +
-                      ConstantPoolCacheEntry::f1_offset()));
-    __ movl(rbx, Address(rbx, __ delayed_value(sun_dyn_CallSiteImpl::type_offset_in_bytes, rcx)));
-    __ movl(rbx, Address(rbx, __ delayed_value(java_dyn_MethodType::rtype_offset_in_bytes, rcx)));
-    __ movl(rax, Address(rbx, __ delayed_value(java_lang_Class::klass_offset_in_bytes, rcx)));
-    __ check_klass_subtype(rdx, rax, rbx, L_ok_pops);
-    __ pop(rcx);                // pop and discard CP cache
-    __ mov(rbx, rax);           // target supertype into rbx for L_fail
-    __ pop(rax);                // failed object into rax for L_fail
-    __ jmp(L_fail);
-
-    __ bind(L_ok_pops);
-    // restore pushed temp regs:
-    __ pop(rbx);
-    __ pop(rax);
-    __ bind(L_ok);
-  }
   __ movl(rbx, Address(rbx, rcx,
                     Address::times_ptr, constantPoolCacheOopDesc::base_offset() +
                     ConstantPoolCacheEntry::flags_offset()));
@@ -302,14 +228,6 @@
     __ bind(L_giant_index);
     __ get_cache_and_index_at_bcp(rbx, rcx, 1, true);
     __ jmp(L_got_cache);
-
-    if (unbox) {
-      __ bind(L_fail);
-      __ push(rbx);             // missed klass (required)
-      __ push(rax);             // bad object (actual)
-      __ movptr(rdx, ExternalAddress((address) &Interpreter::_throw_WrongMethodType_entry));
-      __ call(rdx);
-    }
   }
 
   return entry;
@@ -1513,6 +1431,23 @@
 
 }
 
+// These should never be compiled since the interpreter will prefer
+// the compiled version to the intrinsic version.
+bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+  switch (method_kind(m)) {
+    case Interpreter::java_lang_math_sin     : // fall thru
+    case Interpreter::java_lang_math_cos     : // fall thru
+    case Interpreter::java_lang_math_tan     : // fall thru
+    case Interpreter::java_lang_math_abs     : // fall thru
+    case Interpreter::java_lang_math_log     : // fall thru
+    case Interpreter::java_lang_math_log10   : // fall thru
+    case Interpreter::java_lang_math_sqrt    :
+      return false;
+    default:
+      return true;
+  }
+}
+
 // How much stack a method activation needs in words.
 int AbstractInterpreter::size_top_interpreter_activation(methodOop method) {
 
@@ -1570,7 +1505,10 @@
 
   if (interpreter_frame != NULL) {
 #ifdef ASSERT
-    assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(), "Frame not properly walkable");
+    if (!EnableMethodHandles)
+      // @@@ FIXME: Should we correct interpreter_frame_sender_sp in the calling sequences?
+      // Probably, since deoptimization doesn't work yet.
+      assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(), "Frame not properly walkable");
     assert(caller->sp() == interpreter_frame->sender_sp(), "Frame not properly walkable(2)");
 #endif
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/templateInterpreter_x86_64.cpp
--- a/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -100,21 +100,26 @@
   return entry;
 }
 
-// Arguments are: required type in rarg1, failing object (or NULL) in rarg2
+// Arguments are: required type at TOS+8, failing object (or NULL) at TOS+4.
 address TemplateInterpreterGenerator::generate_WrongMethodType_handler() {
   address entry = __ pc();
 
   __ pop(c_rarg2);              // failing object is at TOS
   __ pop(c_rarg1);              // required type is at TOS+8
 
-  // expression stack must be empty before entering the VM if an
-  // exception happened
+  __ verify_oop(c_rarg1);
+  __ verify_oop(c_rarg2);
+
+  // Various method handle types use interpreter registers as temps.
+  __ restore_bcp();
+  __ restore_locals();
+
+  // Expression stack must be empty before entering the VM for an exception.
   __ empty_expression_stack();
 
   __ call_VM(noreg,
              CAST_FROM_FN_PTR(address,
-                              InterpreterRuntime::
-                              throw_WrongMethodTypeException),
+                              InterpreterRuntime::throw_WrongMethodTypeException),
              // pass required type, failing object (or NULL)
              c_rarg1, c_rarg2);
   return entry;
@@ -166,8 +171,7 @@
 
 
 address TemplateInterpreterGenerator::generate_return_entry_for(TosState state,
-                                                                int step, bool unbox) {
-  assert(!unbox, "NYI");//6815692//
+                                                                int step) {
 
   // amd64 doesn't need to do anything special about compiled returns
   // to the interpreter so the code that exists on x86 to place a sentinel
@@ -183,15 +187,29 @@
   __ restore_bcp();
   __ restore_locals();
 
-  __ get_cache_and_index_at_bcp(rbx, rcx, 1);
+  Label L_got_cache, L_giant_index;
+  if (EnableInvokeDynamic) {
+    __ cmpb(Address(r13, 0), Bytecodes::_invokedynamic);
+    __ jcc(Assembler::equal, L_giant_index);
+  }
+  __ get_cache_and_index_at_bcp(rbx, rcx, 1, false);
+  __ bind(L_got_cache);
   __ movl(rbx, Address(rbx, rcx,
-                       Address::times_8,
+                       Address::times_ptr,
                        in_bytes(constantPoolCacheOopDesc::base_offset()) +
                        3 * wordSize));
   __ andl(rbx, 0xFF);
   if (TaggedStackInterpreter) __ shll(rbx, 1); // 2 slots per parameter.
   __ lea(rsp, Address(rsp, rbx, Address::times_8));
   __ dispatch_next(state, step);
+
+  // out of the main line of code...
+  if (EnableInvokeDynamic) {
+    __ bind(L_giant_index);
+    __ get_cache_and_index_at_bcp(rbx, rcx, 1, true);
+    __ jmp(L_got_cache);
+  }
+
   return entry;
 }
 
@@ -431,8 +449,12 @@
   __ addptr(rax, stack_base);
   __ subptr(rax, stack_size);
 
+  // Use the maximum number of pages we might bang.
+  const int max_pages = StackShadowPages > (StackRedPages+StackYellowPages) ? StackShadowPages :
+                                                                              (StackRedPages+StackYellowPages);
+
   // add in the red and yellow zone sizes
-  __ addptr(rax, (StackRedPages + StackYellowPages) * page_size);
+  __ addptr(rax, max_pages * page_size);
 
   // check against the current stack bottom
   __ cmpptr(rsp, rax);
@@ -1434,6 +1456,23 @@
                                 generate_normal_entry(synchronized);
 }
 
+// These should never be compiled since the interpreter will prefer
+// the compiled version to the intrinsic version.
+bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+  switch (method_kind(m)) {
+    case Interpreter::java_lang_math_sin     : // fall thru
+    case Interpreter::java_lang_math_cos     : // fall thru
+    case Interpreter::java_lang_math_tan     : // fall thru
+    case Interpreter::java_lang_math_abs     : // fall thru
+    case Interpreter::java_lang_math_log     : // fall thru
+    case Interpreter::java_lang_math_log10   : // fall thru
+    case Interpreter::java_lang_math_sqrt    :
+      return false;
+    default:
+      return true;
+  }
+}
+
 // How much stack a method activation needs in words.
 int AbstractInterpreter::size_top_interpreter_activation(methodOop method) {
   const int entry_size = frame::interpreter_frame_monitor_size();
@@ -1484,8 +1523,10 @@
          tempcount* Interpreter::stackElementWords() + popframe_extra_args;
   if (interpreter_frame != NULL) {
 #ifdef ASSERT
-    assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(),
-           "Frame not properly walkable");
+    if (!EnableMethodHandles)
+      // @@@ FIXME: Should we correct interpreter_frame_sender_sp in the calling sequences?
+      // Probably, since deoptimization doesn't work yet.
+      assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(), "Frame not properly walkable");
     assert(caller->sp() == interpreter_frame->sender_sp(), "Frame not properly walkable(2)");
 #endif
 
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/templateTable_x86_32.cpp
--- a/src/cpu/x86/vm/templateTable_x86_32.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/templateTable_x86_32.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -2890,9 +2890,6 @@
 
 
 void TemplateTable::prepare_invoke(Register method, Register index, int byte_no) {
-  bool is_invdyn_bootstrap = (byte_no < 0);
-  if (is_invdyn_bootstrap)  byte_no = -byte_no;
-
   // determine flags
   Bytecodes::Code code = bytecode();
   const bool is_invokeinterface  = code == Bytecodes::_invokeinterface;
@@ -2907,8 +2904,6 @@
   const Register flags  = rdx;
   assert_different_registers(method, index, recv, flags);
 
-  assert(!is_invdyn_bootstrap || is_invokedynamic, "byte_no<0 hack only for invdyn");
-
   // save 'interpreter return address'
   __ save_bcp();
 
@@ -2944,9 +2939,7 @@
   // load return address
   {
     address table_addr;
-    if (is_invdyn_bootstrap)
-      table_addr = (address)Interpreter::return_5_unbox_addrs_by_index_table();
-    else if (is_invokeinterface || is_invokedynamic)
+    if (is_invokeinterface || is_invokedynamic)
       table_addr = (address)Interpreter::return_5_addrs_by_index_table();
     else
       table_addr = (address)Interpreter::return_3_addrs_by_index_table();
@@ -3153,54 +3146,10 @@
     __ profile_call(rsi);
   }
 
-  Label handle_unlinked_site;
-  __ movptr(rcx, Address(rax, __ delayed_value(sun_dyn_CallSiteImpl::target_offset_in_bytes, rcx)));
-  __ testptr(rcx, rcx);
-  __ jcc(Assembler::zero, handle_unlinked_site);
-
+  __ movptr(rcx, Address(rax, __ delayed_value(java_dyn_CallSite::target_offset_in_bytes, rcx)));
+  __ null_check(rcx);
   __ prepare_to_jump_from_interpreted();
   __ jump_to_method_handle_entry(rcx, rdx);
-
-  // Initial calls come here...
-  __ bind(handle_unlinked_site);
-  __ pop(rcx);                 // remove return address pushed by prepare_invoke
-
-  // box stacked arguments into an array for the bootstrap method
-  address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::bootstrap_invokedynamic);
-  __ restore_bcp();      // rsi must be correct for call_VM
-  __ call_VM(rax, entry, rax);
-  __ movl(rdi, rax);            // protect bootstrap MH from prepare_invoke
-
-  // recompute return address
-  __ restore_bcp();      // rsi must be correct for prepare_invoke
-  prepare_invoke(rax, rbx, -byte_no);  // smashes rcx, rdx
-  // rax: CallSite object (f1)
-  // rbx: unused (f2)
-  // rdi: bootstrap MH
-  // rdx: flags
-
-  // now load up the arglist, which has been neatly boxed
-  __ get_thread(rcx);
-  __ movptr(rdx, Address(rcx, JavaThread::vm_result_2_offset()));
-  __ movptr(Address(rcx, JavaThread::vm_result_2_offset()), NULL_WORD);
-  __ verify_oop(rdx);
-  // rdx = arglist
-
-  // save SP now, before we add the bootstrap call to the stack
-  // We must preserve a fiction that the original arguments are outgoing,
-  // because the return sequence will reset the stack to this point
-  // and then pop all those arguments.  It seems error-prone to use
-  // a different argument list size just for bootstrapping.
-  __ prepare_to_jump_from_interpreted();
-
-  // Now let's play adapter, pushing the real arguments on the stack.
-  __ pop(rbx);                  // return PC
-  __ push(rdi);                 // boot MH
-  __ push(rax);                 // call site
-  __ push(rdx);                 // arglist
-  __ push(rbx);                 // return PC, again
-  __ mov(rcx, rdi);
-  __ jump_to_method_handle_entry(rcx, rdx);
 }
 
 //----------------------------------------------------------------------------------------------------
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/templateTable_x86_64.cpp
--- a/src/cpu/x86/vm/templateTable_x86_64.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/templateTable_x86_64.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -139,7 +139,7 @@
         }
         __ g1_write_barrier_pre(rdx, r8, rbx, val != noreg);
         if (val == noreg) {
-          __ store_heap_oop(Address(rdx, 0), NULL_WORD);
+          __ store_heap_oop_null(Address(rdx, 0));
         } else {
           __ store_heap_oop(Address(rdx, 0), val);
           __ g1_write_barrier_post(rdx, val, r8, rbx);
@@ -152,7 +152,7 @@
     case BarrierSet::CardTableExtension:
       {
         if (val == noreg) {
-          __ store_heap_oop(obj, NULL_WORD);
+          __ store_heap_oop_null(obj);
         } else {
           __ store_heap_oop(obj, val);
           // flatten object address if needed
@@ -168,7 +168,7 @@
     case BarrierSet::ModRef:
     case BarrierSet::Other:
       if (val == noreg) {
-        __ store_heap_oop(obj, NULL_WORD);
+        __ store_heap_oop_null(obj);
       } else {
         __ store_heap_oop(obj, val);
       }
@@ -203,18 +203,15 @@
     __ jcc(Assembler::notEqual, fast_patch);
     __ get_method(scratch);
     // Let breakpoint table handling rewrite to quicker bytecode
-    __ call_VM(noreg,
-               CAST_FROM_FN_PTR(address,
-                                InterpreterRuntime::set_original_bytecode_at),
-               scratch, r13, bc);
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::set_original_bytecode_at), scratch, r13, bc);
 #ifndef ASSERT
     __ jmpb(patch_done);
+#else
+    __ jmp(patch_done);
+#endif
     __ bind(fast_patch);
   }
-#else
-    __ jmp(patch_done);
-    __ bind(fast_patch);
-  }
+#ifdef ASSERT
   Label okay;
   __ load_unsigned_byte(scratch, at_bcp(0));
   __ cmpl(scratch, (int) Bytecodes::java_code(bytecode));
@@ -2054,26 +2051,28 @@
   }
 }
 
-void TemplateTable::resolve_cache_and_index(int byte_no,
-                                            Register Rcache,
-                                            Register index) {
+void TemplateTable::resolve_cache_and_index(int byte_no, Register Rcache, Register index) {
   assert(byte_no == 1 || byte_no == 2, "byte_no out of range");
+  bool is_invokedynamic = (bytecode() == Bytecodes::_invokedynamic);
 
   const Register temp = rbx;
   assert_different_registers(Rcache, index, temp);
 
   const int shift_count = (1 + byte_no) * BitsPerByte;
   Label resolved;
-  __ get_cache_and_index_at_bcp(Rcache, index, 1);
-  __ movl(temp, Address(Rcache,
-                        index, Address::times_8,
-                        constantPoolCacheOopDesc::base_offset() +
-                        ConstantPoolCacheEntry::indices_offset()));
-  __ shrl(temp, shift_count);
-  // have we resolved this bytecode?
-  __ andl(temp, 0xFF);
-  __ cmpl(temp, (int) bytecode());
-  __ jcc(Assembler::equal, resolved);
+  __ get_cache_and_index_at_bcp(Rcache, index, 1, is_invokedynamic);
+  if (is_invokedynamic) {
+    // we are resolved if the f1 field contains a non-null CallSite object
+    __ cmpptr(Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f1_offset()), (int32_t) NULL_WORD);
+    __ jcc(Assembler::notEqual, resolved);
+  } else {
+    __ movl(temp, Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset()));
+    __ shrl(temp, shift_count);
+    // have we resolved this bytecode?
+    __ andl(temp, 0xFF);
+    __ cmpl(temp, (int) bytecode());
+    __ jcc(Assembler::equal, resolved);
+  }
 
   // resolve first time through
   address entry;
@@ -2090,6 +2089,9 @@
   case Bytecodes::_invokeinterface:
     entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_invoke);
     break;
+  case Bytecodes::_invokedynamic:
+    entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_invokedynamic);
+    break;
   default:
     ShouldNotReachHere();
     break;
@@ -2098,7 +2100,7 @@
   __ call_VM(noreg, entry, temp);
 
   // Update registers with resolved info
-  __ get_cache_and_index_at_bcp(Rcache, index, 1);
+  __ get_cache_and_index_at_bcp(Rcache, index, 1, is_invokedynamic);
   __ bind(resolved);
 }
 
@@ -2832,15 +2834,14 @@
   ShouldNotReachHere();
 }
 
-void TemplateTable::prepare_invoke(Register method,
-                                   Register index,
-                                   int byte_no,
-                                   Bytecodes::Code code) {
+void TemplateTable::prepare_invoke(Register method, Register index, int byte_no) {
   // determine flags
+  Bytecodes::Code code = bytecode();
   const bool is_invokeinterface  = code == Bytecodes::_invokeinterface;
+  const bool is_invokedynamic    = code == Bytecodes::_invokedynamic;
   const bool is_invokevirtual    = code == Bytecodes::_invokevirtual;
   const bool is_invokespecial    = code == Bytecodes::_invokespecial;
-  const bool load_receiver       = code != Bytecodes::_invokestatic;
+  const bool load_receiver      = (code != Bytecodes::_invokestatic && code != Bytecodes::_invokedynamic);
   const bool receiver_null_check = is_invokespecial;
   const bool save_flags = is_invokeinterface || is_invokevirtual;
   // setup registers & access constant pool cache
@@ -2858,9 +2859,13 @@
     __ movl(recv, flags);
     __ andl(recv, 0xFF);
     if (TaggedStackInterpreter) __ shll(recv, 1);  // index*2
-    __ movptr(recv, Address(rsp, recv, Address::times_8,
-                                 -Interpreter::expr_offset_in_bytes(1)));
-    __ verify_oop(recv);
+    Address recv_addr(rsp, recv, Address::times_8, -Interpreter::expr_offset_in_bytes(1));
+    if (is_invokedynamic) {
+      __ lea(recv, recv_addr);
+    } else {
+      __ movptr(recv, recv_addr);
+      __ verify_oop(recv);
+    }
   }
 
   // do null check if needed
@@ -2878,10 +2883,14 @@
   ConstantPoolCacheEntry::verify_tosBits();
   // load return address
   {
-    ExternalAddress return_5((address)Interpreter::return_5_addrs_by_index_table());
-    ExternalAddress return_3((address)Interpreter::return_3_addrs_by_index_table());
-    __ lea(rscratch1, (is_invokeinterface ? return_5 : return_3));
-    __ movptr(flags, Address(rscratch1, flags, Address::times_8));
+    address table_addr;
+    if (is_invokeinterface || is_invokedynamic)
+      table_addr = (address)Interpreter::return_5_addrs_by_index_table();
+    else
+      table_addr = (address)Interpreter::return_3_addrs_by_index_table();
+    ExternalAddress table(table_addr);
+    __ lea(rscratch1, table);
+    __ movptr(flags, Address(rscratch1, flags, Address::times_ptr));
   }
 
   // push return address
@@ -2947,7 +2956,7 @@
 
 void TemplateTable::invokevirtual(int byte_no) {
   transition(vtos, vtos);
-  prepare_invoke(rbx, noreg, byte_no, bytecode());
+  prepare_invoke(rbx, noreg, byte_no);
 
   // rbx: index
   // rcx: receiver
@@ -2959,7 +2968,7 @@
 
 void TemplateTable::invokespecial(int byte_no) {
   transition(vtos, vtos);
-  prepare_invoke(rbx, noreg, byte_no, bytecode());
+  prepare_invoke(rbx, noreg, byte_no);
   // do the call
   __ verify_oop(rbx);
   __ profile_call(rax);
@@ -2969,7 +2978,7 @@
 
 void TemplateTable::invokestatic(int byte_no) {
   transition(vtos, vtos);
-  prepare_invoke(rbx, noreg, byte_no, bytecode());
+  prepare_invoke(rbx, noreg, byte_no);
   // do the call
   __ verify_oop(rbx);
   __ profile_call(rax);
@@ -2983,7 +2992,7 @@
 
 void TemplateTable::invokeinterface(int byte_no) {
   transition(vtos, vtos);
-  prepare_invoke(rax, rbx, byte_no, bytecode());
+  prepare_invoke(rax, rbx, byte_no);
 
   // rax: Interface
   // rbx: index
@@ -3072,7 +3081,24 @@
     return;
   }
 
-  __ stop("invokedynamic NYI");//6815692//
+  prepare_invoke(rax, rbx, byte_no);
+
+  // rax: CallSite object (f1)
+  // rbx: unused (f2)
+  // rcx: receiver address
+  // rdx: flags (unused)
+
+  if (ProfileInterpreter) {
+    Label L;
+    // %%% should make a type profile for any invokedynamic that takes a ref argument
+    // profile this call
+    __ profile_call(r13);
+  }
+
+  __ movptr(rcx, Address(rax, __ delayed_value(java_dyn_CallSite::target_offset_in_bytes, rcx)));
+  __ null_check(rcx);
+  __ prepare_to_jump_from_interpreted();
+  __ jump_to_method_handle_entry(rcx, rdx);
 }
 
 
@@ -3212,17 +3238,19 @@
     __ xorl(rcx, rcx); // use zero reg to clear memory (shorter code)
     __ store_klass_gap(rax, rcx);  // zero klass gap for compressed oops
     __ store_klass(rax, rsi);      // store klass last
+
+    {
+      SkipIfEqual skip(_masm, &DTraceAllocProbes, false);
+      // Trigger dtrace event for fastpath
+      __ push(atos); // save the return value
+      __ call_VM_leaf(
+           CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), rax);
+      __ pop(atos); // restore the return value
+
+    }
     __ jmp(done);
   }
 
-  {
-    SkipIfEqual skip(_masm, &DTraceAllocProbes, false);
-    // Trigger dtrace event for fastpath
-    __ push(atos); // save the return value
-    __ call_VM_leaf(
-         CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), rax);
-    __ pop(atos); // restore the return value
-  }
 
   // slow case
   __ bind(slow_case);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/templateTable_x86_64.hpp
--- a/src/cpu/x86/vm/templateTable_x86_64.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/templateTable_x86_64.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,8 +22,7 @@
  *
  */
 
-  static void prepare_invoke(Register method, Register index, int byte_no,
-                             Bytecodes::Code code);
+  static void prepare_invoke(Register method, Register index, int byte_no);
   static void invokevirtual_helper(Register index, Register recv,
                                    Register flags);
   static void volatile_barrier(Assembler::Membar_mask_bits order_constraint);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/vm_version_x86.cpp
--- a/src/cpu/x86/vm/vm_version_x86.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/vm_version_x86.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -255,6 +255,8 @@
   if (!VM_Version::supports_sse2()) {
     vm_exit_during_initialization("Unknown x64 processor: SSE2 not supported");
   }
+  // in 64 bit the use of SSE2 is the minimum
+  if (UseSSE < 2) UseSSE = 2;
 #endif
 
   // If the OS doesn't support SSE, we can't use this feature even if the HW does
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/x86_32.ad
--- a/src/cpu/x86/vm/x86_32.ad	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/x86_32.ad	Thu Mar 25 16:54:59 2010 -0700
@@ -235,6 +235,11 @@
 //----------SOURCE BLOCK-------------------------------------------------------
 // This is a block of C++ code which provides values, functions, and
 // definitions necessary in the rest of the architecture description
+source_hpp %{
+// Must be visible to the DFA in dfa_x86_32.cpp
+extern bool is_operand_hi32_zero(Node* n);
+%}
+
 source %{
 #define   RELOC_IMM32    Assembler::imm_operand
 #define   RELOC_DISP32   Assembler::disp32_operand
@@ -268,22 +273,36 @@
 static jlong *float_signflip_pool  = double_quadword(&fp_signmask_pool[3*2], CONST64(0x8000000080000000), CONST64(0x8000000080000000));
 static jlong *double_signflip_pool = double_quadword(&fp_signmask_pool[4*2], CONST64(0x8000000000000000), CONST64(0x8000000000000000));
 
+// Offset hacking within calls.
+static int pre_call_FPU_size() {
+  if (Compile::current()->in_24_bit_fp_mode())
+    return 6; // fldcw
+  return 0;
+}
+
+static int preserve_SP_size() {
+  return LP64_ONLY(1 +) 2;  // [rex,] op, rm(reg/reg)
+}
+
 // !!!!! Special hack to get all type of calls to specify the byte offset
 //       from the start of the call to the point where the return address
 //       will point.
 int MachCallStaticJavaNode::ret_addr_offset() {
-  return 5 + (Compile::current()->in_24_bit_fp_mode() ? 6 : 0);  // 5 bytes from start of call to where return address points
+  int offset = 5 + pre_call_FPU_size();  // 5 bytes from start of call to where return address points
+  if (_method_handle_invoke)
+    offset += preserve_SP_size();
+  return offset;
 }
 
 int MachCallDynamicJavaNode::ret_addr_offset() {
-  return 10 + (Compile::current()->in_24_bit_fp_mode() ? 6 : 0);  // 10 bytes from start of call to where return address points
+  return 10 + pre_call_FPU_size();  // 10 bytes from start of call to where return address points
 }
 
 static int sizeof_FFree_Float_Stack_All = -1;
 
 int MachCallRuntimeNode::ret_addr_offset() {
   assert(sizeof_FFree_Float_Stack_All != -1, "must have been emitted already");
-  return sizeof_FFree_Float_Stack_All + 5 + (Compile::current()->in_24_bit_fp_mode() ? 6 : 0);
+  return sizeof_FFree_Float_Stack_All + 5 + pre_call_FPU_size();
 }
 
 // Indicate if the safepoint node needs the polling page as an input.
@@ -299,8 +318,16 @@
 // The address of the call instruction needs to be 4-byte aligned to
 // ensure that it does not span a cache line so that it can be patched.
 int CallStaticJavaDirectNode::compute_padding(int current_offset) const {
-  if (Compile::current()->in_24_bit_fp_mode())
-    current_offset += 6;    // skip fldcw in pre_call_FPU, if any
+  current_offset += pre_call_FPU_size();  // skip fldcw, if any
+  current_offset += 1;      // skip call opcode byte
+  return round_to(current_offset, alignment_required()) - current_offset;
+}
+
+// The address of the call instruction needs to be 4-byte aligned to
+// ensure that it does not span a cache line so that it can be patched.
+int CallStaticJavaHandleNode::compute_padding(int current_offset) const {
+  current_offset += pre_call_FPU_size();  // skip fldcw, if any
+  current_offset += preserve_SP_size();   // skip mov rbp, rsp
   current_offset += 1;      // skip call opcode byte
   return round_to(current_offset, alignment_required()) - current_offset;
 }
@@ -308,8 +335,7 @@
 // The address of the call instruction needs to be 4-byte aligned to
 // ensure that it does not span a cache line so that it can be patched.
 int CallDynamicJavaDirectNode::compute_padding(int current_offset) const {
-  if (Compile::current()->in_24_bit_fp_mode())
-    current_offset += 6;    // skip fldcw in pre_call_FPU, if any
+  current_offset += pre_call_FPU_size();  // skip fldcw, if any
   current_offset += 5;      // skip MOV instruction
   current_offset += 1;      // skip call opcode byte
   return round_to(current_offset, alignment_required()) - current_offset;
@@ -379,7 +405,7 @@
         int format) {
 #ifdef ASSERT
   if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
-    assert(oop(d32)->is_oop() && oop(d32)->is_perm(), "cannot embed non-perm oops in code");
+    assert(oop(d32)->is_oop() && (ScavengeRootsInCode || !oop(d32)->is_scavengable()), "cannot embed scavengable oops in code");
   }
 #endif
   cbuf.relocate(cbuf.inst_mark(), rspec, format);
@@ -1418,8 +1444,10 @@
 // to implement the UseStrictFP mode.
 const bool Matcher::strict_fp_requires_explicit_rounding = true;
 
-// Do floats take an entire double register or just half?
-const bool Matcher::float_in_double = true;
+// Are floats conerted to double when stored to stack during deoptimization?
+// On x32 it is stored with convertion only when FPU is used for floats.
+bool Matcher::float_in_double() { return (UseSSE == 0); }
+
 // Do ints take an entire long register or just half?
 const bool Matcher::int_in_long = false;
 
@@ -1460,6 +1488,25 @@
   return RegMask();
 }
 
+const RegMask Matcher::method_handle_invoke_SP_save_mask() {
+  return EBP_REG_mask;
+}
+
+// Returns true if the high 32 bits of the value is known to be zero.
+bool is_operand_hi32_zero(Node* n) {
+  int opc = n->Opcode();
+  if (opc == Op_LoadUI2L) {
+    return true;
+  }
+  if (opc == Op_AndL) {
+    Node* o2 = n->in(2);
+    if (o2->is_Con() && (o2->get_long() & 0xFFFFFFFF00000000LL) == 0LL) {
+      return true;
+    }
+  }
+  return false;
+}
+
 %}
 
 //----------ENCODING BLOCK-----------------------------------------------------
@@ -1772,10 +1819,13 @@
 
   enc_class pre_call_FPU %{
     // If method sets FPU control word restore it here
+    debug_only(int off0 = cbuf.code_size());
     if( Compile::current()->in_24_bit_fp_mode() ) {
       MacroAssembler masm(&cbuf);
       masm.fldcw(ExternalAddress(StubRoutines::addr_fpu_cntrl_wrd_std()));
     }
+    debug_only(int off1 = cbuf.code_size());
+    assert(off1 - off0 == pre_call_FPU_size(), "correct size prediction");
   %}
 
   enc_class post_call_FPU %{
@@ -1786,6 +1836,21 @@
     }
   %}
 
+  enc_class preserve_SP %{
+    debug_only(int off0 = cbuf.code_size());
+    MacroAssembler _masm(&cbuf);
+    // RBP is preserved across all calls, even compiled calls.
+    // Use it to preserve RSP in places where the callee might change the SP.
+    __ movptr(rbp, rsp);
+    debug_only(int off1 = cbuf.code_size());
+    assert(off1 - off0 == preserve_SP_size(), "correct size prediction");
+  %}
+
+  enc_class restore_SP %{
+    MacroAssembler _masm(&cbuf);
+    __ movptr(rsp, rbp);
+  %}
+
   enc_class Java_Static_Call (method meth) %{    // JAVA STATIC CALL
     // CALL to fixup routine.  Fixup routine uses ScopeDesc info to determine
     // who we intended to call.
@@ -3701,458 +3766,6 @@
     }
   %}
 
-  enc_class enc_String_Compare(eDIRegP str1, eSIRegP str2, regXD tmp1, regXD tmp2,
-                        eAXRegI tmp3, eBXRegI tmp4, eCXRegI result) %{
-    Label ECX_GOOD_LABEL, LENGTH_DIFF_LABEL,
-          POP_LABEL, DONE_LABEL, CONT_LABEL,
-          WHILE_HEAD_LABEL;
-    MacroAssembler masm(&cbuf);
-
-    XMMRegister tmp1Reg   = as_XMMRegister($tmp1$$reg);
-    XMMRegister tmp2Reg   = as_XMMRegister($tmp2$$reg);
-
-    // Get the first character position in both strings
-    //         [8] char array, [12] offset, [16] count
-    int value_offset  = java_lang_String::value_offset_in_bytes();
-    int offset_offset = java_lang_String::offset_offset_in_bytes();
-    int count_offset  = java_lang_String::count_offset_in_bytes();
-    int base_offset   = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-    masm.movptr(rax, Address(rsi, value_offset));
-    masm.movl(rcx, Address(rsi, offset_offset));
-    masm.lea(rax, Address(rax, rcx, Address::times_2, base_offset));
-    masm.movptr(rbx, Address(rdi, value_offset));
-    masm.movl(rcx, Address(rdi, offset_offset));
-    masm.lea(rbx, Address(rbx, rcx, Address::times_2, base_offset));
-
-    // Compute the minimum of the string lengths(rsi) and the
-    // difference of the string lengths (stack)
-
-    if (VM_Version::supports_cmov()) {
-      masm.movl(rdi, Address(rdi, count_offset));
-      masm.movl(rsi, Address(rsi, count_offset));
-      masm.movl(rcx, rdi);
-      masm.subl(rdi, rsi);
-      masm.push(rdi);
-      masm.cmovl(Assembler::lessEqual, rsi, rcx);
-    } else {
-      masm.movl(rdi, Address(rdi, count_offset));
-      masm.movl(rcx, Address(rsi, count_offset));
-      masm.movl(rsi, rdi);
-      masm.subl(rdi, rcx);
-      masm.push(rdi);
-      masm.jccb(Assembler::lessEqual, ECX_GOOD_LABEL);
-      masm.movl(rsi, rcx);
-      // rsi holds min, rcx is unused
-    }
-
-    // Is the minimum length zero?
-    masm.bind(ECX_GOOD_LABEL);
-    masm.testl(rsi, rsi);
-    masm.jcc(Assembler::zero, LENGTH_DIFF_LABEL);
-
-    // Load first characters
-    masm.load_unsigned_short(rcx, Address(rbx, 0));
-    masm.load_unsigned_short(rdi, Address(rax, 0));
-
-    // Compare first characters
-    masm.subl(rcx, rdi);
-    masm.jcc(Assembler::notZero,  POP_LABEL);
-    masm.decrementl(rsi);
-    masm.jcc(Assembler::zero, LENGTH_DIFF_LABEL);
-
-    {
-      // Check after comparing first character to see if strings are equivalent
-      Label LSkip2;
-      // Check if the strings start at same location
-      masm.cmpptr(rbx,rax);
-      masm.jccb(Assembler::notEqual, LSkip2);
-
-      // Check if the length difference is zero (from stack)
-      masm.cmpl(Address(rsp, 0), 0x0);
-      masm.jcc(Assembler::equal,  LENGTH_DIFF_LABEL);
-
-      // Strings might not be equivalent
-      masm.bind(LSkip2);
-    }
-
-   // Advance to next character
-    masm.addptr(rax, 2);
-    masm.addptr(rbx, 2);
-
-    if (UseSSE42Intrinsics) {
-      // With SSE4.2, use double quad vector compare
-      Label COMPARE_VECTORS, VECTOR_NOT_EQUAL, COMPARE_TAIL;
-      // Setup to compare 16-byte vectors
-      masm.movl(rdi, rsi);
-      masm.andl(rsi, 0xfffffff8); // rsi holds the vector count
-      masm.andl(rdi, 0x00000007); // rdi holds the tail count
-      masm.testl(rsi, rsi);
-      masm.jccb(Assembler::zero, COMPARE_TAIL);
-
-      masm.lea(rax, Address(rax, rsi, Address::times_2));
-      masm.lea(rbx, Address(rbx, rsi, Address::times_2));
-      masm.negl(rsi);
-
-      masm.bind(COMPARE_VECTORS);
-      masm.movdqu(tmp1Reg, Address(rax, rsi, Address::times_2));
-      masm.movdqu(tmp2Reg, Address(rbx, rsi, Address::times_2));
-      masm.pxor(tmp1Reg, tmp2Reg);
-      masm.ptest(tmp1Reg, tmp1Reg);
-      masm.jccb(Assembler::notZero, VECTOR_NOT_EQUAL);
-      masm.addl(rsi, 8);
-      masm.jcc(Assembler::notZero, COMPARE_VECTORS);
-      masm.jmpb(COMPARE_TAIL);
-
-      // Mismatched characters in the vectors
-      masm.bind(VECTOR_NOT_EQUAL);
-      masm.lea(rax, Address(rax, rsi, Address::times_2));
-      masm.lea(rbx, Address(rbx, rsi, Address::times_2));
-      masm.movl(rdi, 8);
-
-      // Compare tail (< 8 chars), or rescan last vectors to
-      // find 1st mismatched characters
-      masm.bind(COMPARE_TAIL);
-      masm.testl(rdi, rdi);
-      masm.jccb(Assembler::zero, LENGTH_DIFF_LABEL);
-      masm.movl(rsi, rdi);
-      // Fallthru to tail compare
-    }
-
-    //Shift rax, and rbx, to the end of the arrays, negate min
-    masm.lea(rax, Address(rax, rsi, Address::times_2, 0));
-    masm.lea(rbx, Address(rbx, rsi, Address::times_2, 0));
-    masm.negl(rsi);
-
-    // Compare the rest of the characters
-    masm.bind(WHILE_HEAD_LABEL);
-    masm.load_unsigned_short(rcx, Address(rbx, rsi, Address::times_2, 0));
-    masm.load_unsigned_short(rdi, Address(rax, rsi, Address::times_2, 0));
-    masm.subl(rcx, rdi);
-    masm.jccb(Assembler::notZero, POP_LABEL);
-    masm.incrementl(rsi);
-    masm.jcc(Assembler::notZero, WHILE_HEAD_LABEL);
-
-    // Strings are equal up to min length.  Return the length difference.
-    masm.bind(LENGTH_DIFF_LABEL);
-    masm.pop(rcx);
-    masm.jmpb(DONE_LABEL);
-
-    // Discard the stored length difference
-    masm.bind(POP_LABEL);
-    masm.addptr(rsp, 4);
-
-    // That's it
-    masm.bind(DONE_LABEL);
-  %}
-
- enc_class enc_String_Equals(eDIRegP str1, eSIRegP str2, regXD tmp1, regXD tmp2,
-                       eBXRegI tmp3, eCXRegI tmp4, eAXRegI result) %{
-    Label RET_TRUE, RET_FALSE, DONE, COMPARE_VECTORS, COMPARE_CHAR;
-    MacroAssembler masm(&cbuf);
-
-    XMMRegister tmp1Reg   = as_XMMRegister($tmp1$$reg);
-    XMMRegister tmp2Reg   = as_XMMRegister($tmp2$$reg);
-
-    int value_offset  = java_lang_String::value_offset_in_bytes();
-    int offset_offset = java_lang_String::offset_offset_in_bytes();
-    int count_offset  = java_lang_String::count_offset_in_bytes();
-    int base_offset   = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-    // does source == target string?
-    masm.cmpptr(rdi, rsi);
-    masm.jcc(Assembler::equal, RET_TRUE);
-
-    // get and compare counts
-    masm.movl(rcx, Address(rdi, count_offset));
-    masm.movl(rax, Address(rsi, count_offset));
-    masm.cmpl(rcx, rax);
-    masm.jcc(Assembler::notEqual, RET_FALSE);
-    masm.testl(rax, rax);
-    masm.jcc(Assembler::zero, RET_TRUE);
-
-    // get source string offset and value
-    masm.movptr(rbx, Address(rsi, value_offset));
-    masm.movl(rax, Address(rsi, offset_offset));
-    masm.leal(rsi, Address(rbx, rax, Address::times_2, base_offset));
-
-    // get compare string offset and value
-    masm.movptr(rbx, Address(rdi, value_offset));
-    masm.movl(rax, Address(rdi, offset_offset));
-    masm.leal(rdi, Address(rbx, rax, Address::times_2, base_offset));
-
-    // Set byte count
-    masm.shll(rcx, 1);
-    masm.movl(rax, rcx);
-
-    if (UseSSE42Intrinsics) {
-      // With SSE4.2, use double quad vector compare
-      Label COMPARE_WIDE_VECTORS, COMPARE_TAIL;
-      // Compare 16-byte vectors
-      masm.andl(rcx, 0xfffffff0);  // vector count (in bytes)
-      masm.andl(rax, 0x0000000e);  // tail count (in bytes)
-      masm.testl(rcx, rcx);
-      masm.jccb(Assembler::zero, COMPARE_TAIL);
-      masm.lea(rdi, Address(rdi, rcx, Address::times_1));
-      masm.lea(rsi, Address(rsi, rcx, Address::times_1));
-      masm.negl(rcx);
-
-      masm.bind(COMPARE_WIDE_VECTORS);
-      masm.movdqu(tmp1Reg, Address(rdi, rcx, Address::times_1));
-      masm.movdqu(tmp2Reg, Address(rsi, rcx, Address::times_1));
-      masm.pxor(tmp1Reg, tmp2Reg);
-      masm.ptest(tmp1Reg, tmp1Reg);
-      masm.jccb(Assembler::notZero, RET_FALSE);
-      masm.addl(rcx, 16);
-      masm.jcc(Assembler::notZero, COMPARE_WIDE_VECTORS);
-      masm.bind(COMPARE_TAIL);
-      masm.movl(rcx, rax);
-      // Fallthru to tail compare
-    }
-
-    // Compare 4-byte vectors
-    masm.andl(rcx, 0xfffffffc);  // vector count (in bytes)
-    masm.andl(rax, 0x00000002);  // tail char (in bytes)
-    masm.testl(rcx, rcx);
-    masm.jccb(Assembler::zero, COMPARE_CHAR);
-    masm.lea(rdi, Address(rdi, rcx, Address::times_1));
-    masm.lea(rsi, Address(rsi, rcx, Address::times_1));
-    masm.negl(rcx);
-
-    masm.bind(COMPARE_VECTORS);
-    masm.movl(rbx, Address(rdi, rcx, Address::times_1));
-    masm.cmpl(rbx, Address(rsi, rcx, Address::times_1));
-    masm.jccb(Assembler::notEqual, RET_FALSE);
-    masm.addl(rcx, 4);
-    masm.jcc(Assembler::notZero, COMPARE_VECTORS);
-
-    // Compare trailing char (final 2 bytes), if any
-    masm.bind(COMPARE_CHAR);
-    masm.testl(rax, rax);
-    masm.jccb(Assembler::zero, RET_TRUE);
-    masm.load_unsigned_short(rbx, Address(rdi, 0));
-    masm.load_unsigned_short(rcx, Address(rsi, 0));
-    masm.cmpl(rbx, rcx);
-    masm.jccb(Assembler::notEqual, RET_FALSE);
-
-    masm.bind(RET_TRUE);
-    masm.movl(rax, 1);   // return true
-    masm.jmpb(DONE);
-
-    masm.bind(RET_FALSE);
-    masm.xorl(rax, rax); // return false
-
-    masm.bind(DONE);
-    %}
-
- enc_class enc_String_IndexOf(eSIRegP str1, eDIRegP str2, regXD tmp1, eAXRegI tmp2,
-                        eCXRegI tmp3, eDXRegI tmp4, eBXRegI result) %{
-    // SSE4.2 version
-    Label LOAD_SUBSTR, PREP_FOR_SCAN, SCAN_TO_SUBSTR,
-          SCAN_SUBSTR, RET_NEG_ONE, RET_NOT_FOUND, CLEANUP, DONE;
-    MacroAssembler masm(&cbuf);
-
-    XMMRegister tmp1Reg   = as_XMMRegister($tmp1$$reg);
-
-    // Get the first character position in both strings
-    //         [8] char array, [12] offset, [16] count
-    int value_offset  = java_lang_String::value_offset_in_bytes();
-    int offset_offset = java_lang_String::offset_offset_in_bytes();
-    int count_offset  = java_lang_String::count_offset_in_bytes();
-    int base_offset   = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-    // Get counts for string and substr
-    masm.movl(rdx, Address(rsi, count_offset));
-    masm.movl(rax, Address(rdi, count_offset));
-    // Check for substr count > string count
-    masm.cmpl(rax, rdx);
-    masm.jcc(Assembler::greater, RET_NEG_ONE);
-
-    // Start the indexOf operation
-    // Get start addr of string
-    masm.movptr(rbx, Address(rsi, value_offset));
-    masm.movl(rcx, Address(rsi, offset_offset));
-    masm.lea(rsi, Address(rbx, rcx, Address::times_2, base_offset));
-    masm.push(rsi);
-
-    // Get start addr of substr
-    masm.movptr(rbx, Address(rdi, value_offset));
-    masm.movl(rcx, Address(rdi, offset_offset));
-    masm.lea(rdi, Address(rbx, rcx, Address::times_2, base_offset));
-    masm.push(rdi);
-    masm.push(rax);
-    masm.jmpb(PREP_FOR_SCAN);
-
-    // Substr count saved at sp
-    // Substr saved at sp+4
-    // String saved at sp+8
-
-    // Prep to load substr for scan
-    masm.bind(LOAD_SUBSTR);
-    masm.movptr(rdi, Address(rsp, 4));
-    masm.movl(rax, Address(rsp, 0));
-
-    // Load substr
-    masm.bind(PREP_FOR_SCAN);
-    masm.movdqu(tmp1Reg, Address(rdi, 0));
-    masm.addl(rdx, 8);        // prime the loop
-    masm.subptr(rsi, 16);
-
-    // Scan string for substr in 16-byte vectors
-    masm.bind(SCAN_TO_SUBSTR);
-    masm.subl(rdx, 8);
-    masm.addptr(rsi, 16);
-    masm.pcmpestri(tmp1Reg, Address(rsi, 0), 0x0d);
-    masm.jcc(Assembler::above, SCAN_TO_SUBSTR);     // CF == 0 && ZF == 0
-    masm.jccb(Assembler::aboveEqual, RET_NOT_FOUND); // CF == 0
-
-    // Fallthru: found a potential substr
-
-    // Make sure string is still long enough
-    masm.subl(rdx, rcx);
-    masm.cmpl(rdx, rax);
-    masm.jccb(Assembler::negative, RET_NOT_FOUND);
-    // Compute start addr of substr
-    masm.lea(rsi, Address(rsi, rcx, Address::times_2));
-    masm.movptr(rbx, rsi);
-
-    // Compare potential substr
-    masm.addl(rdx, 8);        // prime the loop
-    masm.addl(rax, 8);
-    masm.subptr(rsi, 16);
-    masm.subptr(rdi, 16);
-
-    // Scan 16-byte vectors of string and substr
-    masm.bind(SCAN_SUBSTR);
-    masm.subl(rax, 8);
-    masm.subl(rdx, 8);
-    masm.addptr(rsi, 16);
-    masm.addptr(rdi, 16);
-    masm.movdqu(tmp1Reg, Address(rdi, 0));
-    masm.pcmpestri(tmp1Reg, Address(rsi, 0), 0x0d);
-    masm.jcc(Assembler::noOverflow, LOAD_SUBSTR);   // OF == 0
-    masm.jcc(Assembler::positive, SCAN_SUBSTR);     // SF == 0
-
-    // Compute substr offset
-    masm.movptr(rsi, Address(rsp, 8));
-    masm.subptr(rbx, rsi);
-    masm.shrl(rbx, 1);
-    masm.jmpb(CLEANUP);
-
-    masm.bind(RET_NEG_ONE);
-    masm.movl(rbx, -1);
-    masm.jmpb(DONE);
-
-    masm.bind(RET_NOT_FOUND);
-    masm.movl(rbx, -1);
-
-    masm.bind(CLEANUP);
-    masm.addptr(rsp, 12);
-
-    masm.bind(DONE);
-  %}
-
-  enc_class enc_Array_Equals(eDIRegP ary1, eSIRegP ary2, regXD tmp1, regXD tmp2,
-                             eBXRegI tmp3, eDXRegI tmp4, eAXRegI result) %{
-    Label TRUE_LABEL, FALSE_LABEL, DONE, COMPARE_VECTORS, COMPARE_CHAR;
-    MacroAssembler masm(&cbuf);
-
-    XMMRegister tmp1Reg   = as_XMMRegister($tmp1$$reg);
-    XMMRegister tmp2Reg   = as_XMMRegister($tmp2$$reg);
-    Register ary1Reg      = as_Register($ary1$$reg);
-    Register ary2Reg      = as_Register($ary2$$reg);
-    Register tmp3Reg      = as_Register($tmp3$$reg);
-    Register tmp4Reg      = as_Register($tmp4$$reg);
-    Register resultReg    = as_Register($result$$reg);
-
-    int length_offset  = arrayOopDesc::length_offset_in_bytes();
-    int base_offset    = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-    // Check the input args
-    masm.cmpptr(ary1Reg, ary2Reg);
-    masm.jcc(Assembler::equal, TRUE_LABEL);
-    masm.testptr(ary1Reg, ary1Reg);
-    masm.jcc(Assembler::zero, FALSE_LABEL);
-    masm.testptr(ary2Reg, ary2Reg);
-    masm.jcc(Assembler::zero, FALSE_LABEL);
-
-    // Check the lengths
-    masm.movl(tmp4Reg, Address(ary1Reg, length_offset));
-    masm.movl(resultReg, Address(ary2Reg, length_offset));
-    masm.cmpl(tmp4Reg, resultReg);
-    masm.jcc(Assembler::notEqual, FALSE_LABEL);
-    masm.testl(resultReg, resultReg);
-    masm.jcc(Assembler::zero, TRUE_LABEL);
-
-    // Load array addrs
-    masm.lea(ary1Reg, Address(ary1Reg, base_offset));
-    masm.lea(ary2Reg, Address(ary2Reg, base_offset));
-
-    // Set byte count
-    masm.shll(tmp4Reg, 1);
-    masm.movl(resultReg, tmp4Reg);
-
-    if (UseSSE42Intrinsics) {
-      // With SSE4.2, use double quad vector compare
-      Label COMPARE_WIDE_VECTORS, COMPARE_TAIL;
-      // Compare 16-byte vectors
-      masm.andl(tmp4Reg, 0xfffffff0);    // vector count (in bytes)
-      masm.andl(resultReg, 0x0000000e);  // tail count (in bytes)
-      masm.testl(tmp4Reg, tmp4Reg);
-      masm.jccb(Assembler::zero, COMPARE_TAIL);
-      masm.lea(ary1Reg, Address(ary1Reg, tmp4Reg, Address::times_1));
-      masm.lea(ary2Reg, Address(ary2Reg, tmp4Reg, Address::times_1));
-      masm.negl(tmp4Reg);
-
-      masm.bind(COMPARE_WIDE_VECTORS);
-      masm.movdqu(tmp1Reg, Address(ary1Reg, tmp4Reg, Address::times_1));
-      masm.movdqu(tmp2Reg, Address(ary2Reg, tmp4Reg, Address::times_1));
-      masm.pxor(tmp1Reg, tmp2Reg);
-      masm.ptest(tmp1Reg, tmp1Reg);
-
-      masm.jccb(Assembler::notZero, FALSE_LABEL);
-      masm.addl(tmp4Reg, 16);
-      masm.jcc(Assembler::notZero, COMPARE_WIDE_VECTORS);
-      masm.bind(COMPARE_TAIL);
-      masm.movl(tmp4Reg, resultReg);
-      // Fallthru to tail compare
-    }
-
-    // Compare 4-byte vectors
-    masm.andl(tmp4Reg, 0xfffffffc);    // vector count (in bytes)
-    masm.andl(resultReg, 0x00000002);  // tail char (in bytes)
-    masm.testl(tmp4Reg, tmp4Reg);
-    masm.jccb(Assembler::zero, COMPARE_CHAR);
-    masm.lea(ary1Reg, Address(ary1Reg, tmp4Reg, Address::times_1));
-    masm.lea(ary2Reg, Address(ary2Reg, tmp4Reg, Address::times_1));
-    masm.negl(tmp4Reg);
-
-    masm.bind(COMPARE_VECTORS);
-    masm.movl(tmp3Reg, Address(ary1Reg, tmp4Reg, Address::times_1));
-    masm.cmpl(tmp3Reg, Address(ary2Reg, tmp4Reg, Address::times_1));
-    masm.jccb(Assembler::notEqual, FALSE_LABEL);
-    masm.addl(tmp4Reg, 4);
-    masm.jcc(Assembler::notZero, COMPARE_VECTORS);
-
-    // Compare trailing char (final 2 bytes), if any
-    masm.bind(COMPARE_CHAR);
-    masm.testl(resultReg, resultReg);
-    masm.jccb(Assembler::zero, TRUE_LABEL);
-    masm.load_unsigned_short(tmp3Reg, Address(ary1Reg, 0));
-    masm.load_unsigned_short(tmp4Reg, Address(ary2Reg, 0));
-    masm.cmpl(tmp3Reg, tmp4Reg);
-    masm.jccb(Assembler::notEqual, FALSE_LABEL);
-
-    masm.bind(TRUE_LABEL);
-    masm.movl(resultReg, 1);   // return true
-    masm.jmpb(DONE);
-
-    masm.bind(FALSE_LABEL);
-    masm.xorl(resultReg, resultReg); // return false
-
-    // That's it
-    masm.bind(DONE);
-  %}
 
   enc_class enc_pop_rdx() %{
     emit_opcode(cbuf,0x5A);
@@ -9008,6 +8621,63 @@
   ins_pipe( pipe_slow );
 %}
 
+// Multiply Register Long where the left operand's high 32 bits are zero
+instruct mulL_eReg_lhi0(eADXRegL dst, eRegL src, eRegI tmp, eFlagsReg cr) %{
+  predicate(is_operand_hi32_zero(n->in(1)));
+  match(Set dst (MulL dst src));
+  effect(KILL cr, TEMP tmp);
+  ins_cost(2*100+2*400);
+// Basic idea: lo(result) = lo(x_lo * y_lo)
+//             hi(result) = hi(x_lo * y_lo) + lo(x_lo * y_hi) where lo(x_hi * y_lo) = 0 because x_hi = 0
+  format %{ "MOV    $tmp,$src.hi\n\t"
+            "IMUL   $tmp,EAX\n\t"
+            "MUL    EDX:EAX,$src.lo\n\t"
+            "ADD    EDX,$tmp" %}
+  ins_encode %{
+    __ movl($tmp$$Register, HIGH_FROM_LOW($src$$Register));
+    __ imull($tmp$$Register, rax);
+    __ mull($src$$Register);
+    __ addl(rdx, $tmp$$Register);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+// Multiply Register Long where the right operand's high 32 bits are zero
+instruct mulL_eReg_rhi0(eADXRegL dst, eRegL src, eRegI tmp, eFlagsReg cr) %{
+  predicate(is_operand_hi32_zero(n->in(2)));
+  match(Set dst (MulL dst src));
+  effect(KILL cr, TEMP tmp);
+  ins_cost(2*100+2*400);
+// Basic idea: lo(result) = lo(x_lo * y_lo)
+//             hi(result) = hi(x_lo * y_lo) + lo(x_hi * y_lo) where lo(x_lo * y_hi) = 0 because y_hi = 0
+  format %{ "MOV    $tmp,$src.lo\n\t"
+            "IMUL   $tmp,EDX\n\t"
+            "MUL    EDX:EAX,$src.lo\n\t"
+            "ADD    EDX,$tmp" %}
+  ins_encode %{
+    __ movl($tmp$$Register, $src$$Register);
+    __ imull($tmp$$Register, rdx);
+    __ mull($src$$Register);
+    __ addl(rdx, $tmp$$Register);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+// Multiply Register Long where the left and the right operands' high 32 bits are zero
+instruct mulL_eReg_hi0(eADXRegL dst, eRegL src, eFlagsReg cr) %{
+  predicate(is_operand_hi32_zero(n->in(1)) && is_operand_hi32_zero(n->in(2)));
+  match(Set dst (MulL dst src));
+  effect(KILL cr);
+  ins_cost(1*400);
+// Basic idea: lo(result) = lo(x_lo * y_lo)
+//             hi(result) = hi(x_lo * y_lo) where lo(x_hi * y_lo) = 0 and lo(x_lo * y_hi) = 0 because x_hi = 0 and y_hi = 0
+  format %{ "MUL    EDX:EAX,$src.lo\n\t" %}
+  ins_encode %{
+    __ mull($src$$Register);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
 // Multiply Register Long by small constant
 instruct mulL_eReg_con(eADXRegL dst, immL_127 src, eRegI tmp, eFlagsReg cr) %{
   match(Set dst (MulL dst src));
@@ -12718,48 +12388,64 @@
   ins_pipe( pipe_slow );
 %}
 
-instruct string_compare(eDIRegP str1, eSIRegP str2, regXD tmp1, regXD tmp2,
-                        eAXRegI tmp3, eBXRegI tmp4, eCXRegI result, eFlagsReg cr) %{
-  match(Set result (StrComp str1 str2));
-  effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, KILL tmp3, KILL tmp4, KILL cr);
-  //ins_cost(300);
-
-  format %{ "String Compare $str1,$str2 -> $result    // KILL EAX, EBX" %}
-  ins_encode( enc_String_Compare(str1, str2, tmp1, tmp2, tmp3, tmp4, result) );
+instruct string_compare(eDIRegP str1, eCXRegI cnt1, eSIRegP str2, eBXRegI cnt2,
+                        eAXRegI result, regXD tmp1, regXD tmp2, eFlagsReg cr) %{
+  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
+
+  format %{ "String Compare $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1, $tmp2" %}
+  ins_encode %{
+    __ string_compare($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                      $tmp1$$XMMRegister, $tmp2$$XMMRegister);
+  %}
   ins_pipe( pipe_slow );
 %}
 
 // fast string equals
-instruct string_equals(eDIRegP str1, eSIRegP str2, regXD tmp1, regXD tmp2,
-                       eBXRegI tmp3, eCXRegI tmp4, eAXRegI result, eFlagsReg cr) %{
-  match(Set result (StrEquals str1 str2));
-  effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, KILL tmp3, KILL tmp4, KILL cr);
-
-  format %{ "String Equals $str1,$str2 -> $result    // KILL EBX, ECX" %}
-  ins_encode( enc_String_Equals(tmp1, tmp2, str1, str2, tmp3, tmp4, result) );
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_indexof(eSIRegP str1, eDIRegP str2, regXD tmp1, eAXRegI tmp2,
-                        eCXRegI tmp3, eDXRegI tmp4, eBXRegI result, eFlagsReg cr) %{
+instruct string_equals(eDIRegP str1, eSIRegP str2, eCXRegI cnt, eAXRegI result,
+                       regXD tmp1, regXD tmp2, eBXRegI tmp3, eFlagsReg cr) %{
+  match(Set result (StrEquals (Binary str1 str2) cnt));
+  effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL tmp3, KILL cr);
+
+  format %{ "String Equals $str1,$str2,$cnt -> $result    // KILL $tmp1, $tmp2, $tmp3" %}
+  ins_encode %{
+    __ char_arrays_equals(false, $str1$$Register, $str2$$Register,
+                          $cnt$$Register, $result$$Register, $tmp3$$Register,
+                          $tmp1$$XMMRegister, $tmp2$$XMMRegister);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct string_indexof(eDIRegP str1, eDXRegI cnt1, eSIRegP str2, eAXRegI cnt2,
+                        eBXRegI result, regXD tmp1, eCXRegI tmp2, eFlagsReg cr) %{
   predicate(UseSSE42Intrinsics);
-  match(Set result (StrIndexOf str1 str2));
-  effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, KILL tmp2, KILL tmp3, KILL tmp4, KILL cr);
-
-  format %{ "String IndexOf $str1,$str2 -> $result    // KILL EAX, ECX, EDX" %}
-  ins_encode( enc_String_IndexOf(str1, str2, tmp1, tmp2, tmp3, tmp4, result) );
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL tmp2, KILL cr);
+
+  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp2, $tmp1" %}
+  ins_encode %{
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                      $tmp1$$XMMRegister, $tmp2$$Register);
+  %}
   ins_pipe( pipe_slow );
 %}
 
 // fast array equals
-instruct array_equals(eDIRegP ary1, eSIRegP ary2, regXD tmp1, regXD tmp2, eBXRegI tmp3,
-                      eDXRegI tmp4, eAXRegI result, eFlagsReg cr) %{
+instruct array_equals(eDIRegP ary1, eSIRegP ary2, eAXRegI result,
+                      regXD tmp1, regXD tmp2, eCXRegI tmp3, eBXRegI tmp4, eFlagsReg cr)
+%{
   match(Set result (AryEq ary1 ary2));
   effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL ary2, KILL tmp3, KILL tmp4, KILL cr);
   //ins_cost(300);
 
-  format %{ "Array Equals $ary1,$ary2 -> $result    // KILL EBX, EDX" %}
-  ins_encode( enc_Array_Equals(ary1, ary2, tmp1, tmp2, tmp3, tmp4, result) );
+  format %{ "Array Equals $ary1,$ary2 -> $result   // KILL $tmp1, $tmp2, $tmp3, $tmp4" %}
+  ins_encode %{
+    __ char_arrays_equals(true, $ary1$$Register, $ary2$$Register,
+                          $tmp3$$Register, $result$$Register, $tmp4$$Register,
+                          $tmp1$$XMMRegister, $tmp2$$XMMRegister);
+  %}
   ins_pipe( pipe_slow );
 %}
 
@@ -13842,6 +13528,7 @@
 //       compute_padding() functions will have to be adjusted.
 instruct CallStaticJavaDirect(method meth) %{
   match(CallStaticJava);
+  predicate(! ((CallStaticJavaNode*)n)->is_method_handle_invoke());
   effect(USE meth);
 
   ins_cost(300);
@@ -13856,6 +13543,30 @@
   ins_alignment(4);
 %}
 
+// Call Java Static Instruction (method handle version)
+// Note: If this code changes, the corresponding ret_addr_offset() and
+//       compute_padding() functions will have to be adjusted.
+instruct CallStaticJavaHandle(method meth, eBPRegP ebp) %{
+  match(CallStaticJava);
+  predicate(((CallStaticJavaNode*)n)->is_method_handle_invoke());
+  effect(USE meth);
+  // EBP is saved by all callees (for interpreter stack correction).
+  // We use it here for a similar purpose, in {preserve,restore}_SP.
+
+  ins_cost(300);
+  format %{ "CALL,static/MethodHandle " %}
+  opcode(0xE8); /* E8 cd */
+  ins_encode( pre_call_FPU,
+              preserve_SP,
+              Java_Static_Call( meth ),
+              restore_SP,
+              call_epilog,
+              post_call_FPU );
+  ins_pipe( pipe_slow );
+  ins_pc_relative(1);
+  ins_alignment(4);
+%}
+
 // Call Java Dynamic Instruction
 // Note: If this code changes, the corresponding ret_addr_offset() and
 //       compute_padding() functions will have to be adjusted.
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/x86/vm/x86_64.ad
--- a/src/cpu/x86/vm/x86_64.ad	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/cpu/x86/vm/x86_64.ad	Thu Mar 25 16:54:59 2010 -0700
@@ -551,12 +551,19 @@
 
 #define __ _masm.
 
+static int preserve_SP_size() {
+  return LP64_ONLY(1 +) 2;  // [rex,] op, rm(reg/reg)
+}
+
 // !!!!! Special hack to get all types of calls to specify the byte offset
 //       from the start of the call to the point where the return address
 //       will point.
 int MachCallStaticJavaNode::ret_addr_offset()
 {
-  return 5; // 5 bytes from start of call to where return address points
+  int offset = 5; // 5 bytes from start of call to where return address points
+  if (_method_handle_invoke)
+    offset += preserve_SP_size();
+  return offset;
 }
 
 int MachCallDynamicJavaNode::ret_addr_offset()
@@ -589,6 +596,15 @@
 
 // The address of the call instruction needs to be 4-byte aligned to
 // ensure that it does not span a cache line so that it can be patched.
+int CallStaticJavaHandleNode::compute_padding(int current_offset) const
+{
+  current_offset += preserve_SP_size();   // skip mov rbp, rsp
+  current_offset += 1; // skip call opcode byte
+  return round_to(current_offset, alignment_required()) - current_offset;
+}
+
+// The address of the call instruction needs to be 4-byte aligned to
+// ensure that it does not span a cache line so that it can be patched.
 int CallDynamicJavaDirectNode::compute_padding(int current_offset) const
 {
   current_offset += 11; // skip movq instruction + call opcode byte
@@ -683,7 +699,7 @@
 #ifdef ASSERT
   if (rspec.reloc()->type() == relocInfo::oop_type &&
       d32 != 0 && d32 != (intptr_t) Universe::non_oop_word()) {
-    assert(oop((intptr_t)d32)->is_oop() && oop((intptr_t)d32)->is_perm(), "cannot embed non-perm oops in code");
+    assert(oop((intptr_t)d32)->is_oop() && (ScavengeRootsInCode || !oop((intptr_t)d32)->is_scavengable()), "cannot embed scavengable oops in code");
   }
 #endif
   cbuf.relocate(cbuf.inst_mark(), rspec, format);
@@ -721,8 +737,8 @@
 #ifdef ASSERT
   if (rspec.reloc()->type() == relocInfo::oop_type &&
       d64 != 0 && d64 != (int64_t) Universe::non_oop_word()) {
-    assert(oop(d64)->is_oop() && oop(d64)->is_perm(),
-           "cannot embed non-perm oops in code");
+    assert(oop(d64)->is_oop() && (ScavengeRootsInCode || !oop(d64)->is_scavengable()),
+           "cannot embed scavengable oops in code");
   }
 #endif
   cbuf.relocate(cbuf.inst_mark(), rspec, format);
@@ -2058,8 +2074,10 @@
 // implement the UseStrictFP mode.
 const bool Matcher::strict_fp_requires_explicit_rounding = true;
 
-// Do floats take an entire double register or just half?
-const bool Matcher::float_in_double = true;
+// Are floats conerted to double when stored to stack during deoptimization?
+// On x64 it is stored without convertion so we can use normal access.
+bool Matcher::float_in_double() { return false; }
+
 // Do ints take an entire long register or just half?
 const bool Matcher::int_in_long = true;
 
@@ -2113,6 +2131,10 @@
   return LONG_RDX_REG_mask;
 }
 
+const RegMask Matcher::method_handle_invoke_SP_save_mask() {
+  return PTR_RBP_REG_mask;
+}
+
 static Address build_address(int b, int i, int s, int d) {
   Register index = as_Register(i);
   Address::ScaleFactor scale = (Address::ScaleFactor)s;
@@ -2608,6 +2630,21 @@
                    RELOC_DISP32);
   %}
 
+  enc_class preserve_SP %{
+    debug_only(int off0 = cbuf.code_size());
+    MacroAssembler _masm(&cbuf);
+    // RBP is preserved across all calls, even compiled calls.
+    // Use it to preserve RSP in places where the callee might change the SP.
+    __ movptr(rbp, rsp);
+    debug_only(int off1 = cbuf.code_size());
+    assert(off1 - off0 == preserve_SP_size(), "correct size prediction");
+  %}
+
+  enc_class restore_SP %{
+    MacroAssembler _masm(&cbuf);
+    __ movptr(rsp, rbp);
+  %}
+
   enc_class Java_Static_Call(method meth)
   %{
     // JAVA STATIC CALL
@@ -3701,448 +3738,6 @@
     }
   %}
 
-  enc_class enc_String_Compare(rdi_RegP str1, rsi_RegP str2, regD tmp1, regD tmp2,
-                        rax_RegI tmp3, rbx_RegI tmp4, rcx_RegI result) %{
-    Label RCX_GOOD_LABEL, LENGTH_DIFF_LABEL,
-          POP_LABEL, DONE_LABEL, CONT_LABEL,
-          WHILE_HEAD_LABEL;
-    MacroAssembler masm(&cbuf);
-
-    XMMRegister tmp1Reg   = as_XMMRegister($tmp1$$reg);
-    XMMRegister tmp2Reg   = as_XMMRegister($tmp2$$reg);
-
-    // Get the first character position in both strings
-    //         [8] char array, [12] offset, [16] count
-    int value_offset  = java_lang_String::value_offset_in_bytes();
-    int offset_offset = java_lang_String::offset_offset_in_bytes();
-    int count_offset  = java_lang_String::count_offset_in_bytes();
-    int base_offset   = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-    masm.load_heap_oop(rax, Address(rsi, value_offset));
-    masm.movl(rcx, Address(rsi, offset_offset));
-    masm.lea(rax, Address(rax, rcx, Address::times_2, base_offset));
-    masm.load_heap_oop(rbx, Address(rdi, value_offset));
-    masm.movl(rcx, Address(rdi, offset_offset));
-    masm.lea(rbx, Address(rbx, rcx, Address::times_2, base_offset));
-
-    // Compute the minimum of the string lengths(rsi) and the
-    // difference of the string lengths (stack)
-
-    // do the conditional move stuff
-    masm.movl(rdi, Address(rdi, count_offset));
-    masm.movl(rsi, Address(rsi, count_offset));
-    masm.movl(rcx, rdi);
-    masm.subl(rdi, rsi);
-    masm.push(rdi);
-    masm.cmov(Assembler::lessEqual, rsi, rcx);
-
-    // Is the minimum length zero?
-    masm.bind(RCX_GOOD_LABEL);
-    masm.testl(rsi, rsi);
-    masm.jcc(Assembler::zero, LENGTH_DIFF_LABEL);
-
-    // Load first characters
-    masm.load_unsigned_short(rcx, Address(rbx, 0));
-    masm.load_unsigned_short(rdi, Address(rax, 0));
-
-    // Compare first characters
-    masm.subl(rcx, rdi);
-    masm.jcc(Assembler::notZero,  POP_LABEL);
-    masm.decrementl(rsi);
-    masm.jcc(Assembler::zero, LENGTH_DIFF_LABEL);
-
-    {
-      // Check after comparing first character to see if strings are equivalent
-      Label LSkip2;
-      // Check if the strings start at same location
-      masm.cmpptr(rbx, rax);
-      masm.jccb(Assembler::notEqual, LSkip2);
-
-      // Check if the length difference is zero (from stack)
-      masm.cmpl(Address(rsp, 0), 0x0);
-      masm.jcc(Assembler::equal,  LENGTH_DIFF_LABEL);
-
-      // Strings might not be equivalent
-      masm.bind(LSkip2);
-    }
-
-    // Advance to next character
-    masm.addptr(rax, 2);
-    masm.addptr(rbx, 2);
-
-    if (UseSSE42Intrinsics) {
-      // With SSE4.2, use double quad vector compare
-      Label COMPARE_VECTORS, VECTOR_NOT_EQUAL, COMPARE_TAIL;
-      // Setup to compare 16-byte vectors
-      masm.movl(rdi, rsi);
-      masm.andl(rsi, 0xfffffff8); // rsi holds the vector count
-      masm.andl(rdi, 0x00000007); // rdi holds the tail count
-      masm.testl(rsi, rsi);
-      masm.jccb(Assembler::zero, COMPARE_TAIL);
-
-      masm.lea(rax, Address(rax, rsi, Address::times_2));
-      masm.lea(rbx, Address(rbx, rsi, Address::times_2));
-      masm.negptr(rsi);
-
-      masm.bind(COMPARE_VECTORS);
-      masm.movdqu(tmp1Reg, Address(rax, rsi, Address::times_2));
-      masm.movdqu(tmp2Reg, Address(rbx, rsi, Address::times_2));
-      masm.pxor(tmp1Reg, tmp2Reg);
-      masm.ptest(tmp1Reg, tmp1Reg);
-      masm.jccb(Assembler::notZero, VECTOR_NOT_EQUAL);
-      masm.addptr(rsi, 8);
-      masm.jcc(Assembler::notZero, COMPARE_VECTORS);
-      masm.jmpb(COMPARE_TAIL);
-
-      // Mismatched characters in the vectors
-      masm.bind(VECTOR_NOT_EQUAL);
-      masm.lea(rax, Address(rax, rsi, Address::times_2));
-      masm.lea(rbx, Address(rbx, rsi, Address::times_2));
-      masm.movl(rdi, 8);
-
-      // Compare tail (< 8 chars), or rescan last vectors to
-      // find 1st mismatched characters
-      masm.bind(COMPARE_TAIL);
-      masm.testl(rdi, rdi);
-      masm.jccb(Assembler::zero, LENGTH_DIFF_LABEL);
-      masm.movl(rsi, rdi);
-      // Fallthru to tail compare
-    }
-
-    // Shift RAX and RBX to the end of the arrays, negate min
-    masm.lea(rax, Address(rax, rsi, Address::times_2, 0));
-    masm.lea(rbx, Address(rbx, rsi, Address::times_2, 0));
-    masm.negptr(rsi);
-
-    // Compare the rest of the characters
-    masm.bind(WHILE_HEAD_LABEL);
-    masm.load_unsigned_short(rcx, Address(rbx, rsi, Address::times_2, 0));
-    masm.load_unsigned_short(rdi, Address(rax, rsi, Address::times_2, 0));
-    masm.subl(rcx, rdi);
-    masm.jccb(Assembler::notZero, POP_LABEL);
-    masm.increment(rsi);
-    masm.jcc(Assembler::notZero, WHILE_HEAD_LABEL);
-
-    // Strings are equal up to min length.  Return the length difference.
-    masm.bind(LENGTH_DIFF_LABEL);
-    masm.pop(rcx);
-    masm.jmpb(DONE_LABEL);
-
-    // Discard the stored length difference
-    masm.bind(POP_LABEL);
-    masm.addptr(rsp, 8);
-
-    // That's it
-    masm.bind(DONE_LABEL);
-  %}
-
- enc_class enc_String_IndexOf(rsi_RegP str1, rdi_RegP str2, regD tmp1, rax_RegI tmp2,
-                        rcx_RegI tmp3, rdx_RegI tmp4, rbx_RegI result) %{
-    // SSE4.2 version
-    Label LOAD_SUBSTR, PREP_FOR_SCAN, SCAN_TO_SUBSTR,
-          SCAN_SUBSTR, RET_NEG_ONE, RET_NOT_FOUND, CLEANUP, DONE;
-    MacroAssembler masm(&cbuf);
-
-    XMMRegister tmp1Reg   = as_XMMRegister($tmp1$$reg);
-
-    // Get the first character position in both strings
-    //         [8] char array, [12] offset, [16] count
-    int value_offset  = java_lang_String::value_offset_in_bytes();
-    int offset_offset = java_lang_String::offset_offset_in_bytes();
-    int count_offset  = java_lang_String::count_offset_in_bytes();
-    int base_offset   = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-    // Get counts for string and substr
-    masm.movl(rdx, Address(rsi, count_offset));
-    masm.movl(rax, Address(rdi, count_offset));
-    // Check for substr count > string count
-    masm.cmpl(rax, rdx);
-    masm.jcc(Assembler::greater, RET_NEG_ONE);
-
-    // Start the indexOf operation
-    // Get start addr of string
-    masm.load_heap_oop(rbx, Address(rsi, value_offset));
-    masm.movl(rcx, Address(rsi, offset_offset));
-    masm.lea(rsi, Address(rbx, rcx, Address::times_2, base_offset));
-    masm.push(rsi);
-
-    // Get start addr of substr
-    masm.load_heap_oop(rbx, Address(rdi, value_offset));
-    masm.movl(rcx, Address(rdi, offset_offset));
-    masm.lea(rdi, Address(rbx, rcx, Address::times_2, base_offset));
-    masm.push(rdi);
-    masm.push(rax);
-    masm.jmpb(PREP_FOR_SCAN);
-
-    // Substr count saved at sp
-    // Substr saved at sp+8
-    // String saved at sp+16
-
-    // Prep to load substr for scan
-    masm.bind(LOAD_SUBSTR);
-    masm.movptr(rdi, Address(rsp, 8));
-    masm.movl(rax, Address(rsp, 0));
-
-    // Load substr
-    masm.bind(PREP_FOR_SCAN);
-    masm.movdqu(tmp1Reg, Address(rdi, 0));
-    masm.addq(rdx, 8);    // prime the loop
-    masm.subptr(rsi, 16);
-
-    // Scan string for substr in 16-byte vectors
-    masm.bind(SCAN_TO_SUBSTR);
-    masm.subq(rdx, 8);
-    masm.addptr(rsi, 16);
-    masm.pcmpestri(tmp1Reg, Address(rsi, 0), 0x0d);
-    masm.jcc(Assembler::above, SCAN_TO_SUBSTR);
-    masm.jccb(Assembler::aboveEqual, RET_NOT_FOUND);
-
-    // Fallthru: found a potential substr
-
-    //Make sure string is still long enough
-    masm.subl(rdx, rcx);
-    masm.cmpl(rdx, rax);
-    masm.jccb(Assembler::negative, RET_NOT_FOUND);
-    // Compute start addr of substr
-    masm.lea(rsi, Address(rsi, rcx, Address::times_2));
-    masm.movptr(rbx, rsi);
-
-    // Compare potential substr
-    masm.addq(rdx, 8);        // prime the loop
-    masm.addq(rax, 8);
-    masm.subptr(rsi, 16);
-    masm.subptr(rdi, 16);
-
-    // Scan 16-byte vectors of string and substr
-    masm.bind(SCAN_SUBSTR);
-    masm.subq(rax, 8);
-    masm.subq(rdx, 8);
-    masm.addptr(rsi, 16);
-    masm.addptr(rdi, 16);
-    masm.movdqu(tmp1Reg, Address(rdi, 0));
-    masm.pcmpestri(tmp1Reg, Address(rsi, 0), 0x0d);
-    masm.jcc(Assembler::noOverflow, LOAD_SUBSTR);   // OF == 0
-    masm.jcc(Assembler::positive, SCAN_SUBSTR);     // SF == 0
-
-    // Compute substr offset
-    masm.movptr(rsi, Address(rsp, 16));
-    masm.subptr(rbx, rsi);
-    masm.shrl(rbx, 1);
-    masm.jmpb(CLEANUP);
-
-    masm.bind(RET_NEG_ONE);
-    masm.movl(rbx, -1);
-    masm.jmpb(DONE);
-
-    masm.bind(RET_NOT_FOUND);
-    masm.movl(rbx, -1);
-
-    masm.bind(CLEANUP);
-    masm.addptr(rsp, 24);
-
-    masm.bind(DONE);
-  %}
-
-  enc_class enc_String_Equals(rdi_RegP str1, rsi_RegP str2, regD tmp1, regD tmp2,
-                              rbx_RegI tmp3, rcx_RegI tmp2, rax_RegI result) %{
-    Label RET_TRUE, RET_FALSE, DONE, COMPARE_VECTORS, COMPARE_CHAR;
-    MacroAssembler masm(&cbuf);
-
-    XMMRegister tmp1Reg   = as_XMMRegister($tmp1$$reg);
-    XMMRegister tmp2Reg   = as_XMMRegister($tmp2$$reg);
-
-    int value_offset  = java_lang_String::value_offset_in_bytes();
-    int offset_offset = java_lang_String::offset_offset_in_bytes();
-    int count_offset  = java_lang_String::count_offset_in_bytes();
-    int base_offset   = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-    // does source == target string?
-    masm.cmpptr(rdi, rsi);
-    masm.jcc(Assembler::equal, RET_TRUE);
-
-    // get and compare counts
-    masm.movl(rcx, Address(rdi, count_offset));
-    masm.movl(rax, Address(rsi, count_offset));
-    masm.cmpl(rcx, rax);
-    masm.jcc(Assembler::notEqual, RET_FALSE);
-    masm.testl(rax, rax);
-    masm.jcc(Assembler::zero, RET_TRUE);
-
-    // get source string offset and value
-    masm.load_heap_oop(rbx, Address(rsi, value_offset));
-    masm.movl(rax, Address(rsi, offset_offset));
-    masm.lea(rsi, Address(rbx, rax, Address::times_2, base_offset));
-
-    // get compare string offset and value
-    masm.load_heap_oop(rbx, Address(rdi, value_offset));
-    masm.movl(rax, Address(rdi, offset_offset));
-    masm.lea(rdi, Address(rbx, rax, Address::times_2, base_offset));
-
-    // Set byte count
-    masm.shll(rcx, 1);
-    masm.movl(rax, rcx);
-
-    if (UseSSE42Intrinsics) {
-      // With SSE4.2, use double quad vector compare
-      Label COMPARE_WIDE_VECTORS, COMPARE_TAIL;
-      // Compare 16-byte vectors
-      masm.andl(rcx, 0xfffffff0);  // vector count (in bytes)
-      masm.andl(rax, 0x0000000e);  // tail count (in bytes)
-      masm.testl(rcx, rcx);
-      masm.jccb(Assembler::zero, COMPARE_TAIL);
-      masm.lea(rdi, Address(rdi, rcx, Address::times_1));
-      masm.lea(rsi, Address(rsi, rcx, Address::times_1));
-      masm.negptr(rcx);
-
-      masm.bind(COMPARE_WIDE_VECTORS);
-      masm.movdqu(tmp1Reg, Address(rdi, rcx, Address::times_1));
-      masm.movdqu(tmp2Reg, Address(rsi, rcx, Address::times_1));
-      masm.pxor(tmp1Reg, tmp2Reg);
-      masm.ptest(tmp1Reg, tmp1Reg);
-      masm.jccb(Assembler::notZero, RET_FALSE);
-      masm.addptr(rcx, 16);
-      masm.jcc(Assembler::notZero, COMPARE_WIDE_VECTORS);
-      masm.bind(COMPARE_TAIL);
-      masm.movl(rcx, rax);
-      // Fallthru to tail compare
-    }
-
-    // Compare 4-byte vectors
-    masm.andl(rcx, 0xfffffffc);  // vector count (in bytes)
-    masm.andl(rax, 0x00000002);  // tail char (in bytes)
-    masm.testl(rcx, rcx);
-    masm.jccb(Assembler::zero, COMPARE_CHAR);
-    masm.lea(rdi, Address(rdi, rcx, Address::times_1));
-    masm.lea(rsi, Address(rsi, rcx, Address::times_1));
-    masm.negptr(rcx);
-
-    masm.bind(COMPARE_VECTORS);
-    masm.movl(rbx, Address(rdi, rcx, Address::times_1));
-    masm.cmpl(rbx, Address(rsi, rcx, Address::times_1));
-    masm.jccb(Assembler::notEqual, RET_FALSE);
-    masm.addptr(rcx, 4);
-    masm.jcc(Assembler::notZero, COMPARE_VECTORS);
-
-    // Compare trailing char (final 2 bytes), if any
-    masm.bind(COMPARE_CHAR);
-    masm.testl(rax, rax);
-    masm.jccb(Assembler::zero, RET_TRUE);
-    masm.load_unsigned_short(rbx, Address(rdi, 0));
-    masm.load_unsigned_short(rcx, Address(rsi, 0));
-    masm.cmpl(rbx, rcx);
-    masm.jccb(Assembler::notEqual, RET_FALSE);
-
-    masm.bind(RET_TRUE);
-    masm.movl(rax, 1);   // return true
-    masm.jmpb(DONE);
-
-    masm.bind(RET_FALSE);
-    masm.xorl(rax, rax); // return false
-
-    masm.bind(DONE);
-  %}
-
-  enc_class enc_Array_Equals(rdi_RegP ary1, rsi_RegP ary2, regD tmp1, regD tmp2,
-                             rax_RegI tmp3, rbx_RegI tmp4, rcx_RegI result) %{
-    Label TRUE_LABEL, FALSE_LABEL, DONE, COMPARE_VECTORS, COMPARE_CHAR;
-    MacroAssembler masm(&cbuf);
-
-    XMMRegister tmp1Reg   = as_XMMRegister($tmp1$$reg);
-    XMMRegister tmp2Reg   = as_XMMRegister($tmp2$$reg);
-    Register ary1Reg      = as_Register($ary1$$reg);
-    Register ary2Reg      = as_Register($ary2$$reg);
-    Register tmp3Reg      = as_Register($tmp3$$reg);
-    Register tmp4Reg      = as_Register($tmp4$$reg);
-    Register resultReg    = as_Register($result$$reg);
-
-    int length_offset  = arrayOopDesc::length_offset_in_bytes();
-    int base_offset    = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-    // Check the input args
-    masm.cmpq(ary1Reg, ary2Reg);
-    masm.jcc(Assembler::equal, TRUE_LABEL);
-    masm.testq(ary1Reg, ary1Reg);
-    masm.jcc(Assembler::zero, FALSE_LABEL);
-    masm.testq(ary2Reg, ary2Reg);
-    masm.jcc(Assembler::zero, FALSE_LABEL);
-
-    // Check the lengths
-    masm.movl(tmp4Reg, Address(ary1Reg, length_offset));
-    masm.movl(resultReg, Address(ary2Reg, length_offset));
-    masm.cmpl(tmp4Reg, resultReg);
-    masm.jcc(Assembler::notEqual, FALSE_LABEL);
-    masm.testl(resultReg, resultReg);
-    masm.jcc(Assembler::zero, TRUE_LABEL);
-
-    //load array address
-    masm.lea(ary1Reg, Address(ary1Reg, base_offset));
-    masm.lea(ary2Reg, Address(ary2Reg, base_offset));
-
-    //set byte count
-    masm.shll(tmp4Reg, 1);
-    masm.movl(resultReg,tmp4Reg);
-
-    if (UseSSE42Intrinsics){
-      // With SSE4.2, use double quad vector compare
-      Label COMPARE_WIDE_VECTORS, COMPARE_TAIL;
-      // Compare 16-byte vectors
-      masm.andl(tmp4Reg, 0xfffffff0);    // vector count (in bytes)
-      masm.andl(resultReg, 0x0000000e);  // tail count (in bytes)
-      masm.testl(tmp4Reg, tmp4Reg);
-      masm.jccb(Assembler::zero, COMPARE_TAIL);
-      masm.lea(ary1Reg, Address(ary1Reg, tmp4Reg, Address::times_1));
-      masm.lea(ary2Reg, Address(ary2Reg, tmp4Reg, Address::times_1));
-      masm.negptr(tmp4Reg);
-
-      masm.bind(COMPARE_WIDE_VECTORS);
-      masm.movdqu(tmp1Reg, Address(ary1Reg, tmp4Reg, Address::times_1));
-      masm.movdqu(tmp2Reg, Address(ary2Reg, tmp4Reg, Address::times_1));
-      masm.pxor(tmp1Reg, tmp2Reg);
-      masm.ptest(tmp1Reg, tmp1Reg);
-
-      masm.jccb(Assembler::notZero, FALSE_LABEL);
-      masm.addptr(tmp4Reg, 16);
-      masm.jcc(Assembler::notZero, COMPARE_WIDE_VECTORS);
-      masm.bind(COMPARE_TAIL);
-      masm.movl(tmp4Reg, resultReg);
-      // Fallthru to tail compare
-    }
-
-   // Compare 4-byte vectors
-    masm.andl(tmp4Reg, 0xfffffffc);    // vector count (in bytes)
-    masm.andl(resultReg, 0x00000002);  // tail char (in bytes)
-    masm.testl(tmp4Reg, tmp4Reg); //if tmp2 == 0, only compare char
-    masm.jccb(Assembler::zero, COMPARE_CHAR);
-    masm.lea(ary1Reg, Address(ary1Reg, tmp4Reg, Address::times_1));
-    masm.lea(ary2Reg, Address(ary2Reg, tmp4Reg, Address::times_1));
-    masm.negptr(tmp4Reg);
-
-    masm.bind(COMPARE_VECTORS);
-    masm.movl(tmp3Reg, Address(ary1Reg, tmp4Reg, Address::times_1));
-    masm.cmpl(tmp3Reg, Address(ary2Reg, tmp4Reg, Address::times_1));
-    masm.jccb(Assembler::notEqual, FALSE_LABEL);
-    masm.addptr(tmp4Reg, 4);
-    masm.jcc(Assembler::notZero, COMPARE_VECTORS);
-
-    // Compare trailing char (final 2 bytes), if any
-    masm.bind(COMPARE_CHAR);
-    masm.testl(resultReg, resultReg);
-    masm.jccb(Assembler::zero, TRUE_LABEL);
-    masm.load_unsigned_short(tmp3Reg, Address(ary1Reg, 0));
-    masm.load_unsigned_short(tmp4Reg, Address(ary2Reg, 0));
-    masm.cmpl(tmp3Reg, tmp4Reg);
-    masm.jccb(Assembler::notEqual, FALSE_LABEL);
-
-    masm.bind(TRUE_LABEL);
-    masm.movl(resultReg, 1);   // return true
-    masm.jmpb(DONE);
-
-    masm.bind(FALSE_LABEL);
-    masm.xorl(resultReg, resultReg); // return false
-
-    // That's it
-    masm.bind(DONE);
-  %}
 
   enc_class enc_rethrow()
   %{
@@ -12096,52 +11691,67 @@
   ins_pipe(pipe_slow);
 %}
 
-instruct string_compare(rdi_RegP str1, rsi_RegP str2, regD tmp1, regD tmp2,
-                        rax_RegI tmp3, rbx_RegI tmp4, rcx_RegI result, rFlagsReg cr)
-%{
-  match(Set result (StrComp str1 str2));
-  effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, KILL tmp3, KILL tmp4, KILL cr);
-  //ins_cost(300);
-
-  format %{ "String Compare $str1, $str2 -> $result    // XXX KILL RAX, RBX" %}
-  ins_encode( enc_String_Compare(str1, str2, tmp1, tmp2, tmp3, tmp4, result) );
+instruct string_compare(rdi_RegP str1, rcx_RegI cnt1, rsi_RegP str2, rbx_RegI cnt2,
+                        rax_RegI result, regD tmp1, regD tmp2, rFlagsReg cr)
+%{
+  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
+
+  format %{ "String Compare $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1, $tmp2" %}
+  ins_encode %{
+    __ string_compare($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                      $tmp1$$XMMRegister, $tmp2$$XMMRegister);
+  %}
   ins_pipe( pipe_slow );
 %}
 
-instruct string_indexof(rsi_RegP str1, rdi_RegP str2, regD tmp1, rax_RegI tmp2,
-                        rcx_RegI tmp3, rdx_RegI tmp4, rbx_RegI result, rFlagsReg cr)
+instruct string_indexof(rdi_RegP str1, rdx_RegI cnt1, rsi_RegP str2, rax_RegI cnt2,
+                        rbx_RegI result, regD tmp1, rcx_RegI tmp2, rFlagsReg cr)
 %{
   predicate(UseSSE42Intrinsics);
-  match(Set result (StrIndexOf str1 str2));
-  effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, KILL tmp2, KILL tmp3, KILL tmp4, KILL cr);
-
-  format %{ "String IndexOf $str1,$str2 -> $result   // KILL RAX, RCX, RDX" %}
-  ins_encode( enc_String_IndexOf(str1, str2, tmp1, tmp2, tmp3, tmp4, result) );
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL tmp2, KILL cr);
+
+  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1, $tmp2" %}
+  ins_encode %{
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                      $tmp1$$XMMRegister, $tmp2$$Register);
+  %}
   ins_pipe( pipe_slow );
 %}
 
 // fast string equals
-instruct string_equals(rdi_RegP str1, rsi_RegP str2, regD tmp1, regD tmp2, rbx_RegI tmp3,
-                       rcx_RegI tmp4, rax_RegI result, rFlagsReg cr)
-%{
-  match(Set result (StrEquals str1 str2));
-  effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, KILL tmp3, KILL tmp4, KILL cr);
-
-  format %{ "String Equals $str1,$str2 -> $result    // KILL RBX, RCX" %}
-  ins_encode( enc_String_Equals(str1, str2, tmp1, tmp2, tmp3, tmp4, result) );
+instruct string_equals(rdi_RegP str1, rsi_RegP str2, rcx_RegI cnt, rax_RegI result,
+                       regD tmp1, regD tmp2, rbx_RegI tmp3, rFlagsReg cr)
+%{
+  match(Set result (StrEquals (Binary str1 str2) cnt));
+  effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL tmp3, KILL cr);
+
+  format %{ "String Equals $str1,$str2,$cnt -> $result    // KILL $tmp1, $tmp2, $tmp3" %}
+  ins_encode %{
+    __ char_arrays_equals(false, $str1$$Register, $str2$$Register,
+                          $cnt$$Register, $result$$Register, $tmp3$$Register,
+                          $tmp1$$XMMRegister, $tmp2$$XMMRegister);
+  %}
   ins_pipe( pipe_slow );
 %}
 
 // fast array equals
-instruct array_equals(rdi_RegP ary1, rsi_RegP ary2, regD tmp1, regD tmp2, rax_RegI tmp3,
-                      rbx_RegI tmp4, rcx_RegI result, rFlagsReg cr)
+instruct array_equals(rdi_RegP ary1, rsi_RegP ary2, rax_RegI result,
+                      regD tmp1, regD tmp2, rcx_RegI tmp3, rbx_RegI tmp4, rFlagsReg cr)
 %{
   match(Set result (AryEq ary1 ary2));
   effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL ary2, KILL tmp3, KILL tmp4, KILL cr);
   //ins_cost(300);
 
-  format %{ "Array Equals $ary1,$ary2 -> $result   // KILL RAX, RBX" %}
-  ins_encode( enc_Array_Equals(ary1, ary2, tmp1, tmp2, tmp3, tmp4, result) );
+  format %{ "Array Equals $ary1,$ary2 -> $result   // KILL $tmp1, $tmp2, $tmp3, $tmp4" %}
+  ins_encode %{
+    __ char_arrays_equals(true, $ary1$$Register, $ary2$$Register,
+                          $tmp3$$Register, $result$$Register, $tmp4$$Register,
+                          $tmp1$$XMMRegister, $tmp2$$XMMRegister);
+  %}
   ins_pipe( pipe_slow );
 %}
 
@@ -12953,9 +12563,9 @@
 // Call Java Static Instruction
 // Note: If this code changes, the corresponding ret_addr_offset() and
 //       compute_padding() functions will have to be adjusted.
-instruct CallStaticJavaDirect(method meth)
-%{
+instruct CallStaticJavaDirect(method meth) %{
   match(CallStaticJava);
+  predicate(!((CallStaticJavaNode*) n)->is_method_handle_invoke());
   effect(USE meth);
 
   ins_cost(300);
@@ -12967,6 +12577,28 @@
   ins_alignment(4);
 %}
 
+// Call Java Static Instruction (method handle version)
+// Note: If this code changes, the corresponding ret_addr_offset() and
+//       compute_padding() functions will have to be adjusted.
+instruct CallStaticJavaHandle(method meth, rbp_RegP rbp) %{
+  match(CallStaticJava);
+  predicate(((CallStaticJavaNode*) n)->is_method_handle_invoke());
+  effect(USE meth);
+  // RBP is saved by all callees (for interpreter stack correction).
+  // We use it here for a similar purpose, in {preserve,restore}_SP.
+
+  ins_cost(300);
+  format %{ "call,static/MethodHandle " %}
+  opcode(0xE8); /* E8 cd */
+  ins_encode(preserve_SP,
+             Java_Static_Call(meth),
+             restore_SP,
+             call_epilog);
+  ins_pipe(pipe_slow);
+  ins_pc_relative(1);
+  ins_alignment(4);
+%}
+
 // Call Java Dynamic Instruction
 // Note: If this code changes, the corresponding ret_addr_offset() and
 //       compute_padding() functions will have to be adjusted.
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/assembler_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/assembler_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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
+ * 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/_assembler_zero.cpp.incl"
+
+int AbstractAssembler::code_fill_byte() {
+  return 0;
+}
+
+void Assembler::pd_patch_instruction(address branch, address target) {
+  ShouldNotCallThis();
+}
+
+#ifndef PRODUCT
+void Assembler::pd_print_patched_instruction(address branch) {
+  ShouldNotCallThis();
+}
+#endif // PRODUCT
+
+void MacroAssembler::align(int modulus) {
+  while (offset() % modulus != 0)
+    emit_byte(AbstractAssembler::code_fill_byte());
+}
+
+void MacroAssembler::bang_stack_with_offset(int offset) {
+  ShouldNotCallThis();
+}
+
+void MacroAssembler::advance(int bytes) {
+  _code_pos += bytes;
+  sync();
+}
+
+RegisterOrConstant MacroAssembler::delayed_value_impl(
+  intptr_t* delayed_value_addr, Register tmpl, int offset) {
+  ShouldNotCallThis();
+}
+
+void MacroAssembler::store_oop(jobject obj) {
+  code_section()->relocate(pc(), oop_Relocation::spec_for_immediate());
+  emit_address((address) obj);
+}
+
+static void should_not_call() {
+  report_should_not_call(__FILE__, __LINE__);
+}
+
+address ShouldNotCallThisStub() {
+  return (address) should_not_call;
+}
+
+address ShouldNotCallThisEntry() {
+  return (address) should_not_call;
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/assembler_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/assembler_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,64 @@
+/*
+ * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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
+ * 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.
+ *
+ */
+
+// In normal, CPU-specific ports of HotSpot these two classes are used
+// for generating assembly language.  We don't do any of this in zero,
+// of course, but we do sneak entry points around in CodeBuffers so we
+// generate those here.
+
+class Assembler : public AbstractAssembler {
+ public:
+  Assembler(CodeBuffer* code) : AbstractAssembler(code) {}
+
+ public:
+  void pd_patch_instruction(address branch, address target);
+#ifndef PRODUCT
+  static void pd_print_patched_instruction(address branch);
+#endif // PRODUCT
+};
+
+class MacroAssembler : public Assembler {
+ public:
+  MacroAssembler(CodeBuffer* code) : Assembler(code) {}
+
+ public:
+  void align(int modulus);
+  void bang_stack_with_offset(int offset);
+  bool needs_explicit_null_check(intptr_t offset);
+  RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
+                                        Register tmp, int offset);
+ public:
+  void advance(int bytes);
+  void store_oop(jobject obj);
+};
+
+#ifdef ASSERT
+inline bool AbstractAssembler::pd_check_instruction_mark() {
+  ShouldNotCallThis();
+}
+#endif
+
+address ShouldNotCallThisStub();
+address ShouldNotCallThisEntry();
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/assembler_zero.inline.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/assembler_zero.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/bytecodeInterpreter_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_cppInterpreter_zero.cpp.incl"
+
+#ifdef CC_INTERP
+
+const char *BytecodeInterpreter::name_of_field_at_address(address addr) {
+#define DO(member) {if (addr == (address) &(member)) return XSTR(member);}
+  DO(_thread);
+  DO(_bcp);
+  DO(_locals);
+  DO(_constants);
+  DO(_method);
+  DO(_mdx);
+  DO(_stack);
+  DO(_msg);
+  DO(_result);
+  DO(_prev_link);
+  DO(_oop_temp);
+  DO(_stack_base);
+  DO(_stack_limit);
+  DO(_monitor_base);
+  DO(_self_link);
+#undef DO
+  if (addr > (address) &_result && addr < (address) (&_result + 1))
+    return "_result)";
+  return NULL;
+}
+
+#endif // CC_INTERP
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// Platform specific for C++ based Interpreter
+
+#if defined(PPC) || defined(SPARC) || defined(IA64)
+#define LOTS_OF_REGS   // Use plenty of registers
+#else
+#undef LOTS_OF_REGS    // Loser platforms
+#endif
+
+ private:
+  interpreterState _self_link;
+
+ public:
+  inline void set_locals(intptr_t* new_locals) {
+    _locals = new_locals;
+  }
+  inline void set_method(methodOop new_method) {
+    _method = new_method;
+  }
+  inline interpreterState self_link() {
+    return _self_link;
+  }
+  inline void set_self_link(interpreterState new_self_link) {
+    _self_link = new_self_link;
+  }
+  inline interpreterState prev_link() {
+    return _prev_link;
+  }
+  inline void set_prev_link(interpreterState new_prev_link) {
+    _prev_link = new_prev_link;
+  }
+  inline void set_stack_limit(intptr_t* new_stack_limit) {
+    _stack_limit = new_stack_limit;
+  }
+  inline void set_stack_base(intptr_t* new_stack_base) {
+    _stack_base = new_stack_base;
+  }
+  inline void set_monitor_base(BasicObjectLock *new_monitor_base) {
+    _monitor_base = new_monitor_base;
+  }
+  inline void set_thread(JavaThread* new_thread) {
+    _thread = new_thread;
+  }
+  inline void set_constants(constantPoolCacheOop new_constants) {
+    _constants = new_constants;
+  }
+  inline oop oop_temp() {
+    return _oop_temp;
+  }
+  inline oop *oop_temp_addr() {
+    return &_oop_temp;
+  }
+  inline void set_oop_temp(oop new_oop_temp) {
+    _oop_temp = new_oop_temp;
+  }
+  inline address callee_entry_point() {
+    return _result._to_call._callee_entry_point;
+  }
+  inline address osr_buf() {
+    return _result._osr._osr_buf;
+  }
+  inline address osr_entry() {
+    return _result._osr._osr_entry;
+  }
+
+ public:
+  const char *name_of_field_at_address(address addr);
+
+// The frame manager handles this
+#define SET_LAST_JAVA_FRAME()
+#define RESET_LAST_JAVA_FRAME()
+
+// ZeroStack Implementation
+
+#undef STACK_INT
+#undef STACK_FLOAT
+#undef STACK_ADDR
+#undef STACK_OBJECT
+#undef STACK_DOUBLE
+#undef STACK_LONG
+
+#define GET_STACK_SLOT(offset)    (*((intptr_t*) &topOfStack[-(offset)]))
+#define STACK_SLOT(offset)    ((address) &topOfStack[-(offset)])
+#define STACK_ADDR(offset)    (*((address *) &topOfStack[-(offset)]))
+#define STACK_INT(offset)     (*((jint*) &topOfStack[-(offset)]))
+#define STACK_FLOAT(offset)   (*((jfloat *) &topOfStack[-(offset)]))
+#define STACK_OBJECT(offset)  (*((oop *) &topOfStack [-(offset)]))
+#define STACK_DOUBLE(offset)  (((VMJavaVal64*) &topOfStack[-(offset)])->d)
+#define STACK_LONG(offset)    (((VMJavaVal64 *) &topOfStack[-(offset)])->l)
+
+#define SET_STACK_SLOT(value, offset)   (*(intptr_t*)&topOfStack[-(offset)] = *(intptr_t*)(value))
+#define SET_STACK_ADDR(value, offset)   (*((address *)&topOfStack[-(offset)]) = (value))
+#define SET_STACK_INT(value, offset)    (*((jint *)&topOfStack[-(offset)]) = (value))
+#define SET_STACK_FLOAT(value, offset)  (*((jfloat *)&topOfStack[-(offset)]) = (value))
+#define SET_STACK_OBJECT(value, offset) (*((oop *)&topOfStack[-(offset)]) = (value))
+#define SET_STACK_DOUBLE(value, offset) (((VMJavaVal64*)&topOfStack[-(offset)])->d = (value))
+#define SET_STACK_DOUBLE_FROM_ADDR(addr, offset) (((VMJavaVal64*)&topOfStack[-(offset)])->d =  \
+                                                 ((VMJavaVal64*)(addr))->d)
+#define SET_STACK_LONG(value, offset)   (((VMJavaVal64*)&topOfStack[-(offset)])->l = (value))
+#define SET_STACK_LONG_FROM_ADDR(addr, offset)   (((VMJavaVal64*)&topOfStack[-(offset)])->l =  \
+                                                 ((VMJavaVal64*)(addr))->l)
+// JavaLocals implementation
+
+#define LOCALS_SLOT(offset)    ((intptr_t*)&locals[-(offset)])
+#define LOCALS_ADDR(offset)    ((address)locals[-(offset)])
+#define LOCALS_INT(offset)     (*((jint*)&locals[-(offset)]))
+#define LOCALS_FLOAT(offset)   (*((jfloat*)&locals[-(offset)]))
+#define LOCALS_OBJECT(offset)  ((oop)locals[-(offset)])
+#define LOCALS_DOUBLE(offset)  (((VMJavaVal64*)&locals[-((offset) + 1)])->d)
+#define LOCALS_LONG(offset)    (((VMJavaVal64*)&locals[-((offset) + 1)])->l)
+#define LOCALS_LONG_AT(offset) (((address)&locals[-((offset) + 1)]))
+#define LOCALS_DOUBLE_AT(offset) (((address)&locals[-((offset) + 1)]))
+
+#define SET_LOCALS_SLOT(value, offset)    (*(intptr_t*)&locals[-(offset)] = *(intptr_t *)(value))
+#define SET_LOCALS_ADDR(value, offset)    (*((address *)&locals[-(offset)]) = (value))
+#define SET_LOCALS_INT(value, offset)     (*((jint *)&locals[-(offset)]) = (value))
+#define SET_LOCALS_FLOAT(value, offset)   (*((jfloat *)&locals[-(offset)]) = (value))
+#define SET_LOCALS_OBJECT(value, offset)  (*((oop *)&locals[-(offset)]) = (value))
+#define SET_LOCALS_DOUBLE(value, offset)  (((VMJavaVal64*)&locals[-((offset)+1)])->d = (value))
+#define SET_LOCALS_LONG(value, offset)    (((VMJavaVal64*)&locals[-((offset)+1)])->l = (value))
+#define SET_LOCALS_DOUBLE_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->d = \
+                                                  ((VMJavaVal64*)(addr))->d)
+#define SET_LOCALS_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = \
+                                                ((VMJavaVal64*)(addr))->l)
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+// Inline interpreter functions for zero
+
+inline jfloat BytecodeInterpreter::VMfloatAdd(jfloat op1, jfloat op2) {
+  return op1 + op2;
+}
+
+inline jfloat BytecodeInterpreter::VMfloatSub(jfloat op1, jfloat op2) {
+  return op1 - op2;
+}
+
+inline jfloat BytecodeInterpreter::VMfloatMul(jfloat op1, jfloat op2) {
+  return op1 * op2;
+}
+
+inline jfloat BytecodeInterpreter::VMfloatDiv(jfloat op1, jfloat op2) {
+  return op1 / op2;
+}
+
+inline jfloat BytecodeInterpreter::VMfloatRem(jfloat op1, jfloat op2) {
+  return fmod(op1, op2);
+}
+
+inline jfloat BytecodeInterpreter::VMfloatNeg(jfloat op) {
+  return -op;
+}
+
+inline int32_t BytecodeInterpreter::VMfloatCompare(jfloat  op1,
+                                                   jfloat  op2,
+                                                   int32_t direction) {
+  return ( op1 < op2 ? -1 :
+               op1 > op2 ? 1 :
+                   op1 == op2 ? 0 :
+                       (direction == -1 || direction == 1) ? direction : 0);
+
+}
+
+inline void BytecodeInterpreter::VMmemCopy64(uint32_t       to[2],
+                                             const uint32_t from[2]) {
+  *(uint64_t *) to = *(uint64_t *) from;
+}
+
+inline jlong BytecodeInterpreter::VMlongAdd(jlong op1, jlong op2) {
+  return op1 + op2;
+}
+
+inline jlong BytecodeInterpreter::VMlongAnd(jlong op1, jlong op2) {
+  return op1 & op2;
+}
+
+inline jlong BytecodeInterpreter::VMlongDiv(jlong op1, jlong op2) {
+  /* it's possible we could catch this special case implicitly */
+  if (op1 == (jlong) 0x8000000000000000LL && op2 == -1) return op1;
+  else return op1 / op2;
+}
+
+inline jlong BytecodeInterpreter::VMlongMul(jlong op1, jlong op2) {
+  return op1 * op2;
+}
+
+inline jlong BytecodeInterpreter::VMlongOr(jlong op1, jlong op2) {
+  return op1 | op2;
+}
+
+inline jlong BytecodeInterpreter::VMlongSub(jlong op1, jlong op2) {
+  return op1 - op2;
+}
+
+inline jlong BytecodeInterpreter::VMlongXor(jlong op1, jlong op2) {
+  return op1 ^ op2;
+}
+
+inline jlong BytecodeInterpreter::VMlongRem(jlong op1, jlong op2) {
+  /* it's possible we could catch this special case implicitly */
+  if (op1 == (jlong) 0x8000000000000000LL && op2 == -1) return 0;
+  else return op1 % op2;
+}
+
+inline jlong BytecodeInterpreter::VMlongUshr(jlong op1, jint op2) {
+  return ((unsigned long long) op1) >> (op2 & 0x3F);
+}
+
+inline jlong BytecodeInterpreter::VMlongShr(jlong op1, jint op2) {
+  return op1 >> (op2 & 0x3F);
+}
+
+inline jlong BytecodeInterpreter::VMlongShl(jlong op1, jint op2) {
+  return op1 << (op2 & 0x3F);
+}
+
+inline jlong BytecodeInterpreter::VMlongNeg(jlong op) {
+  return -op;
+}
+
+inline jlong BytecodeInterpreter::VMlongNot(jlong op) {
+  return ~op;
+}
+
+inline int32_t BytecodeInterpreter::VMlongLtz(jlong op) {
+  return (op <= 0);
+}
+
+inline int32_t BytecodeInterpreter::VMlongGez(jlong op) {
+  return (op >= 0);
+}
+
+inline int32_t BytecodeInterpreter::VMlongEqz(jlong op) {
+  return (op == 0);
+}
+
+inline int32_t BytecodeInterpreter::VMlongEq(jlong op1, jlong op2) {
+  return (op1 == op2);
+}
+
+inline int32_t BytecodeInterpreter::VMlongNe(jlong op1, jlong op2) {
+  return (op1 != op2);
+}
+
+inline int32_t BytecodeInterpreter::VMlongGe(jlong op1, jlong op2) {
+  return (op1 >= op2);
+}
+
+inline int32_t BytecodeInterpreter::VMlongLe(jlong op1, jlong op2) {
+  return (op1 <= op2);
+}
+
+inline int32_t BytecodeInterpreter::VMlongLt(jlong op1, jlong op2) {
+  return (op1 < op2);
+}
+
+inline int32_t BytecodeInterpreter::VMlongGt(jlong op1, jlong op2) {
+  return (op1 > op2);
+}
+
+inline int32_t BytecodeInterpreter::VMlongCompare(jlong op1, jlong op2) {
+  return (VMlongLt(op1, op2) ? -1 : VMlongGt(op1, op2) ? 1 : 0);
+}
+
+// Long conversions
+
+inline jdouble BytecodeInterpreter::VMlong2Double(jlong val) {
+  return (jdouble) val;
+}
+
+inline jfloat BytecodeInterpreter::VMlong2Float(jlong val) {
+  return (jfloat) val;
+}
+
+inline jint BytecodeInterpreter::VMlong2Int(jlong val) {
+  return (jint) val;
+}
+
+// Double Arithmetic
+
+inline jdouble BytecodeInterpreter::VMdoubleAdd(jdouble op1, jdouble op2) {
+  return op1 + op2;
+}
+
+inline jdouble BytecodeInterpreter::VMdoubleDiv(jdouble op1, jdouble op2) {
+  // Divide by zero... QQQ
+  return op1 / op2;
+}
+
+inline jdouble BytecodeInterpreter::VMdoubleMul(jdouble op1, jdouble op2) {
+  return op1 * op2;
+}
+
+inline jdouble BytecodeInterpreter::VMdoubleNeg(jdouble op) {
+  return -op;
+}
+
+inline jdouble BytecodeInterpreter::VMdoubleRem(jdouble op1, jdouble op2) {
+  return fmod(op1, op2);
+}
+
+inline jdouble BytecodeInterpreter::VMdoubleSub(jdouble op1, jdouble op2) {
+  return op1 - op2;
+}
+
+inline int32_t BytecodeInterpreter::VMdoubleCompare(jdouble op1,
+                                                    jdouble op2,
+                                                    int32_t direction) {
+  return ( op1 < op2 ? -1 :
+               op1 > op2 ? 1 :
+                   op1 == op2 ? 0 :
+                       (direction == -1 || direction == 1) ? direction : 0);
+}
+
+// Double Conversions
+
+inline jfloat BytecodeInterpreter::VMdouble2Float(jdouble val) {
+  return (jfloat) val;
+}
+
+// Float Conversions
+
+inline jdouble BytecodeInterpreter::VMfloat2Double(jfloat op) {
+  return (jdouble) op;
+}
+
+// Integer Arithmetic
+
+inline jint BytecodeInterpreter::VMintAdd(jint op1, jint op2) {
+  return op1 + op2;
+}
+
+inline jint BytecodeInterpreter::VMintAnd(jint op1, jint op2) {
+  return op1 & op2;
+}
+
+inline jint BytecodeInterpreter::VMintDiv(jint op1, jint op2) {
+  /* it's possible we could catch this special case implicitly */
+  if (op1 == (jint) 0x80000000 && op2 == -1) return op1;
+  else return op1 / op2;
+}
+
+inline jint BytecodeInterpreter::VMintMul(jint op1, jint op2) {
+  return op1 * op2;
+}
+
+inline jint BytecodeInterpreter::VMintNeg(jint op) {
+  return -op;
+}
+
+inline jint BytecodeInterpreter::VMintOr(jint op1, jint op2) {
+  return op1 | op2;
+}
+
+inline jint BytecodeInterpreter::VMintRem(jint op1, jint op2) {
+  /* it's possible we could catch this special case implicitly */
+  if (op1 == (jint) 0x80000000 && op2 == -1) return 0;
+  else return op1 % op2;
+}
+
+inline jint BytecodeInterpreter::VMintShl(jint op1, jint op2) {
+  return op1 << (op2 & 0x1F);
+}
+
+inline jint BytecodeInterpreter::VMintShr(jint op1, jint op2) {
+  return op1 >> (op2 & 0x1F);
+}
+
+inline jint BytecodeInterpreter::VMintSub(jint op1, jint op2) {
+  return op1 - op2;
+}
+
+inline jint BytecodeInterpreter::VMintUshr(jint op1, jint op2) {
+  return ((juint) op1) >> (op2 & 0x1F);
+}
+
+inline jint BytecodeInterpreter::VMintXor(jint op1, jint op2) {
+  return op1 ^ op2;
+}
+
+inline jdouble BytecodeInterpreter::VMint2Double(jint val) {
+  return (jdouble) val;
+}
+
+inline jfloat BytecodeInterpreter::VMint2Float(jint val) {
+  return (jfloat) val;
+}
+
+inline jlong BytecodeInterpreter::VMint2Long(jint val) {
+  return (jlong) val;
+}
+
+inline jchar BytecodeInterpreter::VMint2Char(jint val) {
+  return (jchar) val;
+}
+
+inline jshort BytecodeInterpreter::VMint2Short(jint val) {
+  return (jshort) val;
+}
+
+inline jbyte BytecodeInterpreter::VMint2Byte(jint val) {
+  return (jbyte) val;
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/bytecodes_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/bytecodes_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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/_bytecodes_zero.cpp.incl"
+
+void Bytecodes::pd_initialize() {
+  // No zero specific initialization
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/bytecodes_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/bytecodes_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/bytes_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/bytes_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,164 @@
+/*
+ * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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
+ * 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.
+ *
+ */
+
+typedef union unaligned {
+  u4 u;
+  u2 us;
+  u8 ul;
+} __attribute__((packed)) unaligned;
+
+class Bytes: AllStatic {
+ public:
+  // Returns true if the byte ordering used by Java is different
+  // from the native byte ordering of the underlying machine.
+  static inline bool is_Java_byte_ordering_different() {
+#ifdef VM_LITTLE_ENDIAN
+    return true;
+#else
+    return false;
+#endif
+  }
+
+  // Efficient reading and writing of unaligned unsigned data in
+  // platform-specific byte ordering.
+  static inline u2 get_native_u2(address p){
+    unaligned *up = (unaligned *) p;
+    return up->us;
+  }
+
+  static inline u4 get_native_u4(address p) {
+    unaligned *up = (unaligned *) p;
+    return up->u;
+  }
+
+  static inline u8 get_native_u8(address p) {
+    unaligned *up = (unaligned *) p;
+    return up->ul;
+  }
+
+  static inline void put_native_u2(address p, u2 x) {
+    unaligned *up = (unaligned *) p;
+    up->us = x;
+  }
+
+  static inline void put_native_u4(address p, u4 x) {
+    unaligned *up = (unaligned *) p;
+    up->u = x;
+  }
+
+  static inline void put_native_u8(address p, u8 x) {
+    unaligned *up = (unaligned *) p;
+    up->ul = x;
+  }
+
+  // Efficient reading and writing of unaligned unsigned data in Java
+  // byte ordering (i.e. big-endian ordering).
+#ifdef VM_LITTLE_ENDIAN
+  // Byte-order reversal is needed
+  static inline u2 get_Java_u2(address p) {
+    return (u2(p[0]) << 8) |
+           (u2(p[1])     );
+  }
+  static inline u4 get_Java_u4(address p) {
+    return (u4(p[0]) << 24) |
+           (u4(p[1]) << 16) |
+           (u4(p[2]) <<  8) |
+           (u4(p[3])      );
+  }
+  static inline u8 get_Java_u8(address p) {
+    u4 hi, lo;
+    hi = (u4(p[0]) << 24) |
+         (u4(p[1]) << 16) |
+         (u4(p[2]) <<  8) |
+         (u4(p[3])      );
+    lo = (u4(p[4]) << 24) |
+         (u4(p[5]) << 16) |
+         (u4(p[6]) <<  8) |
+         (u4(p[7])      );
+    return u8(lo) | (u8(hi) << 32);
+  }
+
+  static inline void put_Java_u2(address p, u2 x) {
+    p[0] = x >> 8;
+    p[1] = x;
+  }
+  static inline void put_Java_u4(address p, u4 x) {
+    p[0] = x >> 24;
+    p[1] = x >> 16;
+    p[2] = x >> 8;
+    p[3] = x;
+  }
+  static inline void put_Java_u8(address p, u8 x) {
+    u4 hi, lo;
+    lo = x;
+    hi = x >> 32;
+    p[0] = hi >> 24;
+    p[1] = hi >> 16;
+    p[2] = hi >> 8;
+    p[3] = hi;
+    p[4] = lo >> 24;
+    p[5] = lo >> 16;
+    p[6] = lo >> 8;
+    p[7] = lo;
+  }
+
+  // Efficient swapping of byte ordering
+  static inline u2 swap_u2(u2 x);
+  static inline u4 swap_u4(u4 x);
+  static inline u8 swap_u8(u8 x);
+#else
+  // No byte-order reversal is needed
+  static inline u2 get_Java_u2(address p) {
+    return get_native_u2(p);
+  }
+  static inline u4 get_Java_u4(address p) {
+    return get_native_u4(p);
+  }
+  static inline u8 get_Java_u8(address p) {
+    return get_native_u8(p);
+  }
+
+  static inline void put_Java_u2(address p, u2 x) {
+    put_native_u2(p, x);
+  }
+  static inline void put_Java_u4(address p, u4 x) {
+    put_native_u4(p, x);
+  }
+  static inline void put_Java_u8(address p, u8 x) {
+    put_native_u8(p, x);
+  }
+
+  // No byte-order reversal is needed
+  static inline u2 swap_u2(u2 x) { return x; }
+  static inline u4 swap_u4(u4 x) { return x; }
+  static inline u8 swap_u8(u8 x) { return x; }
+#endif // VM_LITTLE_ENDIAN
+};
+
+#ifdef VM_LITTLE_ENDIAN
+// The following header contains the implementations of swap_u2,
+// swap_u4, and swap_u8
+#include "incls/_bytes_pd.inline.hpp.incl"
+#endif // VM_LITTLE_ENDIAN
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/codeBuffer_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/codeBuffer_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+ private:
+  void pd_initialize() {}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/copy_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/copy_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+// Inline functions for memory copy and fill.
+
+static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) {
+  memmove(to, from, count * HeapWordSize);
+}
+
+static void pd_disjoint_words(HeapWord* from, HeapWord* to, size_t count) {
+  switch (count) {
+  case 8:  to[7] = from[7];
+  case 7:  to[6] = from[6];
+  case 6:  to[5] = from[5];
+  case 5:  to[4] = from[4];
+  case 4:  to[3] = from[3];
+  case 3:  to[2] = from[2];
+  case 2:  to[1] = from[1];
+  case 1:  to[0] = from[0];
+  case 0:  break;
+  default:
+    memcpy(to, from, count * HeapWordSize);
+    break;
+  }
+}
+
+static void pd_disjoint_words_atomic(HeapWord* from,
+                                     HeapWord* to,
+                                     size_t count) {
+  switch (count) {
+  case 8:  to[7] = from[7];
+  case 7:  to[6] = from[6];
+  case 6:  to[5] = from[5];
+  case 5:  to[4] = from[4];
+  case 4:  to[3] = from[3];
+  case 3:  to[2] = from[2];
+  case 2:  to[1] = from[1];
+  case 1:  to[0] = from[0];
+  case 0:  break;
+  default:
+    while (count-- > 0) {
+      *to++ = *from++;
+    }
+    break;
+  }
+}
+
+static void pd_aligned_conjoint_words(HeapWord* from,
+                                      HeapWord* to,
+                                      size_t count) {
+  memmove(to, from, count * HeapWordSize);
+}
+
+static void pd_aligned_disjoint_words(HeapWord* from,
+                                      HeapWord* to,
+                                      size_t count) {
+  pd_disjoint_words(from, to, count);
+}
+
+static void pd_conjoint_bytes(void* from, void* to, size_t count) {
+  memmove(to, from, count);
+}
+
+static void pd_conjoint_bytes_atomic(void* from, void* to, size_t count) {
+  memmove(to, from, count);
+}
+
+static void pd_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
+  _Copy_conjoint_jshorts_atomic(from, to, count);
+}
+
+static void pd_conjoint_jints_atomic(jint* from, jint* to, size_t count) {
+  _Copy_conjoint_jints_atomic(from, to, count);
+}
+
+static void pd_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) {
+  _Copy_conjoint_jlongs_atomic(from, to, count);
+}
+
+static void pd_conjoint_oops_atomic(oop* from, oop* to, size_t count) {
+#ifdef _LP64
+  assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size");
+  _Copy_conjoint_jlongs_atomic((jlong*)from, (jlong*)to, count);
+#else
+  assert(BytesPerInt == BytesPerOop, "jints and oops must be the same size");
+  _Copy_conjoint_jints_atomic((jint*)from, (jint*)to, count);
+#endif // _LP64
+}
+
+static void pd_arrayof_conjoint_bytes(HeapWord* from,
+                                      HeapWord* to,
+                                      size_t    count) {
+  _Copy_arrayof_conjoint_bytes(from, to, count);
+}
+
+static void pd_arrayof_conjoint_jshorts(HeapWord* from,
+                                        HeapWord* to,
+                                        size_t    count) {
+  _Copy_arrayof_conjoint_jshorts(from, to, count);
+}
+
+static void pd_arrayof_conjoint_jints(HeapWord* from,
+                                      HeapWord* to,
+                                      size_t    count) {
+  _Copy_arrayof_conjoint_jints(from, to, count);
+}
+
+static void pd_arrayof_conjoint_jlongs(HeapWord* from,
+                                       HeapWord* to,
+                                       size_t    count) {
+  _Copy_arrayof_conjoint_jlongs(from, to, count);
+}
+
+static void pd_arrayof_conjoint_oops(HeapWord* from,
+                                     HeapWord* to,
+                                     size_t    count) {
+#ifdef _LP64
+  assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size");
+  _Copy_arrayof_conjoint_jlongs(from, to, count);
+#else
+  assert(BytesPerInt == BytesPerOop, "jints and oops must be the same size");
+  _Copy_arrayof_conjoint_jints(from, to, count);
+#endif // _LP64
+}
+
+static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
+#ifdef _LP64
+  julong* to = (julong*) tohw;
+  julong  v  = ((julong) value << 32) | value;
+#else
+  juint* to = (juint*) tohw;
+  juint  v  = value;
+#endif // _LP64
+
+  while (count-- > 0) {
+    *to++ = v;
+  }
+}
+
+static void pd_fill_to_aligned_words(HeapWord* tohw,
+                                     size_t    count,
+                                     juint     value) {
+  pd_fill_to_words(tohw, count, value);
+}
+
+static void pd_fill_to_bytes(void* to, size_t count, jubyte value) {
+  memset(to, value, count);
+}
+
+static void pd_zero_to_words(HeapWord* tohw, size_t count) {
+  pd_fill_to_words(tohw, count, 0);
+}
+
+static void pd_zero_to_bytes(void* to, size_t count) {
+  memset(to, 0, count);
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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
+ * 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.
+ *
+ */
+
+ protected:
+  MacroAssembler* assembler() const {
+    return _masm;
+  }
+
+ protected:
+  address generate_entry(address entry_point) {
+    ZeroEntry *entry = (ZeroEntry *) assembler()->pc();
+    assembler()->advance(sizeof(ZeroEntry));
+    entry->set_entry_point(entry_point);
+    return (address) entry;
+  }
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/cppInterpreter_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,981 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008, 2009, 2010 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/_cppInterpreter_zero.cpp.incl"
+
+#ifdef CC_INTERP
+
+#define fixup_after_potential_safepoint()       \
+  method = istate->method()
+
+#define CALL_VM_NOCHECK(func)                   \
+  thread->set_last_Java_frame();                \
+  func;                                         \
+  thread->reset_last_Java_frame();              \
+  fixup_after_potential_safepoint()
+
+void CppInterpreter::normal_entry(methodOop method, intptr_t UNUSED, TRAPS) {
+  JavaThread *thread = (JavaThread *) THREAD;
+  ZeroStack *stack = thread->zero_stack();
+
+  // Adjust the caller's stack frame to accomodate any additional
+  // local variables we have contiguously with our parameters.
+  int extra_locals = method->max_locals() - method->size_of_parameters();
+  if (extra_locals > 0) {
+    if (extra_locals > stack->available_words()) {
+      Unimplemented();
+    }
+    for (int i = 0; i < extra_locals; i++)
+      stack->push(0);
+  }
+
+  // Allocate and initialize our frame.
+  InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread);
+  thread->push_zero_frame(frame);
+
+  // Execute those bytecodes!
+  main_loop(0, THREAD);
+}
+
+void CppInterpreter::main_loop(int recurse, TRAPS) {
+  JavaThread *thread = (JavaThread *) THREAD;
+  ZeroStack *stack = thread->zero_stack();
+
+  // If we are entering from a deopt we may need to call
+  // ourself a few times in order to get to our frame.
+  if (recurse)
+    main_loop(recurse - 1, THREAD);
+
+  InterpreterFrame *frame = thread->top_zero_frame()->as_interpreter_frame();
+  interpreterState istate = frame->interpreter_state();
+  methodOop method = istate->method();
+
+  intptr_t *result = NULL;
+  int result_slots = 0;
+
+  // Check we're not about to run out of stack
+  if (stack_overflow_imminent(thread)) {
+    CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread));
+    goto unwind_and_return;
+  }
+
+  while (true) {
+    // We can set up the frame anchor with everything we want at
+    // this point as we are thread_in_Java and no safepoints can
+    // occur until we go to vm mode.  We do have to clear flags
+    // on return from vm but that is it.
+    thread->set_last_Java_frame();
+
+    // Call the interpreter
+    if (JvmtiExport::can_post_interpreter_events())
+      BytecodeInterpreter::runWithChecks(istate);
+    else
+      BytecodeInterpreter::run(istate);
+    fixup_after_potential_safepoint();
+
+    // Clear the frame anchor
+    thread->reset_last_Java_frame();
+
+    // Examine the message from the interpreter to decide what to do
+    if (istate->msg() == BytecodeInterpreter::call_method) {
+      methodOop callee = istate->callee();
+
+      // Trim back the stack to put the parameters at the top
+      stack->set_sp(istate->stack() + 1);
+
+      // Make the call
+      Interpreter::invoke_method(callee, istate->callee_entry_point(), THREAD);
+      fixup_after_potential_safepoint();
+
+      // Convert the result
+      istate->set_stack(stack->sp() - 1);
+
+      // Restore the stack
+      stack->set_sp(istate->stack_limit() + 1);
+
+      // Resume the interpreter
+      istate->set_msg(BytecodeInterpreter::method_resume);
+    }
+    else if (istate->msg() == BytecodeInterpreter::more_monitors) {
+      int monitor_words = frame::interpreter_frame_monitor_size();
+
+      // Allocate the space
+      if (monitor_words > stack->available_words()) {
+        Unimplemented();
+      }
+      stack->alloc(monitor_words * wordSize);
+
+      // Move the expression stack contents
+      for (intptr_t *p = istate->stack() + 1; p < istate->stack_base(); p++)
+        *(p - monitor_words) = *p;
+
+      // Move the expression stack pointers
+      istate->set_stack_limit(istate->stack_limit() - monitor_words);
+      istate->set_stack(istate->stack() - monitor_words);
+      istate->set_stack_base(istate->stack_base() - monitor_words);
+
+      // Zero the new monitor so the interpreter can find it.
+      ((BasicObjectLock *) istate->stack_base())->set_obj(NULL);
+
+      // Resume the interpreter
+      istate->set_msg(BytecodeInterpreter::got_monitors);
+    }
+    else if (istate->msg() == BytecodeInterpreter::return_from_method) {
+      // Copy the result into the caller's frame
+      result_slots = type2size[result_type_of(method)];
+      assert(result_slots >= 0 && result_slots <= 2, "what?");
+      result = istate->stack() + result_slots;
+      break;
+    }
+    else if (istate->msg() == BytecodeInterpreter::throwing_exception) {
+      assert(HAS_PENDING_EXCEPTION, "should do");
+      break;
+    }
+    else if (istate->msg() == BytecodeInterpreter::do_osr) {
+      // Unwind the current frame
+      thread->pop_zero_frame();
+
+      // Remove any extension of the previous frame
+      int extra_locals = method->max_locals() - method->size_of_parameters();
+      stack->set_sp(stack->sp() + extra_locals);
+
+      // Jump into the OSR method
+      Interpreter::invoke_osr(
+        method, istate->osr_entry(), istate->osr_buf(), THREAD);
+      return;
+    }
+    else {
+      ShouldNotReachHere();
+    }
+  }
+
+ unwind_and_return:
+
+  // Unwind the current frame
+  thread->pop_zero_frame();
+
+  // Pop our local variables
+  stack->set_sp(stack->sp() + method->max_locals());
+
+  // Push our result
+  for (int i = 0; i < result_slots; i++)
+    stack->push(result[-i]);
+}
+
+void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
+  // Make sure method is native and not abstract
+  assert(method->is_native() && !method->is_abstract(), "should be");
+
+  JavaThread *thread = (JavaThread *) THREAD;
+  ZeroStack *stack = thread->zero_stack();
+
+  // Allocate and initialize our frame
+  InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread);
+  thread->push_zero_frame(frame);
+  interpreterState istate = frame->interpreter_state();
+  intptr_t *locals = istate->locals();
+
+  // Check we're not about to run out of stack
+  if (stack_overflow_imminent(thread)) {
+    CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread));
+    goto unwind_and_return;
+  }
+
+  // Update the invocation counter
+  if ((UseCompiler || CountCompiledCalls) && !method->is_synchronized()) {
+    thread->set_do_not_unlock();
+    InvocationCounter *counter = method->invocation_counter();
+    counter->increment();
+    if (counter->reached_InvocationLimit()) {
+      CALL_VM_NOCHECK(
+        InterpreterRuntime::frequency_counter_overflow(thread, NULL));
+      if (HAS_PENDING_EXCEPTION)
+        goto unwind_and_return;
+    }
+    thread->clr_do_not_unlock();
+  }
+
+  // Lock if necessary
+  BasicObjectLock *monitor;
+  monitor = NULL;
+  if (method->is_synchronized()) {
+    monitor = (BasicObjectLock*) istate->stack_base();
+    oop lockee = monitor->obj();
+    markOop disp = lockee->mark()->set_unlocked();
+
+    monitor->lock()->set_displaced_header(disp);
+    if (Atomic::cmpxchg_ptr(monitor, lockee->mark_addr(), disp) != disp) {
+      if (thread->is_lock_owned((address) disp->clear_lock_bits())) {
+        monitor->lock()->set_displaced_header(NULL);
+      }
+      else {
+        CALL_VM_NOCHECK(InterpreterRuntime::monitorenter(thread, monitor));
+        if (HAS_PENDING_EXCEPTION)
+          goto unwind_and_return;
+      }
+    }
+  }
+
+  // Get the signature handler
+  InterpreterRuntime::SignatureHandler *handler; {
+    address handlerAddr = method->signature_handler();
+    if (handlerAddr == NULL) {
+      CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method));
+      if (HAS_PENDING_EXCEPTION)
+        goto unlock_unwind_and_return;
+
+      handlerAddr = method->signature_handler();
+      assert(handlerAddr != NULL, "eh?");
+    }
+    if (handlerAddr == (address) InterpreterRuntime::slow_signature_handler) {
+      CALL_VM_NOCHECK(handlerAddr =
+        InterpreterRuntime::slow_signature_handler(thread, method, NULL,NULL));
+      if (HAS_PENDING_EXCEPTION)
+        goto unlock_unwind_and_return;
+    }
+    handler = \
+      InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
+  }
+
+  // Get the native function entry point
+  address function;
+  function = method->native_function();
+  assert(function != NULL, "should be set if signature handler is");
+
+  // Build the argument list
+  if (handler->argument_count() * 2 > stack->available_words()) {
+    Unimplemented();
+  }
+  void **arguments;
+  void *mirror; {
+    arguments =
+      (void **) stack->alloc(handler->argument_count() * sizeof(void **));
+    void **dst = arguments;
+
+    void *env = thread->jni_environment();
+    *(dst++) = &env;
+
+    if (method->is_static()) {
+      istate->set_oop_temp(
+        method->constants()->pool_holder()->klass_part()->java_mirror());
+      mirror = istate->oop_temp_addr();
+      *(dst++) = &mirror;
+    }
+
+    intptr_t *src = locals;
+    for (int i = dst - arguments; i < handler->argument_count(); i++) {
+      ffi_type *type = handler->argument_type(i);
+      if (type == &ffi_type_pointer) {
+        if (*src) {
+          stack->push((intptr_t) src);
+          *(dst++) = stack->sp();
+        }
+        else {
+          *(dst++) = src;
+        }
+        src--;
+      }
+      else if (type->size == 4) {
+        *(dst++) = src--;
+      }
+      else if (type->size == 8) {
+        src--;
+        *(dst++) = src--;
+      }
+      else {
+        ShouldNotReachHere();
+      }
+    }
+  }
+
+  // Set up the Java frame anchor
+  thread->set_last_Java_frame();
+
+  // Change the thread state to _thread_in_native
+  ThreadStateTransition::transition_from_java(thread, _thread_in_native);
+
+  // Make the call
+  intptr_t result[4 - LogBytesPerWord];
+  ffi_call(handler->cif(), (void (*)()) function, result, arguments);
+
+  // Change the thread state back to _thread_in_Java.
+  // ThreadStateTransition::transition_from_native() cannot be used
+  // here because it does not check for asynchronous exceptions.
+  // We have to manage the transition ourself.
+  thread->set_thread_state(_thread_in_native_trans);
+
+  // Make sure new state is visible in the GC thread
+  if (os::is_MP()) {
+    if (UseMembar) {
+      OrderAccess::fence();
+    }
+    else {
+      InterfaceSupport::serialize_memory(thread);
+    }
+  }
+
+  // Handle safepoint operations, pending suspend requests,
+  // and pending asynchronous exceptions.
+  if (SafepointSynchronize::do_call_back() ||
+      thread->has_special_condition_for_native_trans()) {
+    JavaThread::check_special_condition_for_native_trans(thread);
+    CHECK_UNHANDLED_OOPS_ONLY(thread->clear_unhandled_oops());
+  }
+
+  // Finally we can change the thread state to _thread_in_Java.
+  thread->set_thread_state(_thread_in_Java);
+  fixup_after_potential_safepoint();
+
+  // Clear the frame anchor
+  thread->reset_last_Java_frame();
+
+  // If the result was an oop then unbox it and store it in
+  // oop_temp where the garbage collector can see it before
+  // we release the handle it might be protected by.
+  if (handler->result_type() == &ffi_type_pointer) {
+    if (result[0])
+      istate->set_oop_temp(*(oop *) result[0]);
+    else
+      istate->set_oop_temp(NULL);
+  }
+
+  // Reset handle block
+  thread->active_handles()->clear();
+
+ unlock_unwind_and_return:
+
+  // Unlock if necessary
+  if (monitor) {
+    BasicLock *lock = monitor->lock();
+    markOop header = lock->displaced_header();
+    oop rcvr = monitor->obj();
+    monitor->set_obj(NULL);
+
+    if (header != NULL) {
+      if (Atomic::cmpxchg_ptr(header, rcvr->mark_addr(), lock) != lock) {
+        monitor->set_obj(rcvr); {
+          HandleMark hm(thread);
+          CALL_VM_NOCHECK(InterpreterRuntime::monitorexit(thread, monitor));
+        }
+      }
+    }
+  }
+
+ unwind_and_return:
+
+  // Unwind the current activation
+  thread->pop_zero_frame();
+
+  // Pop our parameters
+  stack->set_sp(stack->sp() + method->size_of_parameters());
+
+  // Push our result
+  if (!HAS_PENDING_EXCEPTION) {
+    BasicType type = result_type_of(method);
+    stack->set_sp(stack->sp() - type2size[type]);
+
+    switch (type) {
+    case T_VOID:
+      break;
+
+    case T_BOOLEAN:
+#ifndef VM_LITTLE_ENDIAN
+      result[0] <<= (BitsPerWord - BitsPerByte);
+#endif
+      SET_LOCALS_INT(*(jboolean *) result != 0, 0);
+      break;
+
+    case T_CHAR:
+#ifndef VM_LITTLE_ENDIAN
+      result[0] <<= (BitsPerWord - BitsPerShort);
+#endif
+      SET_LOCALS_INT(*(jchar *) result, 0);
+      break;
+
+    case T_BYTE:
+#ifndef VM_LITTLE_ENDIAN
+      result[0] <<= (BitsPerWord - BitsPerByte);
+#endif
+      SET_LOCALS_INT(*(jbyte *) result, 0);
+      break;
+
+    case T_SHORT:
+#ifndef VM_LITTLE_ENDIAN
+      result[0] <<= (BitsPerWord - BitsPerShort);
+#endif
+      SET_LOCALS_INT(*(jshort *) result, 0);
+      break;
+
+    case T_INT:
+#ifndef VM_LITTLE_ENDIAN
+      result[0] <<= (BitsPerWord - BitsPerInt);
+#endif
+      SET_LOCALS_INT(*(jint *) result, 0);
+      break;
+
+    case T_LONG:
+      SET_LOCALS_LONG(*(jlong *) result, 0);
+      break;
+
+    case T_FLOAT:
+      SET_LOCALS_FLOAT(*(jfloat *) result, 0);
+      break;
+
+    case T_DOUBLE:
+      SET_LOCALS_DOUBLE(*(jdouble *) result, 0);
+      break;
+
+    case T_OBJECT:
+    case T_ARRAY:
+      SET_LOCALS_OBJECT(istate->oop_temp(), 0);
+      break;
+
+    default:
+      ShouldNotReachHere();
+    }
+  }
+}
+
+void CppInterpreter::accessor_entry(methodOop method, intptr_t UNUSED, TRAPS) {
+  JavaThread *thread = (JavaThread *) THREAD;
+  ZeroStack *stack = thread->zero_stack();
+  intptr_t *locals = stack->sp();
+
+  // Drop into the slow path if we need a safepoint check
+  if (SafepointSynchronize::do_call_back()) {
+    normal_entry(method, 0, THREAD);
+    return;
+  }
+
+  // Load the object pointer and drop into the slow path
+  // if we have a NullPointerException
+  oop object = LOCALS_OBJECT(0);
+  if (object == NULL) {
+    normal_entry(method, 0, THREAD);
+    return;
+  }
+
+  // Read the field index from the bytecode, which looks like this:
+  //  0:  aload_0
+  //  1:  getfield
+  //  2:    index
+  //  3:    index
+  //  4:  ireturn/areturn
+  // NB this is not raw bytecode: index is in machine order
+  u1 *code = method->code_base();
+  assert(code[0] == Bytecodes::_aload_0 &&
+         code[1] == Bytecodes::_getfield &&
+         (code[4] == Bytecodes::_ireturn ||
+          code[4] == Bytecodes::_areturn), "should do");
+  u2 index = Bytes::get_native_u2(&code[2]);
+
+  // Get the entry from the constant pool cache, and drop into
+  // the slow path if it has not been resolved
+  constantPoolCacheOop cache = method->constants()->cache();
+  ConstantPoolCacheEntry* entry = cache->entry_at(index);
+  if (!entry->is_resolved(Bytecodes::_getfield)) {
+    normal_entry(method, 0, THREAD);
+    return;
+  }
+
+  // Get the result and push it onto the stack
+  switch (entry->flag_state()) {
+  case ltos:
+  case dtos:
+    if (stack->available_words() < 1) {
+      Unimplemented();
+    }
+    stack->alloc(wordSize);
+    break;
+  }
+  if (entry->is_volatile()) {
+    switch (entry->flag_state()) {
+    case ctos:
+      SET_LOCALS_INT(object->char_field_acquire(entry->f2()), 0);
+      break;
+
+    case btos:
+      SET_LOCALS_INT(object->byte_field_acquire(entry->f2()), 0);
+      break;
+
+    case stos:
+      SET_LOCALS_INT(object->short_field_acquire(entry->f2()), 0);
+      break;
+
+    case itos:
+      SET_LOCALS_INT(object->int_field_acquire(entry->f2()), 0);
+      break;
+
+    case ltos:
+      SET_LOCALS_LONG(object->long_field_acquire(entry->f2()), 0);
+      break;
+
+    case ftos:
+      SET_LOCALS_FLOAT(object->float_field_acquire(entry->f2()), 0);
+      break;
+
+    case dtos:
+      SET_LOCALS_DOUBLE(object->double_field_acquire(entry->f2()), 0);
+      break;
+
+    case atos:
+      SET_LOCALS_OBJECT(object->obj_field_acquire(entry->f2()), 0);
+      break;
+
+    default:
+      ShouldNotReachHere();
+    }
+  }
+  else {
+    switch (entry->flag_state()) {
+    case ctos:
+      SET_LOCALS_INT(object->char_field(entry->f2()), 0);
+      break;
+
+    case btos:
+      SET_LOCALS_INT(object->byte_field(entry->f2()), 0);
+      break;
+
+    case stos:
+      SET_LOCALS_INT(object->short_field(entry->f2()), 0);
+      break;
+
+    case itos:
+      SET_LOCALS_INT(object->int_field(entry->f2()), 0);
+      break;
+
+    case ltos:
+      SET_LOCALS_LONG(object->long_field(entry->f2()), 0);
+      break;
+
+    case ftos:
+      SET_LOCALS_FLOAT(object->float_field(entry->f2()), 0);
+      break;
+
+    case dtos:
+      SET_LOCALS_DOUBLE(object->double_field(entry->f2()), 0);
+      break;
+
+    case atos:
+      SET_LOCALS_OBJECT(object->obj_field(entry->f2()), 0);
+      break;
+
+    default:
+      ShouldNotReachHere();
+    }
+  }
+}
+
+void CppInterpreter::empty_entry(methodOop method, intptr_t UNUSED, TRAPS) {
+  JavaThread *thread = (JavaThread *) THREAD;
+  ZeroStack *stack = thread->zero_stack();
+
+  // Drop into the slow path if we need a safepoint check
+  if (SafepointSynchronize::do_call_back()) {
+    normal_entry(method, 0, THREAD);
+    return;
+  }
+
+  // Pop our parameters
+  stack->set_sp(stack->sp() + method->size_of_parameters());
+}
+
+bool CppInterpreter::stack_overflow_imminent(JavaThread *thread) {
+  // How is the ABI stack?
+  address stack_top = thread->stack_base() - thread->stack_size();
+  int free_stack = os::current_stack_pointer() - stack_top;
+  if (free_stack < StackShadowPages * os::vm_page_size()) {
+    return true;
+  }
+
+  // How is the Zero stack?
+  // Throwing a StackOverflowError involves a VM call, which means
+  // we need a frame on the stack.  We should be checking here to
+  // ensure that methods we call have enough room to install the
+  // largest possible frame, but that's more than twice the size
+  // of the entire Zero stack we get by default, so we just check
+  // we have *some* space instead...
+  free_stack = thread->zero_stack()->available_words() * wordSize;
+  if (free_stack < StackShadowPages * os::vm_page_size()) {
+    return true;
+  }
+
+  return false;
+}
+
+InterpreterFrame *InterpreterFrame::build(ZeroStack*       stack,
+                                          const methodOop  method,
+                                          JavaThread*      thread) {
+  int monitor_words =
+    method->is_synchronized() ? frame::interpreter_frame_monitor_size() : 0;
+  int stack_words = method->is_native() ? 0 : method->max_stack();
+
+  if (header_words + monitor_words + stack_words > stack->available_words()) {
+    Unimplemented();
+  }
+
+  intptr_t *locals;
+  if (method->is_native())
+    locals = stack->sp() + (method->size_of_parameters() - 1);
+  else
+    locals = stack->sp() + (method->max_locals() - 1);
+
+  stack->push(0); // next_frame, filled in later
+  intptr_t *fp = stack->sp();
+  assert(fp - stack->sp() == next_frame_off, "should be");
+
+  stack->push(INTERPRETER_FRAME);
+  assert(fp - stack->sp() == frame_type_off, "should be");
+
+  interpreterState istate =
+    (interpreterState) stack->alloc(sizeof(BytecodeInterpreter));
+  assert(fp - stack->sp() == istate_off, "should be");
+
+  istate->set_locals(locals);
+  istate->set_method(method);
+  istate->set_self_link(istate);
+  istate->set_prev_link(NULL);
+  istate->set_thread(thread);
+  istate->set_bcp(method->is_native() ? NULL : method->code_base());
+  istate->set_constants(method->constants()->cache());
+  istate->set_msg(BytecodeInterpreter::method_entry);
+  istate->set_oop_temp(NULL);
+  istate->set_mdx(NULL);
+  istate->set_callee(NULL);
+
+  istate->set_monitor_base((BasicObjectLock *) stack->sp());
+  if (method->is_synchronized()) {
+    BasicObjectLock *monitor =
+      (BasicObjectLock *) stack->alloc(monitor_words * wordSize);
+    oop object;
+    if (method->is_static())
+      object = method->constants()->pool_holder()->klass_part()->java_mirror();
+    else
+      object = (oop) locals[0];
+    monitor->set_obj(object);
+  }
+
+  istate->set_stack_base(stack->sp());
+  istate->set_stack(stack->sp() - 1);
+  if (stack_words)
+    stack->alloc(stack_words * wordSize);
+  istate->set_stack_limit(stack->sp() - 1);
+
+  return (InterpreterFrame *) fp;
+}
+
+int AbstractInterpreter::BasicType_as_index(BasicType type) {
+  int i = 0;
+  switch (type) {
+    case T_BOOLEAN: i = 0; break;
+    case T_CHAR   : i = 1; break;
+    case T_BYTE   : i = 2; break;
+    case T_SHORT  : i = 3; break;
+    case T_INT    : i = 4; break;
+    case T_LONG   : i = 5; break;
+    case T_VOID   : i = 6; break;
+    case T_FLOAT  : i = 7; break;
+    case T_DOUBLE : i = 8; break;
+    case T_OBJECT : i = 9; break;
+    case T_ARRAY  : i = 9; break;
+    default       : ShouldNotReachHere();
+  }
+  assert(0 <= i && i < AbstractInterpreter::number_of_result_handlers,
+         "index out of bounds");
+  return i;
+}
+
+BasicType CppInterpreter::result_type_of(methodOop method) {
+  BasicType t;
+  switch (method->result_index()) {
+    case 0 : t = T_BOOLEAN; break;
+    case 1 : t = T_CHAR;    break;
+    case 2 : t = T_BYTE;    break;
+    case 3 : t = T_SHORT;   break;
+    case 4 : t = T_INT;     break;
+    case 5 : t = T_LONG;    break;
+    case 6 : t = T_VOID;    break;
+    case 7 : t = T_FLOAT;   break;
+    case 8 : t = T_DOUBLE;  break;
+    case 9 : t = T_OBJECT;  break;
+    default: ShouldNotReachHere();
+  }
+  assert(AbstractInterpreter::BasicType_as_index(t) == method->result_index(),
+         "out of step with AbstractInterpreter::BasicType_as_index");
+  return t;
+}
+
+address InterpreterGenerator::generate_empty_entry() {
+  if (!UseFastEmptyMethods)
+    return NULL;
+
+  return generate_entry((address) CppInterpreter::empty_entry);
+}
+
+address InterpreterGenerator::generate_accessor_entry() {
+  if (!UseFastAccessorMethods)
+    return NULL;
+
+  return generate_entry((address) CppInterpreter::accessor_entry);
+}
+
+address InterpreterGenerator::generate_native_entry(bool synchronized) {
+  assert(synchronized == false, "should be");
+
+  return generate_entry((address) CppInterpreter::native_entry);
+}
+
+address InterpreterGenerator::generate_normal_entry(bool synchronized) {
+  assert(synchronized == false, "should be");
+
+  return generate_entry((address) CppInterpreter::normal_entry);
+}
+
+address AbstractInterpreterGenerator::generate_method_entry(
+    AbstractInterpreter::MethodKind kind) {
+  address entry_point = NULL;
+
+  switch (kind) {
+  case Interpreter::zerolocals:
+  case Interpreter::zerolocals_synchronized:
+    break;
+
+  case Interpreter::native:
+    entry_point = ((InterpreterGenerator*) this)->generate_native_entry(false);
+    break;
+
+  case Interpreter::native_synchronized:
+    entry_point = ((InterpreterGenerator*) this)->generate_native_entry(false);
+    break;
+
+  case Interpreter::empty:
+    entry_point = ((InterpreterGenerator*) this)->generate_empty_entry();
+    break;
+
+  case Interpreter::accessor:
+    entry_point = ((InterpreterGenerator*) this)->generate_accessor_entry();
+    break;
+
+  case Interpreter::abstract:
+    entry_point = ((InterpreterGenerator*) this)->generate_abstract_entry();
+    break;
+
+  case Interpreter::method_handle:
+    entry_point = ((InterpreterGenerator*) this)->generate_method_handle_entry();
+    break;
+
+  case Interpreter::java_lang_math_sin:
+  case Interpreter::java_lang_math_cos:
+  case Interpreter::java_lang_math_tan:
+  case Interpreter::java_lang_math_abs:
+  case Interpreter::java_lang_math_log:
+  case Interpreter::java_lang_math_log10:
+  case Interpreter::java_lang_math_sqrt:
+    entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind);
+    break;
+
+  default:
+    ShouldNotReachHere();
+  }
+
+  if (entry_point == NULL)
+    entry_point = ((InterpreterGenerator*) this)->generate_normal_entry(false);
+
+  return entry_point;
+}
+
+InterpreterGenerator::InterpreterGenerator(StubQueue* code)
+ : CppInterpreterGenerator(code) {
+   generate_all();
+}
+
+// Deoptimization helpers
+
+InterpreterFrame *InterpreterFrame::build(ZeroStack* stack, int size) {
+  int size_in_words = size >> LogBytesPerWord;
+  assert(size_in_words * wordSize == size, "unaligned");
+  assert(size_in_words >= header_words, "too small");
+
+  if (size_in_words > stack->available_words()) {
+    Unimplemented();
+  }
+
+  stack->push(0); // next_frame, filled in later
+  intptr_t *fp = stack->sp();
+  assert(fp - stack->sp() == next_frame_off, "should be");
+
+  stack->push(INTERPRETER_FRAME);
+  assert(fp - stack->sp() == frame_type_off, "should be");
+
+  interpreterState istate =
+    (interpreterState) stack->alloc(sizeof(BytecodeInterpreter));
+  assert(fp - stack->sp() == istate_off, "should be");
+  istate->set_self_link(NULL); // mark invalid
+
+  stack->alloc((size_in_words - header_words) * wordSize);
+
+  return (InterpreterFrame *) fp;
+}
+
+int AbstractInterpreter::layout_activation(methodOop method,
+                                           int       tempcount,
+                                           int       popframe_extra_args,
+                                           int       moncount,
+                                           int       callee_param_count,
+                                           int       callee_locals,
+                                           frame*    caller,
+                                           frame*    interpreter_frame,
+                                           bool      is_top_frame) {
+  assert(popframe_extra_args == 0, "what to do?");
+  assert(!is_top_frame || (!callee_locals && !callee_param_count),
+         "top frame should have no caller")
+
+  // This code must exactly match what InterpreterFrame::build
+  // does (the full InterpreterFrame::build, that is, not the
+  // one that creates empty frames for the deoptimizer).
+  //
+  // If interpreter_frame is not NULL then it will be filled in.
+  // It's size is determined by a previous call to this method,
+  // so it should be correct.
+  //
+  // Note that tempcount is the current size of the expression
+  // stack.  For top most frames we will allocate a full sized
+  // expression stack and not the trimmed version that non-top
+  // frames have.
+
+  int header_words        = InterpreterFrame::header_words;
+  int monitor_words       = moncount * frame::interpreter_frame_monitor_size();
+  int stack_words         = is_top_frame ? method->max_stack() : tempcount;
+  int callee_extra_locals = callee_locals - callee_param_count;
+
+  if (interpreter_frame) {
+    intptr_t *locals        = interpreter_frame->sp() + method->max_locals();
+    interpreterState istate = interpreter_frame->get_interpreterState();
+    intptr_t *monitor_base  = (intptr_t*) istate;
+    intptr_t *stack_base    = monitor_base - monitor_words;
+    intptr_t *stack         = stack_base - tempcount - 1;
+
+    BytecodeInterpreter::layout_interpreterState(istate,
+                                                 caller,
+                                                 NULL,
+                                                 method,
+                                                 locals,
+                                                 stack,
+                                                 stack_base,
+                                                 monitor_base,
+                                                 NULL,
+                                                 is_top_frame);
+  }
+  return header_words + monitor_words + stack_words + callee_extra_locals;
+}
+
+void BytecodeInterpreter::layout_interpreterState(interpreterState istate,
+                                                  frame*    caller,
+                                                  frame*    current,
+                                                  methodOop method,
+                                                  intptr_t* locals,
+                                                  intptr_t* stack,
+                                                  intptr_t* stack_base,
+                                                  intptr_t* monitor_base,
+                                                  intptr_t* frame_bottom,
+                                                  bool      is_top_frame) {
+  istate->set_locals(locals);
+  istate->set_method(method);
+  istate->set_self_link(istate);
+  istate->set_prev_link(NULL);
+  // thread will be set by a hacky repurposing of frame::patch_pc()
+  // bcp will be set by vframeArrayElement::unpack_on_stack()
+  istate->set_constants(method->constants()->cache());
+  istate->set_msg(BytecodeInterpreter::method_resume);
+  istate->set_bcp_advance(0);
+  istate->set_oop_temp(NULL);
+  istate->set_mdx(NULL);
+  if (caller->is_interpreted_frame()) {
+    interpreterState prev = caller->get_interpreterState();
+    prev->set_callee(method);
+    if (*prev->bcp() == Bytecodes::_invokeinterface)
+      prev->set_bcp_advance(5);
+    else
+      prev->set_bcp_advance(3);
+  }
+  istate->set_callee(NULL);
+  istate->set_monitor_base((BasicObjectLock *) monitor_base);
+  istate->set_stack_base(stack_base);
+  istate->set_stack(stack);
+  istate->set_stack_limit(stack_base - method->max_stack() - 1);
+}
+
+address CppInterpreter::return_entry(TosState state, int length) {
+  ShouldNotCallThis();
+}
+
+address CppInterpreter::deopt_entry(TosState state, int length) {
+  return NULL;
+}
+
+// Helper for (runtime) stack overflow checks
+
+int AbstractInterpreter::size_top_interpreter_activation(methodOop method) {
+  return 0;
+}
+
+// Helper for figuring out if frames are interpreter frames
+
+bool CppInterpreter::contains(address pc) {
+#ifdef PRODUCT
+  ShouldNotCallThis();
+#else
+  return false; // make frame::print_value_on work
+#endif // !PRODUCT
+}
+
+// Result handlers and convertors
+
+address CppInterpreterGenerator::generate_result_handler_for(
+    BasicType type) {
+  assembler()->advance(1);
+  return ShouldNotCallThisStub();
+}
+
+address CppInterpreterGenerator::generate_tosca_to_stack_converter(
+    BasicType type) {
+  assembler()->advance(1);
+  return ShouldNotCallThisStub();
+}
+
+address CppInterpreterGenerator::generate_stack_to_stack_converter(
+    BasicType type) {
+  assembler()->advance(1);
+  return ShouldNotCallThisStub();
+}
+
+address CppInterpreterGenerator::generate_stack_to_native_abi_converter(
+    BasicType type) {
+  assembler()->advance(1);
+  return ShouldNotCallThisStub();
+}
+
+#endif // CC_INTERP
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/cppInterpreter_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/cppInterpreter_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,47 @@
+/*
+ * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008, 2010 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.
+ *
+ */
+
+ protected:
+  // Size of interpreter code
+  const static int InterpreterCodeSize = 6 * K;
+
+ public:
+  // Method entries
+  static void normal_entry(methodOop method, intptr_t UNUSED, TRAPS);
+  static void native_entry(methodOop method, intptr_t UNUSED, TRAPS);
+  static void accessor_entry(methodOop method, intptr_t UNUSED, TRAPS);
+  static void empty_entry(methodOop method, intptr_t UNUSED, TRAPS);
+
+ public:
+  // Main loop of normal_entry
+  static void main_loop(int recurse, TRAPS);
+
+ private:
+  // Stack overflow checks
+  static bool stack_overflow_imminent(JavaThread *thread);
+
+ private:
+  // Fast result type determination
+  static BasicType result_type_of(methodOop method);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/debug_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/debug_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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/_debug_zero.cpp.incl"
+
+void pd_ps(frame f) {
+  ShouldNotCallThis();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/depChecker_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/depChecker_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/depChecker_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/depChecker_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/disassembler_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/disassembler_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/disassembler_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/disassembler_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+// The disassembler prints out zero code annotated
+// with Java specific information.
+
+  static int pd_instruction_alignment() {
+    ShouldNotCallThis();
+  }
+
+  static const char* pd_cpu_opts() {
+    ShouldNotCallThis();
+  }
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/dump_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/dump_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2004-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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/_dump_zero.cpp.incl"
+
+void CompactingPermGenGen::generate_vtable_methods(void** vtbl_list,
+                                                   void** vtable,
+                                                   char** md_top,
+                                                   char*  md_end,
+                                                   char** mc_top,
+                                                   char*  mc_end) {
+  ShouldNotCallThis();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/entryFrame_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/entryFrame_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// |  ...               |
+// +--------------------+  ------------------
+// | parameter n-1      |       low addresses
+// |  ...               |
+// | parameter 0        |
+// | call_wrapper       |
+// | frame_type         |
+// | next_frame         |      high addresses
+// +--------------------+  ------------------
+// |  ...               |
+
+class EntryFrame : public ZeroFrame {
+ private:
+  EntryFrame() : ZeroFrame() {
+    ShouldNotCallThis();
+  }
+
+ protected:
+  enum Layout {
+    call_wrapper_off = jf_header_words,
+    header_words
+  };
+
+ public:
+  static EntryFrame *build(ZeroStack*       stack,
+                           const intptr_t*  parameters,
+                           int              parameter_words,
+                           JavaCallWrapper* call_wrapper);
+ public:
+  JavaCallWrapper *call_wrapper() const {
+    return (JavaCallWrapper *) value_of_word(call_wrapper_off);
+  }
+
+ public:
+  void identify_word(int   frame_index,
+                     int   offset,
+                     char* fieldbuf,
+                     char* valuebuf,
+                     int   buflen) const;
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/entry_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/entry_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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
+ * 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 ZeroEntry {
+ public:
+  ZeroEntry() {
+    ShouldNotCallThis();
+  }
+
+ private:
+  address _entry_point;
+
+ public:
+  address entry_point() const {
+    return _entry_point;
+  }
+  void set_entry_point(address entry_point) {
+    _entry_point = entry_point;
+  }
+
+ private:
+  typedef void (*NormalEntryFunc)(methodOop method,
+                                  intptr_t  base_pc,
+                                  TRAPS);
+  typedef void (*OSREntryFunc)(methodOop method,
+                               address   osr_buf,
+                               intptr_t  base_pc,
+                               TRAPS);
+
+ public:
+  void invoke(methodOop method, TRAPS) const {
+    ((NormalEntryFunc) entry_point())(method, (intptr_t) this, THREAD);
+  }
+  void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
+    ((OSREntryFunc) entry_point())(method, osr_buf, (intptr_t) this, THREAD);
+  }
+
+ public:
+  static ByteSize entry_point_offset() {
+    return byte_offset_of(ZeroEntry, _entry_point);
+  }
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/fakeStubFrame_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/fakeStubFrame_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// |  ...               |
+// +--------------------+  ------------------
+// | frame_type         |       low addresses
+// | next_frame         |      high addresses
+// +--------------------+  ------------------
+// |  ...               |
+
+class FakeStubFrame : public ZeroFrame {
+ private:
+  FakeStubFrame() : ZeroFrame() {
+    ShouldNotCallThis();
+  }
+
+ protected:
+  enum Layout {
+    header_words = jf_header_words
+  };
+
+ public:
+  static FakeStubFrame *build(ZeroStack* stack);
+
+ public:
+  void identify_word(int   frame_index,
+                     int   offset,
+                     char* fieldbuf,
+                     char* valuebuf,
+                     int   buflen) const {}
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/frame_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/frame_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,397 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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
+ * 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/_frame_zero.cpp.incl"
+
+#ifdef ASSERT
+void RegisterMap::check_location_valid() {
+  ShouldNotCallThis();
+}
+#endif
+
+bool frame::is_interpreted_frame() const {
+  return zeroframe()->is_interpreter_frame();
+}
+
+frame frame::sender_for_entry_frame(RegisterMap *map) const {
+  assert(zeroframe()->is_entry_frame(), "wrong type of frame");
+  assert(map != NULL, "map must be set");
+  assert(!entry_frame_is_first(), "next Java fp must be non zero");
+  assert(entry_frame_call_wrapper()->anchor()->last_Java_sp() == sender_sp(),
+         "sender should be next Java frame");
+  map->clear();
+  assert(map->include_argument_oops(), "should be set by clear");
+  return frame(sender_sp(), sp() + 1);
+}
+
+frame frame::sender_for_nonentry_frame(RegisterMap *map) const {
+  assert(zeroframe()->is_interpreter_frame() ||
+         zeroframe()->is_shark_frame() ||
+         zeroframe()->is_fake_stub_frame(), "wrong type of frame");
+  return frame(sender_sp(), sp() + 1);
+}
+
+frame frame::sender(RegisterMap* map) const {
+  // Default is not to follow arguments; the various
+  // sender_for_xxx methods update this accordingly.
+  map->set_include_argument_oops(false);
+
+  if (is_entry_frame())
+    return sender_for_entry_frame(map);
+  else
+    return sender_for_nonentry_frame(map);
+}
+
+#ifdef CC_INTERP
+BasicObjectLock* frame::interpreter_frame_monitor_begin() const {
+  return get_interpreterState()->monitor_base();
+}
+
+BasicObjectLock* frame::interpreter_frame_monitor_end() const {
+  return (BasicObjectLock*) get_interpreterState()->stack_base();
+}
+#endif // CC_INTERP
+
+void frame::patch_pc(Thread* thread, address pc) {
+  // We borrow this call to set the thread pointer in the interpreter
+  // state; the hook to set up deoptimized frames isn't supplied it.
+  assert(pc == NULL, "should be");
+  get_interpreterState()->set_thread((JavaThread *) thread);
+}
+
+bool frame::safe_for_sender(JavaThread *thread) {
+  ShouldNotCallThis();
+}
+
+void frame::pd_gc_epilog() {
+}
+
+bool frame::is_interpreted_frame_valid(JavaThread *thread) const {
+  ShouldNotCallThis();
+}
+
+BasicType frame::interpreter_frame_result(oop* oop_result,
+                                          jvalue* value_result) {
+  assert(is_interpreted_frame(), "interpreted frame expected");
+  methodOop method = interpreter_frame_method();
+  BasicType type = method->result_type();
+  intptr_t* tos_addr = (intptr_t *) interpreter_frame_tos_address();
+  oop obj;
+
+  switch (type) {
+  case T_VOID:
+    break;
+  case T_BOOLEAN:
+    value_result->z = *(jboolean *) tos_addr;
+    break;
+  case T_BYTE:
+    value_result->b = *(jbyte *) tos_addr;
+    break;
+  case T_CHAR:
+    value_result->c = *(jchar *) tos_addr;
+    break;
+  case T_SHORT:
+    value_result->s = *(jshort *) tos_addr;
+    break;
+  case T_INT:
+    value_result->i = *(jint *) tos_addr;
+    break;
+  case T_LONG:
+    value_result->j = *(jlong *) tos_addr;
+    break;
+  case T_FLOAT:
+    value_result->f = *(jfloat *) tos_addr;
+    break;
+  case T_DOUBLE:
+    value_result->d = *(jdouble *) tos_addr;
+    break;
+
+  case T_OBJECT:
+  case T_ARRAY:
+    if (method->is_native()) {
+      obj = get_interpreterState()->oop_temp();
+    }
+    else {
+      oop* obj_p = (oop *) tos_addr;
+      obj = (obj_p == NULL) ? (oop) NULL : *obj_p;
+    }
+    assert(obj == NULL || Universe::heap()->is_in(obj), "sanity check");
+    *oop_result = obj;
+    break;
+
+  default:
+    ShouldNotReachHere();
+  }
+
+  return type;
+}
+
+int frame::frame_size(RegisterMap* map) const {
+#ifdef PRODUCT
+  ShouldNotCallThis();
+#else
+  return 0; // make javaVFrame::print_value work
+#endif // PRODUCT
+}
+
+intptr_t* frame::interpreter_frame_tos_at(jint offset) const {
+  int index = (Interpreter::expr_offset_in_bytes(offset) / wordSize);
+  return &interpreter_frame_tos_address()[index];
+}
+
+void frame::zero_print_on_error(int           frame_index,
+                                outputStream* st,
+                                char*         buf,
+                                int           buflen) const {
+  // Divide the buffer between the field and the value
+  buflen >>= 1;
+  char *fieldbuf = buf;
+  char *valuebuf = buf + buflen;
+
+  // Print each word of the frame
+  for (intptr_t *addr = fp(); addr <= sp(); addr++) {
+    int offset = sp() - addr;
+
+    // Fill in default values, then try and improve them
+    snprintf(fieldbuf, buflen, "word[%d]", offset);
+    snprintf(valuebuf, buflen, PTR_FORMAT, *addr);
+    zeroframe()->identify_word(frame_index, offset, fieldbuf, valuebuf, buflen);
+    fieldbuf[buflen - 1] = '\0';
+    valuebuf[buflen - 1] = '\0';
+
+    // Print the result
+    st->print_cr(" " PTR_FORMAT ": %-21s = %s", addr, fieldbuf, valuebuf);
+  }
+}
+
+void ZeroFrame::identify_word(int   frame_index,
+                              int   offset,
+                              char* fieldbuf,
+                              char* valuebuf,
+                              int   buflen) const {
+  switch (offset) {
+  case next_frame_off:
+    strncpy(fieldbuf, "next_frame", buflen);
+    break;
+
+  case frame_type_off:
+    strncpy(fieldbuf, "frame_type", buflen);
+    if (is_entry_frame())
+      strncpy(valuebuf, "ENTRY_FRAME", buflen);
+    else if (is_interpreter_frame())
+      strncpy(valuebuf, "INTERPRETER_FRAME", buflen);
+    else if (is_shark_frame())
+      strncpy(valuebuf, "SHARK_FRAME", buflen);
+    else if (is_fake_stub_frame())
+      strncpy(valuebuf, "FAKE_STUB_FRAME", buflen);
+    break;
+
+  default:
+    if (is_entry_frame()) {
+      as_entry_frame()->identify_word(
+        frame_index, offset, fieldbuf, valuebuf, buflen);
+    }
+    else if (is_interpreter_frame()) {
+      as_interpreter_frame()->identify_word(
+        frame_index, offset, fieldbuf, valuebuf, buflen);
+    }
+    else if (is_shark_frame()) {
+      as_shark_frame()->identify_word(
+        frame_index, offset, fieldbuf, valuebuf, buflen);
+    }
+    else if (is_fake_stub_frame()) {
+      as_fake_stub_frame()->identify_word(
+        frame_index, offset, fieldbuf, valuebuf, buflen);
+    }
+  }
+}
+
+void EntryFrame::identify_word(int   frame_index,
+                               int   offset,
+                               char* fieldbuf,
+                               char* valuebuf,
+                               int   buflen) const {
+  switch (offset) {
+  case call_wrapper_off:
+    strncpy(fieldbuf, "call_wrapper", buflen);
+    break;
+
+  default:
+    snprintf(fieldbuf, buflen, "local[%d]", offset - 3);
+  }
+}
+
+void InterpreterFrame::identify_word(int   frame_index,
+                                     int   offset,
+                                     char* fieldbuf,
+                                     char* valuebuf,
+                                     int   buflen) const {
+  interpreterState istate = interpreter_state();
+  bool is_valid = istate->self_link() == istate;
+  intptr_t *addr = addr_of_word(offset);
+
+  // Fixed part
+  if (addr >= (intptr_t *) istate) {
+    const char *field = istate->name_of_field_at_address((address) addr);
+    if (field) {
+      if (is_valid && !strcmp(field, "_method")) {
+        istate->method()->name_and_sig_as_C_string(valuebuf, buflen);
+      }
+      else if (is_valid && !strcmp(field, "_bcp") && istate->bcp()) {
+        snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)",
+                 (intptr_t) istate->bcp(),
+                 istate->method()->bci_from(istate->bcp()));
+      }
+      snprintf(fieldbuf, buflen, "%sistate->%s",
+               field[strlen(field) - 1] == ')' ? "(": "", field);
+    }
+    else if (addr == (intptr_t *) istate) {
+      strncpy(fieldbuf, "(vtable for istate)", buflen);
+    }
+    return;
+  }
+
+  // Variable part
+  if (!is_valid)
+    return;
+
+  // JNI stuff
+  if (istate->method()->is_native() && addr < istate->stack_base()) {
+    address hA = istate->method()->signature_handler();
+    if (hA != NULL) {
+      if (hA != (address) InterpreterRuntime::slow_signature_handler) {
+        InterpreterRuntime::SignatureHandler *handler =
+          InterpreterRuntime::SignatureHandler::from_handlerAddr(hA);
+
+        intptr_t *params = istate->stack_base() - handler->argument_count();
+        if (addr >= params) {
+          int param = addr - params;
+          const char *desc = "";
+          if (param == 0)
+            desc = " (JNIEnv)";
+          else if (param == 1) {
+            if (istate->method()->is_static())
+              desc = " (mirror)";
+            else
+              desc = " (this)";
+          }
+          snprintf(fieldbuf, buflen, "parameter[%d]%s", param, desc);
+          return;
+        }
+
+        for (int i = 0; i < handler->argument_count(); i++) {
+          if (params[i] == (intptr_t) addr) {
+            snprintf(fieldbuf, buflen, "unboxed parameter[%d]", i);
+            return;
+          }
+        }
+      }
+    }
+    return;
+  }
+
+  // Monitors and stack
+  identify_vp_word(frame_index, addr,
+                   (intptr_t *) istate->monitor_base(),
+                   istate->stack_base(),
+                   fieldbuf, buflen);
+}
+
+void SharkFrame::identify_word(int   frame_index,
+                               int   offset,
+                               char* fieldbuf,
+                               char* valuebuf,
+                               int   buflen) const {
+  // Fixed part
+  switch (offset) {
+  case pc_off:
+    strncpy(fieldbuf, "pc", buflen);
+    if (method()->is_oop()) {
+      nmethod *code = method()->code();
+      if (code && code->pc_desc_at(pc())) {
+        SimpleScopeDesc ssd(code, pc());
+        snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)",
+                 (intptr_t) pc(), ssd.bci());
+      }
+    }
+    return;
+
+  case unextended_sp_off:
+    strncpy(fieldbuf, "unextended_sp", buflen);
+    return;
+
+  case method_off:
+    strncpy(fieldbuf, "method", buflen);
+    if (method()->is_oop()) {
+      method()->name_and_sig_as_C_string(valuebuf, buflen);
+    }
+    return;
+
+  case oop_tmp_off:
+    strncpy(fieldbuf, "oop_tmp", buflen);
+    return;
+  }
+
+  // Variable part
+  if (method()->is_oop()) {
+    identify_vp_word(frame_index, addr_of_word(offset),
+                     addr_of_word(header_words + 1),
+                     unextended_sp() + method()->max_stack(),
+                     fieldbuf, buflen);
+  }
+}
+
+void ZeroFrame::identify_vp_word(int       frame_index,
+                                 intptr_t* addr,
+                                 intptr_t* monitor_base,
+                                 intptr_t* stack_base,
+                                 char*     fieldbuf,
+                                 int       buflen) const {
+  // Monitors
+  if (addr >= stack_base && addr < monitor_base) {
+    int monitor_size = frame::interpreter_frame_monitor_size();
+    int last_index = (monitor_base - stack_base) / monitor_size - 1;
+    int index = last_index - (addr - stack_base) / monitor_size;
+    intptr_t monitor = (intptr_t) (
+      (BasicObjectLock *) monitor_base - 1 - index);
+    intptr_t offset = (intptr_t) addr - monitor;
+
+    if (offset == BasicObjectLock::obj_offset_in_bytes())
+      snprintf(fieldbuf, buflen, "monitor[%d]->_obj", index);
+    else if (offset ==  BasicObjectLock::lock_offset_in_bytes())
+      snprintf(fieldbuf, buflen, "monitor[%d]->_lock", index);
+
+    return;
+  }
+
+  // Expression stack
+  if (addr < stack_base) {
+    snprintf(fieldbuf, buflen, "%s[%d]",
+             frame_index == 0 ? "stack_word" : "local",
+             (int) (stack_base - addr - 1));
+    return;
+  }
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/frame_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/frame_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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
+ * 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.
+ *
+ */
+
+// A frame represents a physical stack frame on the Zero stack.
+
+ public:
+  enum {
+    pc_return_offset = 0
+  };
+
+  // Constructor
+ public:
+  frame(intptr_t* sp, intptr_t* fp);
+
+  // The sp of a Zero frame is the address of the highest word in
+  // that frame.  We keep track of the lowest address too, so the
+  // boundaries of the frame are available for debug printing.
+ private:
+  intptr_t* _fp;
+
+ public:
+  intptr_t* fp() const {
+    return _fp;
+  }
+
+#ifdef CC_INTERP
+  inline interpreterState get_interpreterState() const;
+#endif // CC_INTERP
+
+ public:
+  const ZeroFrame *zeroframe() const {
+    return (ZeroFrame *) sp();
+  }
+
+  const EntryFrame *zero_entryframe() const {
+    return zeroframe()->as_entry_frame();
+  }
+  const InterpreterFrame *zero_interpreterframe() const {
+    return zeroframe()->as_interpreter_frame();
+  }
+  const SharkFrame *zero_sharkframe() const {
+    return zeroframe()->as_shark_frame();
+  }
+
+ public:
+  frame sender_for_nonentry_frame(RegisterMap* map) const;
+
+ public:
+  void zero_print_on_error(int           index,
+                           outputStream* st,
+                           char*         buf,
+                           int           buflen) const;
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/frame_zero.inline.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/frame_zero.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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
+ * 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.
+ *
+ */
+
+// Constructors
+
+inline frame::frame() {
+  _sp = NULL;
+  _fp = NULL;
+  _pc = NULL;
+  _cb = NULL;
+  _deopt_state = unknown;
+}
+
+inline frame::frame(intptr_t* sp, intptr_t* fp) {
+  _sp = sp;
+  _fp = fp;
+  switch (zeroframe()->type()) {
+  case ZeroFrame::ENTRY_FRAME:
+    _pc = StubRoutines::call_stub_return_pc();
+    _cb = NULL;
+    break;
+
+  case ZeroFrame::INTERPRETER_FRAME:
+    _pc = NULL;
+    _cb = NULL;
+    break;
+
+  case ZeroFrame::SHARK_FRAME:
+    _pc = zero_sharkframe()->pc();
+    _cb = CodeCache::find_blob_unsafe(pc());
+    break;
+
+  case ZeroFrame::FAKE_STUB_FRAME:
+    _pc = NULL;
+    _cb = NULL;
+    break;
+
+  default:
+    ShouldNotReachHere();
+  }
+  _deopt_state = not_deoptimized;
+}
+
+// Accessors
+
+inline intptr_t* frame::sender_sp() const {
+  return (intptr_t *) zeroframe()->next();
+}
+
+inline intptr_t* frame::link() const {
+  ShouldNotCallThis();
+}
+
+#ifdef CC_INTERP
+inline interpreterState frame::get_interpreterState() const {
+  return zero_interpreterframe()->interpreter_state();
+}
+
+inline intptr_t** frame::interpreter_frame_locals_addr() const {
+  return &(get_interpreterState()->_locals);
+}
+
+inline intptr_t* frame::interpreter_frame_bcx_addr() const {
+  return (intptr_t*) &(get_interpreterState()->_bcp);
+}
+
+inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const {
+  return &(get_interpreterState()->_constants);
+}
+
+inline methodOop* frame::interpreter_frame_method_addr() const {
+  return &(get_interpreterState()->_method);
+}
+
+inline intptr_t* frame::interpreter_frame_mdx_addr() const {
+  return (intptr_t*) &(get_interpreterState()->_mdx);
+}
+
+inline intptr_t* frame::interpreter_frame_tos_address() const {
+  return get_interpreterState()->_stack + 1;
+}
+#endif // CC_INTERP
+
+inline int frame::interpreter_frame_monitor_size() {
+  return BasicObjectLock::size();
+}
+
+inline intptr_t* frame::interpreter_frame_expression_stack() const {
+  intptr_t* monitor_end = (intptr_t*) interpreter_frame_monitor_end();
+  return monitor_end - 1;
+}
+
+inline jint frame::interpreter_frame_expression_stack_direction() {
+  return -1;
+}
+
+// Return a unique id for this frame. The id must have a value where
+// we can distinguish identity and younger/older relationship. NULL
+// represents an invalid (incomparable) frame.
+inline intptr_t* frame::id() const {
+  return sp();
+}
+
+inline JavaCallWrapper* frame::entry_frame_call_wrapper() const {
+  return zero_entryframe()->call_wrapper();
+}
+
+inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
+  ShouldNotCallThis();
+}
+
+inline oop frame::saved_oop_result(RegisterMap* map) const {
+  ShouldNotCallThis();
+}
+
+inline bool frame::is_older(intptr_t* id) const {
+  ShouldNotCallThis();
+}
+
+inline intptr_t* frame::entry_frame_argument_at(int offset) const {
+  ShouldNotCallThis();
+}
+
+inline intptr_t* frame::unextended_sp() const {
+  if (zeroframe()->is_shark_frame())
+    return zero_sharkframe()->unextended_sp();
+  else
+    return (intptr_t *) -1;
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/globalDefinitions_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/globalDefinitions_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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 <ffi.h>
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/globals_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/globals_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008, 2009, 2010 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.
+ *
+ */
+
+// Set the default values for platform dependent flags used by the
+// runtime system.  See globals.hpp for details of what they do.
+
+define_pd_global(bool,  ConvertSleepToYield,  true);
+define_pd_global(bool,  ShareVtableStubs,     true);
+define_pd_global(bool,  CountInterpCalls,     true);
+define_pd_global(bool,  NeedsDeoptSuspend,    false);
+
+define_pd_global(bool,  ImplicitNullChecks,   true);
+define_pd_global(bool,  UncommonNullCast,     true);
+
+define_pd_global(intx,  CodeEntryAlignment,   32);
+define_pd_global(intx,  InlineFrequencyCount, 100);
+define_pd_global(intx,  PreInflateSpin,       10);
+
+define_pd_global(intx,  StackYellowPages,     2);
+define_pd_global(intx,  StackRedPages,        1);
+define_pd_global(intx,  StackShadowPages,     5 LP64_ONLY(+1) DEBUG_ONLY(+3));
+
+define_pd_global(bool,  RewriteBytecodes,     true);
+define_pd_global(bool,  RewriteFrequentPairs, true);
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/icBuffer_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/icBuffer_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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/_icBuffer_zero.cpp.incl"
+
+int InlineCacheBuffer::ic_stub_code_size() {
+  // NB set this once the functions below are implemented
+  return 4;
+}
+
+void InlineCacheBuffer::assemble_ic_buffer_code(address code_begin,
+                                                oop cached_oop,
+                                                address entry_point) {
+  // NB ic_stub_code_size() must return the size of the code we generate
+  ShouldNotCallThis();
+}
+
+address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
+  // NB ic_stub_code_size() must return the size of the code we generate
+  ShouldNotCallThis();
+}
+
+oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) {
+  // NB ic_stub_code_size() must return the size of the code we generate
+  ShouldNotCallThis();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/icache_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/icache_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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/_icache_zero.cpp.incl"
+
+void ICacheStubGenerator::generate_icache_flush(
+  ICache::flush_icache_stub_t* flush_icache_stub) {
+  ShouldNotCallThis();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/icache_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/icache_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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.
+ *
+ */
+
+// Interface for updating the instruction cache.  Whenever the VM
+// modifies code, part of the processor instruction cache potentially
+// has to be flushed.  This implementation is empty: Zero never deals
+// with code, and LLVM handles cache flushing for Shark.
+
+class ICache : public AbstractICache {
+ public:
+  static void initialize() {}
+  static void invalidate_word(address addr) {}
+  static void invalidate_range(address start, int nbytes) {}
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/interp_masm_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/interp_masm_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/interp_masm_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/interp_masm_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+// This file specializes the assember with interpreter-specific macros
+
+class InterpreterMacroAssembler : public MacroAssembler {
+ public:
+  InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {}
+
+ public:
+  RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
+                                        Register  tmp,
+                                        int       offset) {
+    ShouldNotCallThis();
+  }
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/interpreterFrame_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/interpreterFrame_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#ifdef CC_INTERP
+// |  ...               |
+// +--------------------+  ------------------
+// | stack slot n-1     |       low addresses
+// |  ...               |
+// | stack slot 0       |
+// | monitor 0 (maybe)  |
+// |  ...               |
+// | interpreter state  |
+// |  ...               |
+// | frame_type         |
+// | next_frame         |      high addresses
+// +--------------------+  ------------------
+// |  ...               |
+
+class InterpreterFrame : public ZeroFrame {
+  friend class AbstractInterpreter;
+
+ private:
+  InterpreterFrame() : ZeroFrame() {
+    ShouldNotCallThis();
+  }
+
+ protected:
+  enum Layout {
+    istate_off = jf_header_words +
+      (align_size_up_(sizeof(BytecodeInterpreter),
+                      wordSize) >> LogBytesPerWord) - 1,
+    header_words
+  };
+
+ public:
+  static InterpreterFrame *build(ZeroStack*      stack,
+                                 const methodOop method,
+                                 JavaThread*     thread);
+  static InterpreterFrame *build(ZeroStack* stack, int size);
+
+ public:
+  interpreterState interpreter_state() const {
+    return (interpreterState) addr_of_word(istate_off);
+  }
+
+ public:
+  void identify_word(int   frame_index,
+                     int   offset,
+                     char* fieldbuf,
+                     char* valuebuf,
+                     int   buflen) const;
+};
+#endif // CC_INTERP
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/interpreterGenerator_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/interpreterGenerator_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,37 @@
+/*
+ * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+  // Generation of Interpreter
+  //
+  friend class AbstractInterpreterGenerator;
+
+ private:
+  address generate_normal_entry(bool synchronized);
+  address generate_native_entry(bool synchronized);
+  address generate_abstract_entry();
+  address generate_math_entry(AbstractInterpreter::MethodKind kind);
+  address generate_empty_entry();
+  address generate_accessor_entry();
+  address generate_method_handle_entry();
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/interpreterRT_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/interpreterRT_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_interpreterRT_zero.cpp.incl"
+
+void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_int() {
+  push(T_INT);
+  _cif->nargs++;
+}
+
+void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_long() {
+  push(T_LONG);
+  _cif->nargs++;
+}
+
+void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_float() {
+  push(T_FLOAT);
+  _cif->nargs++;
+}
+
+void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_double() {
+  push(T_DOUBLE);
+  _cif->nargs++;
+}
+
+void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_object() {
+  push(T_OBJECT);
+  _cif->nargs++;
+}
+
+void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
+  ffi_type *ftype;
+  switch (type) {
+  case T_VOID:
+    ftype = &ffi_type_void;
+    break;
+
+  case T_BOOLEAN:
+    ftype = &ffi_type_uint8;
+    break;
+
+  case T_CHAR:
+    ftype = &ffi_type_uint16;
+    break;
+
+  case T_BYTE:
+    ftype = &ffi_type_sint8;
+    break;
+
+  case T_SHORT:
+    ftype = &ffi_type_sint16;
+    break;
+
+  case T_INT:
+    ftype = &ffi_type_sint32;
+    break;
+
+  case T_LONG:
+    ftype = &ffi_type_sint64;
+    break;
+
+  case T_FLOAT:
+    ftype = &ffi_type_float;
+    break;
+
+  case T_DOUBLE:
+    ftype = &ffi_type_double;
+    break;
+
+  case T_OBJECT:
+  case T_ARRAY:
+    ftype = &ffi_type_pointer;
+    break;
+
+  default:
+    ShouldNotReachHere();
+  }
+  push((intptr_t) ftype);
+}
+
+// For fast signature handlers the "signature handler" is generated
+// into a temporary buffer.  It is then copied to its final location,
+// and pd_set_handler is called on it.  We have this two stage thing
+// to accomodate this.
+
+void InterpreterRuntime::SignatureHandlerGeneratorBase::generate(
+  uint64_t fingerprint) {
+
+  // Build the argument types list
+  pass_object();
+  if (method()->is_static())
+    pass_object();
+  iterate(fingerprint);
+
+  // Tack on the result type
+  push(method()->result_type());
+}
+
+void InterpreterRuntime::SignatureHandler::finalize() {
+  ffi_status status =
+    ffi_prep_cif(cif(),
+                 FFI_DEFAULT_ABI,
+                 argument_count(),
+                 result_type(),
+                 argument_types());
+
+  assert(status == FFI_OK, "should be");
+}
+
+IRT_ENTRY(address,
+          InterpreterRuntime::slow_signature_handler(JavaThread* thread,
+                                                     methodOop   method,
+                                                     intptr_t*   unused1,
+                                                     intptr_t*   unused2))
+  ZeroStack *stack = thread->zero_stack();
+
+  int required_words =
+    (align_size_up(sizeof(ffi_cif), wordSize) >> LogBytesPerWord) +
+    (method->is_static() ? 2 : 1) + method->size_of_parameters() + 1;
+  if (required_words > stack->available_words()) {
+    Unimplemented();
+  }
+
+  intptr_t *buf = (intptr_t *) stack->alloc(required_words * wordSize);
+  SlowSignatureHandlerGenerator sshg(methodHandle(thread, method), buf);
+  sshg.generate(UCONST64(-1));
+
+  SignatureHandler *handler = sshg.handler();
+  handler->finalize();
+
+  return (address) handler;
+IRT_END
+
+void SignatureHandlerLibrary::pd_set_handler(address handlerAddr) {
+  InterpreterRuntime::SignatureHandler *handler =
+    InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
+
+  handler->finalize();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/interpreterRT_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/interpreterRT_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+class SignatureHandler {
+ public:
+  static SignatureHandler *from_handlerAddr(address handlerAddr) {
+    return (SignatureHandler *) handlerAddr;
+  }
+
+ public:
+  ffi_cif* cif() const {
+    return (ffi_cif *) this;
+  }
+
+  int argument_count() const {
+    return cif()->nargs;
+  }
+
+  ffi_type** argument_types() const {
+    return (ffi_type**) (cif() + 1);
+  }
+
+  ffi_type* argument_type(int i) const {
+    return argument_types()[i];
+  }
+
+  ffi_type* result_type() const {
+    return *(argument_types() + argument_count());
+  }
+
+ protected:
+  friend class InterpreterRuntime;
+  friend class SignatureHandlerLibrary;
+
+  void finalize();
+};
+
+class SignatureHandlerGeneratorBase : public NativeSignatureIterator {
+ private:
+  ffi_cif* _cif;
+
+ protected:
+  SignatureHandlerGeneratorBase(methodHandle method, ffi_cif *cif)
+    : NativeSignatureIterator(method), _cif(cif) {
+    _cif->nargs = 0;
+  }
+
+  ffi_cif *cif() const {
+    return _cif;
+  }
+
+ public:
+  void generate(uint64_t fingerprint);
+
+ private:
+  void pass_int();
+  void pass_long();
+  void pass_float();
+  void pass_double();
+  void pass_object();
+
+ private:
+  void push(BasicType type);
+  virtual void push(intptr_t value) = 0;
+};
+
+class SignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
+ private:
+  CodeBuffer* _cb;
+
+ public:
+  SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer)
+    : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->code_end()),
+      _cb(buffer) {
+    _cb->set_code_end((address) (cif() + 1));
+  }
+
+ private:
+  void push(intptr_t value) {
+    intptr_t *dst = (intptr_t *) _cb->code_end();
+    _cb->set_code_end((address) (dst + 1));
+    *dst = value;
+  }
+};
+
+class SlowSignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
+ private:
+  intptr_t *_dst;
+
+ public:
+  SlowSignatureHandlerGenerator(methodHandle method, intptr_t* buf)
+    : SignatureHandlerGeneratorBase(method, (ffi_cif *) buf) {
+    _dst = (intptr_t *) (cif() + 1);
+  }
+
+ private:
+  void push(intptr_t value) {
+    *(_dst++) = value;
+  }
+
+ public:
+  SignatureHandler *handler() const {
+    return (SignatureHandler *) cif();
+  }
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/interpreter_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/interpreter_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008, 2009, 2010 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/_interpreter_zero.cpp.incl"
+
+address AbstractInterpreterGenerator::generate_slow_signature_handler() {
+  _masm->advance(1);
+  return (address) InterpreterRuntime::slow_signature_handler;
+}
+
+address InterpreterGenerator::generate_math_entry(
+    AbstractInterpreter::MethodKind kind) {
+  if (!InlineIntrinsics)
+    return NULL;
+
+  Unimplemented();
+}
+
+address InterpreterGenerator::generate_abstract_entry() {
+  return ShouldNotCallThisEntry();
+}
+
+address InterpreterGenerator::generate_method_handle_entry() {
+  return ShouldNotCallThisEntry();
+}
+
+bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+  return true;
+}
+
+int AbstractInterpreter::size_activation(methodOop method,
+                                         int tempcount,
+                                         int popframe_extra_args,
+                                         int moncount,
+                                         int callee_param_count,
+                                         int callee_locals,
+                                         bool is_top_frame) {
+  return layout_activation(method,
+                           tempcount,
+                           popframe_extra_args,
+                           moncount,
+                           callee_param_count,
+                           callee_locals,
+                           (frame*) NULL,
+                           (frame*) NULL,
+                           is_top_frame);
+}
+
+void Deoptimization::unwind_callee_save_values(frame* f,
+                                               vframeArray* vframe_array) {
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/interpreter_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/interpreter_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+ public:
+  static void invoke_method(methodOop method, address entry_point, TRAPS) {
+    ((ZeroEntry *) entry_point)->invoke(method, THREAD);
+  }
+  static void invoke_osr(methodOop method,
+                         address   entry_point,
+                         address   osr_buf,
+                         TRAPS) {
+    ((ZeroEntry *) entry_point)->invoke_osr(method, osr_buf, THREAD);
+  }
+
+ public:
+  static int expr_index_at(int i) {
+    return stackElementWords() * i;
+  }
+  static int expr_tag_index_at(int i) {
+    assert(TaggedStackInterpreter, "should not call this");
+    Unimplemented();
+  }
+
+  static int expr_offset_in_bytes(int i) {
+    return stackElementSize() * i;
+  }
+  static int expr_tag_offset_in_bytes(int i) {
+    assert(TaggedStackInterpreter, "should not call this");
+    Unimplemented();
+  }
+
+  static int local_index_at(int i) {
+    assert(i <= 0, "local direction already negated");
+    return stackElementWords() * i + (value_offset_in_bytes() / wordSize);
+  }
+  static int local_tag_index_at(int i) {
+    assert(TaggedStackInterpreter, "should not call this");
+    Unimplemented();
+  }
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/javaFrameAnchor_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/javaFrameAnchor_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+ public:
+  // Each arch must define reset, save, restore
+  // These are used by objects that only care about:
+  //  1 - initializing a new state (thread creation, javaCalls)
+  //  2 - saving a current state (javaCalls)
+  //  3 - restoring an old state (javaCalls)
+
+  void clear() {
+    // clearing _last_Java_sp must be first
+    _last_Java_sp = NULL;
+    // fence?
+    _last_Java_pc = NULL;
+  }
+
+  void copy(JavaFrameAnchor* src) {
+    // In order to make sure the transition state is valid for "this"
+    // We must clear _last_Java_sp before copying the rest of the new
+    // data
+    //
+    // Hack Alert: Temporary bugfix for 4717480/4721647 To act like
+    // previous version (pd_cache_state) don't NULL _last_Java_sp
+    // unless the value is changing
+    //
+    if (_last_Java_sp != src->_last_Java_sp)
+      _last_Java_sp = NULL;
+
+    _last_Java_pc = src->_last_Java_pc;
+    // Must be last so profiler will always see valid frame if
+    // has_last_frame() is true
+    _last_Java_sp = src->_last_Java_sp;
+  }
+
+  bool walkable() {
+    return true;
+  }
+
+  void make_walkable(JavaThread* thread) {
+    // nothing to do
+  }
+
+  intptr_t* last_Java_sp() const {
+    return _last_Java_sp;
+  }
+
+  void set_last_Java_sp(intptr_t* sp) {
+    _last_Java_sp = sp;
+  }
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/jniFastGetField_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/jniFastGetField_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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/_jniFastGetField_zero.cpp.incl"
+
+address JNI_FastGetField::generate_fast_get_boolean_field() {
+  return (address) -1;
+}
+
+address JNI_FastGetField::generate_fast_get_byte_field() {
+  return (address) -1;
+}
+
+address JNI_FastGetField::generate_fast_get_char_field() {
+  return (address) -1;
+}
+
+address JNI_FastGetField::generate_fast_get_short_field() {
+  return (address) -1;
+}
+
+address JNI_FastGetField::generate_fast_get_int_field() {
+  return (address) -1;
+}
+
+address JNI_FastGetField::generate_fast_get_long_field() {
+  return (address) -1;
+}
+
+address JNI_FastGetField::generate_fast_get_float_field() {
+  return (address) -1;
+}
+
+address JNI_FastGetField::generate_fast_get_double_field() {
+  return (address) -1;
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/jniTypes_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/jniTypes_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,108 @@
+/*
+ * Copyright 1998-2002 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.
+ *
+ */
+
+// This file holds platform-dependent routines used to write primitive jni
+// types to the array of arguments passed into JavaCalls::call
+
+class JNITypes : AllStatic {
+  // These functions write a java primitive type (in native format)
+  // to a java stack slot array to be passed as an argument to JavaCalls:calls.
+  // I.e., they are functionally 'push' operations if they have a 'pos'
+  // formal parameter.  Note that jlong's and jdouble's are written
+  // _in reverse_ of the order in which they appear in the interpreter
+  // stack.  This is because call stubs (see stubGenerator_zero.cpp)
+  // reverse the argument list constructed by JavaCallArguments (see
+  // javaCalls.hpp).
+
+private:
+  // Helper routines.
+  static inline void    put_int2 (jint *from, jint *to)           { to[0] = from[0]; to[1] = from[1]; }
+  static inline void    put_int2 (jint *from, jint *to, int& pos) { put_int2 (from, (jint *)((intptr_t *)to + pos)); pos += 2; }
+  static inline void    put_int2r(jint *from, jint *to)           { to[0] = from[1]; to[1] = from[0]; }
+  static inline void    put_int2r(jint *from, jint *to, int& pos) { put_int2r(from, (jint *)((intptr_t *)to + pos)); pos += 2; }
+
+public:
+  // Ints are stored in native format in one JavaCallArgument slot at *to.
+  static inline void    put_int(jint  from, intptr_t *to)               { *(jint *)(to +   0  ) =  from; }
+  static inline void    put_int(jint  from, intptr_t *to, int& pos)     { *(jint *)(to + pos++) =  from; }
+  static inline void    put_int(jint *from, intptr_t *to, int& pos)     { *(jint *)(to + pos++) = *from; }
+
+#ifdef _LP64
+  // Longs are stored in native format in one JavaCallArgument slot at *(to+1).
+  static inline void    put_long(jlong  from, intptr_t *to)             { *(jlong *)(to + 1 +   0) =  from; }
+  static inline void    put_long(jlong  from, intptr_t *to, int& pos)   { *(jlong *)(to + 1 + pos) =  from; pos += 2; }
+  static inline void    put_long(jlong *from, intptr_t *to, int& pos)   { *(jlong *)(to + 1 + pos) = *from; pos += 2; }
+#else
+  // Longs are stored in reversed native word format in two JavaCallArgument slots at *to.
+  // The high half is in *(to+1) and the low half in *to.
+  static inline void    put_long(jlong  from, intptr_t *to)            { put_int2r((jint *)&from, (jint *)to); }
+  static inline void    put_long(jlong  from, intptr_t *to, int& pos)  { put_int2r((jint *)&from, (jint *)to, pos); }
+  static inline void    put_long(jlong *from, intptr_t *to, int& pos)  { put_int2r((jint *) from, (jint *)to, pos); }
+#endif
+
+  // Oops are stored in native format in one JavaCallArgument slot at *to.
+  static inline void    put_obj(oop  from, intptr_t *to)                { *(oop *)(to +   0  ) =  from; }
+  static inline void    put_obj(oop  from, intptr_t *to, int& pos)      { *(oop *)(to + pos++) =  from; }
+  static inline void    put_obj(oop *from, intptr_t *to, int& pos)      { *(oop *)(to + pos++) = *from; }
+
+  // Floats are stored in native format in one JavaCallArgument slot at *to.
+  static inline void    put_float(jfloat  from, intptr_t *to)           { *(jfloat *)(to +   0  ) =  from; }
+  static inline void    put_float(jfloat  from, intptr_t *to, int& pos) { *(jfloat *)(to + pos++) =  from; }
+  static inline void    put_float(jfloat *from, intptr_t *to, int& pos) { *(jfloat *)(to + pos++) = *from; }
+
+#ifdef _LP64
+  // Doubles are stored in native word format in one JavaCallArgument slot at *(to+1).
+  static inline void    put_double(jdouble  from, intptr_t *to)           { *(jdouble *)(to + 1 +   0) =  from; }
+  static inline void    put_double(jdouble  from, intptr_t *to, int& pos) { *(jdouble *)(to + 1 + pos) =  from; pos += 2; }
+  static inline void    put_double(jdouble *from, intptr_t *to, int& pos) { *(jdouble *)(to + 1 + pos) = *from; pos += 2; }
+#else
+  // Doubles are stored in reversed native word format in two JavaCallArgument slots at *to.
+  static inline void    put_double(jdouble  from, intptr_t *to)           { put_int2r((jint *)&from, (jint *)to); }
+  static inline void    put_double(jdouble  from, intptr_t *to, int& pos) { put_int2r((jint *)&from, (jint *)to, pos); }
+  static inline void    put_double(jdouble *from, intptr_t *to, int& pos) { put_int2r((jint *) from, (jint *)to, pos); }
+#endif
+
+  // The get_xxx routines, on the other hand, actually _do_ fetch
+  // java primitive types from the interpreter stack.
+  static inline jint    get_int(intptr_t *from)         { return *(jint *)from; }
+
+#ifdef _LP64
+  static inline jlong   get_long(intptr_t *from)        { return *(jlong *)from; }
+#else
+  static inline jlong   get_long(intptr_t *from)        { return ((jlong)(*(  signed int *)((jint *)from    )) << 32) |
+                                                                 ((jlong)(*(unsigned int *)((jint *)from + 1)) <<  0); }
+#endif
+
+  static inline oop     get_obj(intptr_t *from)         { return *(oop *)from; }
+  static inline jfloat  get_float(intptr_t *from)       { return *(jfloat *)from; }
+
+#ifdef _LP64
+  static inline jdouble get_double(intptr_t *from)      { return *(jdouble *)from; }
+#else
+  static inline jdouble get_double(intptr_t *from)      { jlong jl = ((jlong)(*(  signed int *)((jint *)from    )) << 32) |
+                                                                     ((jlong)(*(unsigned int *)((jint *)from + 1)) <<  0);
+                                                          return *(jdouble *)&jl; }
+#endif
+
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/jni_zero.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/jni_zero.h	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright 1997-2004 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+#define JNIEXPORT
+#define JNIIMPORT
+#define JNICALL
+
+typedef int jint;
+typedef signed char jbyte;
+
+#ifdef _LP64
+typedef long jlong;
+#else
+typedef long long jlong;
+#endif
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/methodHandles_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/methodHandles_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/nativeInst_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/nativeInst_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_nativeInst_zero.cpp.incl"
+
+// This method is called by nmethod::make_not_entrant_or_zombie to
+// insert a jump to SharedRuntime::get_handle_wrong_method_stub()
+// (dest) at the start of a compiled method (verified_entry) to avoid
+// a race where a method is invoked while being made non-entrant.
+//
+// In Shark, verified_entry is a pointer to a SharkEntry.  We can
+// handle this simply by changing it's entry point to point at the
+// interpreter.  This only works because the interpreter and Shark
+// calling conventions are the same.
+
+void NativeJump::patch_verified_entry(address entry,
+                                      address verified_entry,
+                                      address dest) {
+  assert(dest == SharedRuntime::get_handle_wrong_method_stub(), "should be");
+
+#ifdef CC_INTERP
+  ((ZeroEntry*) verified_entry)->set_entry_point(
+    (address) CppInterpreter::normal_entry);
+#else
+  Unimplemented();
+#endif // CC_INTERP
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/nativeInst_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/nativeInst_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+// We have interfaces for the following instructions:
+// - NativeInstruction
+// - - NativeCall
+// - - NativeMovConstReg
+// - - NativeMovConstRegPatching
+// - - NativeJump
+// - - NativeIllegalOpCode
+// - - NativeReturn
+// - - NativeReturnX (return with argument)
+// - - NativePushConst
+// - - NativeTstRegMem
+
+// The base class for different kinds of native instruction abstractions.
+// Provides the primitive operations to manipulate code relative to this.
+
+class NativeInstruction VALUE_OBJ_CLASS_SPEC {
+ public:
+  bool is_jump() {
+    ShouldNotCallThis();
+  }
+
+  bool is_safepoint_poll() {
+    ShouldNotCallThis();
+  }
+};
+
+inline NativeInstruction* nativeInstruction_at(address address) {
+  ShouldNotCallThis();
+}
+
+class NativeCall : public NativeInstruction {
+ public:
+  enum zero_specific_constants {
+    instruction_size = 0 // not used within the interpreter
+  };
+
+  address instruction_address() const {
+    ShouldNotCallThis();
+  }
+
+  address next_instruction_address() const {
+    ShouldNotCallThis();
+  }
+
+  address return_address() const {
+    ShouldNotCallThis();
+  }
+
+  address destination() const {
+    ShouldNotCallThis();
+  }
+
+  void set_destination_mt_safe(address dest) {
+    ShouldNotCallThis();
+  }
+
+  void verify_alignment() {
+    ShouldNotCallThis();
+  }
+
+  void verify() {
+    ShouldNotCallThis();
+  }
+
+  static bool is_call_before(address return_address) {
+    ShouldNotCallThis();
+  }
+};
+
+inline NativeCall* nativeCall_before(address return_address) {
+  ShouldNotCallThis();
+}
+
+inline NativeCall* nativeCall_at(address address) {
+  ShouldNotCallThis();
+}
+
+class NativeMovConstReg : public NativeInstruction {
+ public:
+  address next_instruction_address() const {
+    ShouldNotCallThis();
+  }
+
+  intptr_t data() const {
+    ShouldNotCallThis();
+  }
+
+  void set_data(intptr_t x) {
+    ShouldNotCallThis();
+  }
+};
+
+inline NativeMovConstReg* nativeMovConstReg_at(address address) {
+  ShouldNotCallThis();
+}
+
+class NativeMovRegMem : public NativeInstruction {
+ public:
+  int offset() const {
+    ShouldNotCallThis();
+  }
+
+  void set_offset(intptr_t x) {
+    ShouldNotCallThis();
+  }
+
+  void add_offset_in_bytes(int add_offset) {
+    ShouldNotCallThis();
+  }
+};
+
+inline NativeMovRegMem* nativeMovRegMem_at(address address) {
+  ShouldNotCallThis();
+}
+
+class NativeJump : public NativeInstruction {
+ public:
+  enum zero_specific_constants {
+    instruction_size = 0 // not used within the interpreter
+  };
+
+  address jump_destination() const {
+    ShouldNotCallThis();
+  }
+
+  void set_jump_destination(address dest) {
+    ShouldNotCallThis();
+  }
+
+  static void check_verified_entry_alignment(address entry,
+                                             address verified_entry) {
+  }
+
+  static void patch_verified_entry(address entry,
+                                   address verified_entry,
+                                   address dest);
+};
+
+inline NativeJump* nativeJump_at(address address) {
+  ShouldNotCallThis();
+}
+
+class NativeGeneralJump : public NativeInstruction {
+ public:
+  address jump_destination() const {
+    ShouldNotCallThis();
+  }
+
+  static void insert_unconditional(address code_pos, address entry) {
+    ShouldNotCallThis();
+  }
+
+  static void replace_mt_safe(address instr_addr, address code_buffer) {
+    ShouldNotCallThis();
+  }
+};
+
+inline NativeGeneralJump* nativeGeneralJump_at(address address) {
+  ShouldNotCallThis();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/registerMap_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/registerMap_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+  // machine-dependent implemention for register maps
+  friend class frame;
+
+ private:
+  // This is the hook for finding a register in an "well-known" location,
+  // such as a register block of a predetermined format.
+  // Since there is none, we just return NULL.
+  // See registerMap_sparc.hpp for an example of grabbing registers
+  // from register save areas of a standard layout.
+  address pd_location(VMReg reg) const { return NULL; }
+
+  // no PD state to clear or copy:
+  void pd_clear() {}
+  void pd_initialize() {}
+  void pd_initialize_from(const RegisterMap* map) {}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/register_definitions_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/register_definitions_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/register_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/register_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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/_register_zero.cpp.incl"
+
+const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers;
+const int ConcreteRegisterImpl::max_fpr =
+  ConcreteRegisterImpl::max_gpr + FloatRegisterImpl::number_of_registers;
+
+const char* RegisterImpl::name() const {
+  ShouldNotCallThis();
+}
+
+const char* FloatRegisterImpl::name() const {
+  ShouldNotCallThis();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/register_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/register_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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 VMRegImpl;
+typedef VMRegImpl* VMReg;
+
+// Use Register as shortcut
+class RegisterImpl;
+typedef RegisterImpl* Register;
+
+inline Register as_Register(int encoding) {
+  return (Register)(intptr_t) encoding;
+}
+
+// The implementation of integer registers for the zero architecture
+class RegisterImpl : public AbstractRegisterImpl {
+ public:
+  enum {
+    number_of_registers = 0
+  };
+
+  // construction
+  inline friend Register as_Register(int encoding);
+  VMReg as_VMReg();
+
+  // derived registers, offsets, and addresses
+  Register successor() const {
+    return as_Register(encoding() + 1);
+  }
+
+  // accessors
+  int encoding() const {
+    assert(is_valid(), "invalid register");
+    return (intptr_t)this;
+  }
+  bool is_valid() const {
+    return 0 <= (intptr_t) this && (intptr_t)this < number_of_registers;
+  }
+  const char* name() const;
+};
+
+// Use FloatRegister as shortcut
+class FloatRegisterImpl;
+typedef FloatRegisterImpl* FloatRegister;
+
+inline FloatRegister as_FloatRegister(int encoding) {
+  return (FloatRegister)(intptr_t) encoding;
+}
+
+// The implementation of floating point registers for the zero architecture
+class FloatRegisterImpl : public AbstractRegisterImpl {
+ public:
+  enum {
+    number_of_registers = 0
+  };
+
+  // construction
+  inline friend FloatRegister as_FloatRegister(int encoding);
+  VMReg as_VMReg();
+
+  // derived registers, offsets, and addresses
+  FloatRegister successor() const {
+    return as_FloatRegister(encoding() + 1);
+  }
+
+  // accessors
+  int encoding() const {
+    assert(is_valid(), "invalid register");
+    return (intptr_t)this;
+  }
+  bool is_valid() const {
+    return 0 <= (intptr_t) this && (intptr_t)this < number_of_registers;
+  }
+  const char* name() const;
+};
+
+class ConcreteRegisterImpl : public AbstractRegisterImpl {
+ public:
+  enum {
+    number_of_registers = RegisterImpl::number_of_registers +
+                          FloatRegisterImpl::number_of_registers
+  };
+
+  static const int max_gpr;
+  static const int max_fpr;
+};
+
+CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/relocInfo_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/relocInfo_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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/_relocInfo_zero.cpp.incl"
+
+void Relocation::pd_set_data_value(address x, intptr_t o) {
+  ShouldNotCallThis();
+}
+
+address Relocation::pd_call_destination(address orig_addr) {
+  ShouldNotCallThis();
+}
+
+void Relocation::pd_set_call_destination(address x) {
+  ShouldNotCallThis();
+}
+
+address Relocation::pd_get_address_from_code() {
+  ShouldNotCallThis();
+}
+
+address* Relocation::pd_address_in_code() {
+  // Relocations in Shark are just stored directly
+  return (address *) addr();
+}
+
+int Relocation::pd_breakpoint_size() {
+  ShouldNotCallThis();
+}
+
+void Relocation::pd_swap_in_breakpoint(address x,
+                                       short*  instrs,
+                                       int     instrlen) {
+  ShouldNotCallThis();
+}
+
+void Relocation::pd_swap_out_breakpoint(address x,
+                                        short*  instrs,
+                                        int     instrlen) {
+  ShouldNotCallThis();
+}
+
+void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src,
+                                                CodeBuffer*       dst) {
+  ShouldNotCallThis();
+}
+
+void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer* src,
+                                                       CodeBuffer*       dst) {
+  ShouldNotCallThis();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/relocInfo_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/relocInfo_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+  // machine-dependent parts of class relocInfo
+ private:
+  enum {
+    // these constants mean nothing without an assembler
+    offset_unit  =  1,
+    format_width =  1
+  };
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/sharedRuntime_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/sharedRuntime_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008, 2009, 2010 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/_sharedRuntime_zero.cpp.incl"
+
+DeoptimizationBlob *SharedRuntime::_deopt_blob;
+SafepointBlob      *SharedRuntime::_polling_page_safepoint_handler_blob;
+SafepointBlob      *SharedRuntime::_polling_page_return_handler_blob;
+RuntimeStub        *SharedRuntime::_wrong_method_blob;
+RuntimeStub        *SharedRuntime::_ic_miss_blob;
+RuntimeStub        *SharedRuntime::_resolve_opt_virtual_call_blob;
+RuntimeStub        *SharedRuntime::_resolve_virtual_call_blob;
+RuntimeStub        *SharedRuntime::_resolve_static_call_blob;
+
+int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
+                                           VMRegPair *regs,
+                                           int total_args_passed,
+                                           int is_outgoing) {
+  return 0;
+}
+
+AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(
+                        MacroAssembler *masm,
+                        int total_args_passed,
+                        int comp_args_on_stack,
+                        const BasicType *sig_bt,
+                        const VMRegPair *regs,
+                        AdapterFingerPrint *fingerprint) {
+  return AdapterHandlerLibrary::new_entry(
+    fingerprint,
+    ShouldNotCallThisStub(),
+    ShouldNotCallThisStub(),
+    ShouldNotCallThisStub());
+}
+
+nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
+                                                methodHandle method,
+                                                int total_in_args,
+                                                int comp_args_on_stack,
+                                                BasicType *in_sig_bt,
+                                                VMRegPair *in_regs,
+                                                BasicType ret_type) {
+#ifdef SHARK
+  return SharkCompiler::compiler()->generate_native_wrapper(masm,
+                                                            method,
+                                                            in_sig_bt,
+                                                            ret_type);
+#else
+  ShouldNotCallThis();
+#endif // SHARK
+}
+
+int Deoptimization::last_frame_adjust(int callee_parameters,
+                                      int callee_locals) {
+  return 0;
+}
+
+uint SharedRuntime::out_preserve_stack_slots() {
+  ShouldNotCallThis();
+}
+
+static RuntimeStub* generate_empty_runtime_stub(const char* name) {
+  CodeBuffer buffer(name, 0, 0);
+  return RuntimeStub::new_runtime_stub(name, &buffer, 0, 0, NULL, false);
+}
+
+static SafepointBlob* generate_empty_safepoint_blob() {
+  CodeBuffer buffer("handler_blob", 0, 0);
+  return SafepointBlob::create(&buffer, NULL, 0);
+}
+
+void SharedRuntime::generate_stubs() {
+  _wrong_method_blob =
+    generate_empty_runtime_stub("wrong_method_stub");
+  _ic_miss_blob =
+    generate_empty_runtime_stub("ic_miss_stub");
+  _resolve_opt_virtual_call_blob =
+    generate_empty_runtime_stub("resolve_opt_virtual_call");
+  _resolve_virtual_call_blob =
+    generate_empty_runtime_stub("resolve_virtual_call");
+  _resolve_static_call_blob =
+    generate_empty_runtime_stub("resolve_static_call");
+
+  _polling_page_safepoint_handler_blob =
+    generate_empty_safepoint_blob();
+  _polling_page_return_handler_blob =
+    generate_empty_safepoint_blob();
+}
+
+int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
+                                         VMRegPair *regs,
+                                         int total_args_passed) {
+  ShouldNotCallThis();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/sharkFrame_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/sharkFrame_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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
+ * 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.
+ *
+ */
+
+// |  ...               |
+// +--------------------+  ------------------
+// | stack slot n-1     |       low addresses
+// |  ...               |
+// | stack slot 0       |
+// | monitor m-1        |
+// |  ...               |
+// | monitor 0          |
+// | oop_tmp            |
+// | method             |
+// | unextended_sp      |
+// | pc                 |
+// | frame_type         |
+// | next_frame         |      high addresses
+// +--------------------+  ------------------
+// |  ...               |
+
+class SharkFrame : public ZeroFrame {
+  friend class SharkStack;
+
+ private:
+  SharkFrame() : ZeroFrame() {
+    ShouldNotCallThis();
+  }
+
+ protected:
+  enum Layout {
+    pc_off = jf_header_words,
+    unextended_sp_off,
+    method_off,
+    oop_tmp_off,
+    header_words
+  };
+
+ public:
+  address pc() const {
+    return (address) value_of_word(pc_off);
+  }
+
+  intptr_t* unextended_sp() const {
+    return (intptr_t *) value_of_word(unextended_sp_off);
+  }
+
+  methodOop method() const {
+    return (methodOop) value_of_word(method_off);
+  }
+
+ public:
+  void identify_word(int   frame_index,
+                     int   offset,
+                     char* fieldbuf,
+                     char* valuebuf,
+                     int   buflen) const;
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/stack_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/stack_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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
+ * 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 ZeroStack {
+ private:
+  intptr_t *_base; // the last available word
+  intptr_t *_top;  // the word past the end of the stack
+  intptr_t *_sp;   // the top word on the stack
+
+ public:
+  ZeroStack()
+    : _base(NULL), _top(NULL), _sp(NULL) {}
+
+  bool needs_setup() const {
+    return _base == NULL;
+  }
+
+  void setup(void *mem, size_t size) {
+    assert(needs_setup(), "already set up");
+    assert(!(size & WordAlignmentMask), "unaligned");
+
+    _base = (intptr_t *) mem;
+    _top  = _base + (size >> LogBytesPerWord);
+    _sp   = _top;
+  }
+  void teardown() {
+    assert(!needs_setup(), "not set up");
+    assert(_sp == _top, "stuff on stack at teardown");
+
+    _base = NULL;
+    _top  = NULL;
+    _sp   = NULL;
+  }
+
+  intptr_t *sp() const {
+    return _sp;
+  }
+  void set_sp(intptr_t *new_sp) {
+    assert(_top >= new_sp && new_sp >= _base, "bad stack pointer");
+    _sp = new_sp;
+  }
+
+  int available_words() const {
+    return _sp - _base;
+  }
+
+  void push(intptr_t value) {
+    assert(_sp > _base, "stack overflow");
+    *(--_sp) = value;
+  }
+  intptr_t pop() {
+    assert(_sp < _top, "stack underflow");
+    return *(_sp++);
+  }
+
+  void *alloc(size_t size) {
+    int count = align_size_up(size, wordSize) >> LogBytesPerWord;
+    assert(count <= available_words(), "stack overflow");
+    return _sp -= count;
+  }
+
+ public:
+  static ByteSize base_offset() {
+    return byte_offset_of(ZeroStack, _base);
+  }
+  static ByteSize top_offset() {
+    return byte_offset_of(ZeroStack, _top);
+  }
+  static ByteSize sp_offset() {
+    return byte_offset_of(ZeroStack, _sp);
+  }
+};
+
+
+class EntryFrame;
+class InterpreterFrame;
+class SharkFrame;
+class FakeStubFrame;
+
+//
+// |  ...               |
+// +--------------------+  ------------------
+// |  ...               |       low addresses
+// | frame_type         |
+// | next_frame         |      high addresses
+// +--------------------+  ------------------
+// |  ...               |
+
+class ZeroFrame {
+  friend class frame;
+  friend class ZeroStackPrinter;
+
+ protected:
+  ZeroFrame() {
+    ShouldNotCallThis();
+  }
+
+  enum Layout {
+    next_frame_off,
+    frame_type_off,
+    jf_header_words
+  };
+
+  enum FrameType {
+    ENTRY_FRAME = 1,
+    INTERPRETER_FRAME,
+    SHARK_FRAME,
+    FAKE_STUB_FRAME
+  };
+
+ protected:
+  intptr_t *addr_of_word(int offset) const {
+    return (intptr_t *) this - offset;
+  }
+  intptr_t value_of_word(int offset) const {
+    return *addr_of_word(offset);
+  }
+
+ public:
+  ZeroFrame *next() const {
+    return (ZeroFrame *) value_of_word(next_frame_off);
+  }
+
+ protected:
+  FrameType type() const {
+    return (FrameType) value_of_word(frame_type_off);
+  }
+
+ public:
+  bool is_entry_frame() const {
+    return type() == ENTRY_FRAME;
+  }
+  bool is_interpreter_frame() const {
+    return type() == INTERPRETER_FRAME;
+  }
+  bool is_shark_frame() const {
+    return type() == SHARK_FRAME;
+  }
+  bool is_fake_stub_frame() const {
+    return type() == FAKE_STUB_FRAME;
+  }
+
+ public:
+  EntryFrame *as_entry_frame() const {
+    assert(is_entry_frame(), "should be");
+    return (EntryFrame *) this;
+  }
+  InterpreterFrame *as_interpreter_frame() const {
+    assert(is_interpreter_frame(), "should be");
+    return (InterpreterFrame *) this;
+  }
+  SharkFrame *as_shark_frame() const {
+    assert(is_shark_frame(), "should be");
+    return (SharkFrame *) this;
+  }
+  FakeStubFrame *as_fake_stub_frame() const {
+    assert(is_fake_stub_frame(), "should be");
+    return (FakeStubFrame *) this;
+  }
+
+ public:
+  void identify_word(int   frame_index,
+                     int   offset,
+                     char* fieldbuf,
+                     char* valuebuf,
+                     int   buflen) const;
+
+ protected:
+  void identify_vp_word(int       frame_index,
+                        intptr_t* addr,
+                        intptr_t* monitor_base,
+                        intptr_t* stack_base,
+                        char*     fieldbuf,
+                        int       buflen) const;
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/stubGenerator_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/stubGenerator_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_stubGenerator_zero.cpp.incl"
+
+// Declaration and definition of StubGenerator (no .hpp file).
+// For a more detailed description of the stub routine structure
+// see the comment in stubRoutines.hpp
+
+class StubGenerator: public StubCodeGenerator {
+ private:
+  // The call stub is used to call Java from C
+  static void call_stub(
+    JavaCallWrapper *call_wrapper,
+    intptr_t*        result,
+    BasicType        result_type,
+    methodOop        method,
+    address          entry_point,
+    intptr_t*        parameters,
+    int              parameter_words,
+    TRAPS) {
+    JavaThread *thread = (JavaThread *) THREAD;
+    ZeroStack *stack = thread->zero_stack();
+
+    // Make sure we have no pending exceptions
+    assert(!HAS_PENDING_EXCEPTION, "call_stub called with pending exception");
+
+    // Set up the stack if necessary
+    bool stack_needs_teardown = false;
+    if (stack->needs_setup()) {
+      size_t stack_used = thread->stack_base() - (address) &stack_used;
+      size_t stack_free = thread->stack_size() - stack_used;
+      size_t zero_stack_size = align_size_down(stack_free / 2, wordSize);
+
+      stack->setup(alloca(zero_stack_size), zero_stack_size);
+      stack_needs_teardown = true;
+    }
+
+    // Allocate and initialize our frame
+    thread->push_zero_frame(
+      EntryFrame::build(stack, parameters, parameter_words, call_wrapper));
+
+    // Make the call
+    Interpreter::invoke_method(method, entry_point, THREAD);
+
+    // Store result depending on type
+    if (!HAS_PENDING_EXCEPTION) {
+      switch (result_type) {
+      case T_INT:
+        *(jint *) result = *(jint *) stack->sp();
+        break;
+      case T_LONG:
+        *(jlong *) result = *(jlong *) stack->sp();
+        break;
+      case T_FLOAT:
+        *(jfloat *) result = *(jfloat *) stack->sp();
+        break;
+      case T_DOUBLE:
+        *(jdouble *) result = *(jdouble *) stack->sp();
+        break;
+      case T_OBJECT:
+        *(oop *) result = *(oop *) stack->sp();
+        break;
+      default:
+        ShouldNotReachHere();
+      }
+    }
+
+    // Unwind our frame
+    thread->pop_zero_frame();
+
+    // Tear down the stack if necessary
+    if (stack_needs_teardown)
+      stack->teardown();
+  }
+
+  // These stubs get called from some dumb test routine.
+  // I'll write them properly when they're called from
+  // something that's actually doing something.
+  static void fake_arraycopy_stub(address src, address dst, int count) {
+    assert(count == 0, "huh?");
+  }
+
+  void generate_arraycopy_stubs() {
+    // Call the conjoint generation methods immediately after
+    // the disjoint ones so that short branches from the former
+    // to the latter can be generated.
+    StubRoutines::_jbyte_disjoint_arraycopy  = (address) fake_arraycopy_stub;
+    StubRoutines::_jbyte_arraycopy           = (address) fake_arraycopy_stub;
+
+    StubRoutines::_jshort_disjoint_arraycopy = (address) fake_arraycopy_stub;
+    StubRoutines::_jshort_arraycopy          = (address) fake_arraycopy_stub;
+
+    StubRoutines::_jint_disjoint_arraycopy   = (address) fake_arraycopy_stub;
+    StubRoutines::_jint_arraycopy            = (address) fake_arraycopy_stub;
+
+    StubRoutines::_jlong_disjoint_arraycopy  = (address) fake_arraycopy_stub;
+    StubRoutines::_jlong_arraycopy           = (address) fake_arraycopy_stub;
+
+    StubRoutines::_oop_disjoint_arraycopy    = ShouldNotCallThisStub();
+    StubRoutines::_oop_arraycopy             = ShouldNotCallThisStub();
+
+    StubRoutines::_checkcast_arraycopy       = ShouldNotCallThisStub();
+    StubRoutines::_unsafe_arraycopy          = ShouldNotCallThisStub();
+    StubRoutines::_generic_arraycopy         = ShouldNotCallThisStub();
+
+    // We don't generate specialized code for HeapWord-aligned source
+    // arrays, so just use the code we've already generated
+    StubRoutines::_arrayof_jbyte_disjoint_arraycopy =
+      StubRoutines::_jbyte_disjoint_arraycopy;
+    StubRoutines::_arrayof_jbyte_arraycopy =
+      StubRoutines::_jbyte_arraycopy;
+
+    StubRoutines::_arrayof_jshort_disjoint_arraycopy =
+      StubRoutines::_jshort_disjoint_arraycopy;
+    StubRoutines::_arrayof_jshort_arraycopy =
+      StubRoutines::_jshort_arraycopy;
+
+    StubRoutines::_arrayof_jint_disjoint_arraycopy =
+      StubRoutines::_jint_disjoint_arraycopy;
+    StubRoutines::_arrayof_jint_arraycopy =
+      StubRoutines::_jint_arraycopy;
+
+    StubRoutines::_arrayof_jlong_disjoint_arraycopy =
+      StubRoutines::_jlong_disjoint_arraycopy;
+    StubRoutines::_arrayof_jlong_arraycopy =
+      StubRoutines::_jlong_arraycopy;
+
+    StubRoutines::_arrayof_oop_disjoint_arraycopy =
+      StubRoutines::_oop_disjoint_arraycopy;
+    StubRoutines::_arrayof_oop_arraycopy =
+      StubRoutines::_oop_arraycopy;
+  }
+
+  void generate_initial() {
+    // Generates all stubs and initializes the entry points
+
+    // entry points that exist in all platforms Note: This is code
+    // that could be shared among different platforms - however the
+    // benefit seems to be smaller than the disadvantage of having a
+    // much more complicated generator structure. See also comment in
+    // stubRoutines.hpp.
+
+    StubRoutines::_forward_exception_entry   = ShouldNotCallThisStub();
+    StubRoutines::_call_stub_entry           = (address) call_stub;
+    StubRoutines::_catch_exception_entry     = ShouldNotCallThisStub();
+
+    // atomic calls
+    StubRoutines::_atomic_xchg_entry         = ShouldNotCallThisStub();
+    StubRoutines::_atomic_xchg_ptr_entry     = ShouldNotCallThisStub();
+    StubRoutines::_atomic_cmpxchg_entry      = ShouldNotCallThisStub();
+    StubRoutines::_atomic_cmpxchg_ptr_entry  = ShouldNotCallThisStub();
+    StubRoutines::_atomic_cmpxchg_long_entry = ShouldNotCallThisStub();
+    StubRoutines::_atomic_add_entry          = ShouldNotCallThisStub();
+    StubRoutines::_atomic_add_ptr_entry      = ShouldNotCallThisStub();
+    StubRoutines::_fence_entry               = ShouldNotCallThisStub();
+
+    // amd64 does this here, sparc does it in generate_all()
+    StubRoutines::_handler_for_unsafe_access_entry =
+      ShouldNotCallThisStub();
+  }
+
+  void generate_all() {
+    // Generates all stubs and initializes the entry points
+
+    // These entry points require SharedInfo::stack0 to be set up in
+    // non-core builds and need to be relocatable, so they each
+    // fabricate a RuntimeStub internally.
+    StubRoutines::_throw_AbstractMethodError_entry =
+      ShouldNotCallThisStub();
+
+    StubRoutines::_throw_ArithmeticException_entry =
+      ShouldNotCallThisStub();
+
+    StubRoutines::_throw_NullPointerException_entry =
+      ShouldNotCallThisStub();
+
+    StubRoutines::_throw_NullPointerException_at_call_entry =
+      ShouldNotCallThisStub();
+
+    StubRoutines::_throw_StackOverflowError_entry =
+      ShouldNotCallThisStub();
+
+    // support for verify_oop (must happen after universe_init)
+    StubRoutines::_verify_oop_subroutine_entry =
+      ShouldNotCallThisStub();
+
+    // arraycopy stubs used by compilers
+    generate_arraycopy_stubs();
+  }
+
+ public:
+  StubGenerator(CodeBuffer* code, bool all) : StubCodeGenerator(code) {
+    if (all) {
+      generate_all();
+    } else {
+      generate_initial();
+    }
+  }
+};
+
+void StubGenerator_generate(CodeBuffer* code, bool all) {
+  StubGenerator g(code, all);
+}
+
+EntryFrame *EntryFrame::build(ZeroStack*       stack,
+                              const intptr_t*  parameters,
+                              int              parameter_words,
+                              JavaCallWrapper* call_wrapper) {
+  if (header_words + parameter_words > stack->available_words()) {
+    Unimplemented();
+  }
+
+  stack->push(0); // next_frame, filled in later
+  intptr_t *fp = stack->sp();
+  assert(fp - stack->sp() == next_frame_off, "should be");
+
+  stack->push(ENTRY_FRAME);
+  assert(fp - stack->sp() == frame_type_off, "should be");
+
+  stack->push((intptr_t) call_wrapper);
+  assert(fp - stack->sp() == call_wrapper_off, "should be");
+
+  for (int i = 0; i < parameter_words; i++)
+    stack->push(parameters[i]);
+
+  return (EntryFrame *) fp;
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/stubRoutines_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/stubRoutines_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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
+ * 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/_stubRoutines_zero.cpp.incl"
+
+#ifdef IA32
+address StubRoutines::x86::_call_stub_compiled_return = NULL;
+#endif // IA32
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/stubRoutines_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/stubRoutines_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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
+ * 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.
+ *
+ */
+
+  // This file holds the platform specific parts of the StubRoutines
+  // definition. See stubRoutines.hpp for a description on how to
+  // extend it.
+
+ public:
+  static address call_stub_return_pc() {
+    return (address) -1;
+  }
+
+  static bool returns_to_call_stub(address return_pc) {
+    return return_pc == call_stub_return_pc();
+  }
+
+  enum platform_dependent_constants {
+    code_size1 = 0,      // The assembler will fail with a guarantee
+    code_size2 = 0       // if these are too small.  Simply increase
+  };                     // them if that happens.
+
+#ifdef IA32
+  class x86 {
+    friend class VMStructs;
+
+   private:
+    static address _call_stub_compiled_return;
+  };
+#endif // IA32
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/templateInterpreter_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/templateInterpreter_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/templateInterpreter_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/templateInterpreter_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/templateTable_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/templateTable_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/templateTable_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/templateTable_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/vmStructs_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/vmStructs_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+// These are the CPU-specific fields, types and integer
+// constants required by the Serviceability Agent. This file is
+// referenced by vmStructs.cpp.
+
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+
+  /* NOTE that we do not use the last_entry() macro here; it is used  */
+  /* in vmStructs_<os>_<cpu>.hpp's VM_STRUCTS_OS_CPU macro (and must  */
+  /* be present there)                                                */
+
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+
+  /* NOTE that we do not use the last_entry() macro here; it is used  */
+  /* in vmStructs_<os>_<cpu>.hpp's VM_TYPES_OS_CPU macro (and must    */
+  /* be present there)                                                */
+
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+
+  /* NOTE that we do not use the last_entry() macro here; it is used        */
+  /* in vmStructs_<os>_<cpu>.hpp's VM_INT_CONSTANTS_OS_CPU macro (and must  */
+  /* be present there)                                                      */
+
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+
+  /* NOTE that we do not use the last_entry() macro here; it is used         */
+  /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must  */
+  /* be present there)                                                       */
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/vm_version_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/vm_version_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/vm_version_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/vm_version_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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 VM_Version : public Abstract_VM_Version {
+ public:
+  static const char* cpu_features() {
+    return "";
+  }
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/vmreg_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/vmreg_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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/_vmreg_zero.cpp.incl"
+
+void VMRegImpl::set_regName() {
+  int i = 0;
+  Register reg = ::as_Register(0);
+  for ( ; i < ConcreteRegisterImpl::max_gpr ; ) {
+    regName[i++] = reg->name();
+    reg = reg->successor();
+  }
+  FloatRegister freg = ::as_FloatRegister(0);
+  for ( ; i < ConcreteRegisterImpl::max_fpr ; ) {
+    regName[i++] = freg->name();
+    freg = freg->successor();
+  }
+  assert(i == ConcreteRegisterImpl::number_of_registers, "fix this");
+}
+
+bool VMRegImpl::is_Register() {
+  return value() >= 0 &&
+         value() < ConcreteRegisterImpl::max_gpr;
+}
+
+bool VMRegImpl::is_FloatRegister() {
+  return value() >= ConcreteRegisterImpl::max_gpr &&
+         value() < ConcreteRegisterImpl::max_fpr;
+}
+
+Register VMRegImpl::as_Register() {
+  assert(is_Register(), "must be");
+  return ::as_Register(value());
+}
+
+FloatRegister VMRegImpl::as_FloatRegister() {
+  assert(is_FloatRegister(), "must be" );
+  return ::as_FloatRegister(value() - ConcreteRegisterImpl::max_gpr);
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/vmreg_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/vmreg_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ */
+
+  bool is_Register();
+  Register as_Register();
+
+  bool is_FloatRegister();
+  FloatRegister as_FloatRegister();
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/vmreg_zero.inline.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/vmreg_zero.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+inline VMReg RegisterImpl::as_VMReg() {
+  return VMRegImpl::as_VMReg(encoding());
+}
+
+inline VMReg FloatRegisterImpl::as_VMReg() {
+  return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_gpr);
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/cpu/zero/vm/vtableStubs_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cpu/zero/vm/vtableStubs_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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/_vtableStubs_zero.cpp.incl"
+
+VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
+  ShouldNotCallThis();
+}
+
+VtableStub* VtableStubs::create_itable_stub(int vtable_index) {
+  ShouldNotCallThis();
+}
+
+int VtableStub::pd_code_size_limit(bool is_vtable_stub) {
+  ShouldNotCallThis();
+}
+
+int VtableStub::pd_code_alignment() {
+  ShouldNotCallThis();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os/linux/vm/os_linux.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,6 +22,8 @@
  *
  */
 
+# define __STDC_FORMAT_MACROS
+
 // do not include  precompiled  header file
 # include "incls/_os_linux.cpp.incl"
 
@@ -53,6 +55,8 @@
 # include <sys/ipc.h>
 # include <sys/shm.h>
 # include <link.h>
+# include <stdint.h>
+# include <inttypes.h>
 
 #define MAX_PATH    (2 * K)
 
@@ -176,7 +180,9 @@
 #endif
 
 // Cpu architecture string
-#if   defined(IA64)
+#if   defined(ZERO)
+static char cpu_arch[] = ZERO_LIBARCH;
+#elif defined(IA64)
 static char cpu_arch[] = "ia64";
 #elif defined(IA32)
 static char cpu_arch[] = "i386";
@@ -221,8 +227,8 @@
                      "environment on Linux when /proc filesystem is not mounted.";
 
 void os::Linux::initialize_system_info() {
-  _processor_count = sysconf(_SC_NPROCESSORS_CONF);
-  if (_processor_count == 1) {
+  set_processor_count(sysconf(_SC_NPROCESSORS_CONF));
+  if (processor_count() == 1) {
     pid_t pid = os::Linux::gettid();
     char fname[32];
     jio_snprintf(fname, sizeof(fname), "/proc/%d", pid);
@@ -234,7 +240,7 @@
     }
   }
   _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
-  assert(_processor_count > 0, "linux error");
+  assert(processor_count() > 0, "linux error");
 }
 
 void os::init_system_properties_values() {
@@ -1743,7 +1749,14 @@
     {EM_SPARC32PLUS, EM_SPARC,   ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
     {EM_SPARCV9,     EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
     {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
-    {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}
+    {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
+    {EM_ARM,         EM_ARM,     ELFCLASS32,   ELFDATA2LSB, (char*)"ARM"},
+    {EM_S390,        EM_S390,    ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"},
+    {EM_ALPHA,       EM_ALPHA,   ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
+    {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
+    {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
+    {EM_PARISC,      EM_PARISC,  ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
+    {EM_68K,         EM_68K,     ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}
   };
 
   #if  (defined IA32)
@@ -1760,9 +1773,23 @@
     static  Elf32_Half running_arch_code=EM_PPC64;
   #elif  (defined __powerpc__)
     static  Elf32_Half running_arch_code=EM_PPC;
+  #elif  (defined ARM)
+    static  Elf32_Half running_arch_code=EM_ARM;
+  #elif  (defined S390)
+    static  Elf32_Half running_arch_code=EM_S390;
+  #elif  (defined ALPHA)
+    static  Elf32_Half running_arch_code=EM_ALPHA;
+  #elif  (defined MIPSEL)
+    static  Elf32_Half running_arch_code=EM_MIPS_RS3_LE;
+  #elif  (defined PARISC)
+    static  Elf32_Half running_arch_code=EM_PARISC;
+  #elif  (defined MIPS)
+    static  Elf32_Half running_arch_code=EM_MIPS;
+  #elif  (defined M68K)
+    static  Elf32_Half running_arch_code=EM_68K;
   #else
     #error Method os::dll_load requires that one of following is defined:\
-         IA32, AMD64, IA64, __sparc, __powerpc__
+         IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
   #endif
 
   // Identify compatability class for VM's architecture and library's architecture
@@ -1794,10 +1821,12 @@
     return NULL;
   }
 
+#ifndef S390
   if (lib_arch.elf_class != arch_array[running_arch_index].elf_class) {
     ::snprintf(diag_msg_buf, diag_msg_max_length-1," (Possible cause: architecture word width mismatch)");
     return NULL;
   }
+#endif // !S390
 
   if (lib_arch.compat_class != arch_array[running_arch_index].compat_class) {
     if ( lib_arch.name!=NULL ) {
@@ -2467,6 +2496,91 @@
     != MAP_FAILED;
 }
 
+// Linux uses a growable mapping for the stack, and if the mapping for
+// the stack guard pages is not removed when we detach a thread the
+// stack cannot grow beyond the pages where the stack guard was
+// mapped.  If at some point later in the process the stack expands to
+// that point, the Linux kernel cannot expand the stack any further
+// because the guard pages are in the way, and a segfault occurs.
+//
+// However, it's essential not to split the stack region by unmapping
+// a region (leaving a hole) that's already part of the stack mapping,
+// so if the stack mapping has already grown beyond the guard pages at
+// the time we create them, we have to truncate the stack mapping.
+// So, we need to know the extent of the stack mapping when
+// create_stack_guard_pages() is called.
+
+// Find the bounds of the stack mapping.  Return true for success.
+//
+// We only need this for stacks that are growable: at the time of
+// writing thread stacks don't use growable mappings (i.e. those
+// creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this
+// only applies to the main thread.
+static bool
+get_stack_bounds(uintptr_t *bottom, uintptr_t *top)
+{
+  FILE *f = fopen("/proc/self/maps", "r");
+  if (f == NULL)
+    return false;
+
+  while (!feof(f)) {
+    size_t dummy;
+    char *str = NULL;
+    ssize_t len = getline(&str, &dummy, f);
+    if (len == -1) {
+      fclose(f);
+      return false;
+    }
+
+    if (len > 0 && str[len-1] == '\n') {
+      str[len-1] = 0;
+      len--;
+    }
+
+    static const char *stack_str = "[stack]";
+    if (len > (ssize_t)strlen(stack_str)
+       && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) {
+      if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
+        uintptr_t sp = (uintptr_t)__builtin_frame_address(0);
+        if (sp >= *bottom && sp <= *top) {
+          free(str);
+          fclose(f);
+          return true;
+        }
+      }
+    }
+    free(str);
+  }
+  fclose(f);
+  return false;
+}
+
+// If the (growable) stack mapping already extends beyond the point
+// where we're going to put our guard pages, truncate the mapping at
+// that point by munmap()ping it.  This ensures that when we later
+// munmap() the guard pages we don't leave a hole in the stack
+// mapping.
+bool os::create_stack_guard_pages(char* addr, size_t size) {
+  uintptr_t stack_extent, stack_base;
+  if (get_stack_bounds(&stack_extent, &stack_base)) {
+    if (stack_extent < (uintptr_t)addr)
+      ::munmap((void*)stack_extent, (uintptr_t)addr - stack_extent);
+  }
+
+  return os::commit_memory(addr, size);
+}
+
+// If this is a growable mapping, remove the guard pages entirely by
+// munmap()ping them.  If not, just call uncommit_memory().
+bool os::remove_stack_guard_pages(char* addr, size_t size) {
+  uintptr_t stack_extent, stack_base;
+  if (get_stack_bounds(&stack_extent, &stack_base)) {
+    return ::munmap(addr, size) == 0;
+  }
+
+  return os::uncommit_memory(addr, size);
+}
+
 static address _highest_vm_reserved_address = NULL;
 
 // If 'fixed' is true, anon_mmap() will attempt to reserve anonymous memory
@@ -2586,7 +2700,9 @@
     // format has been changed), we'll use the largest page size supported by
     // the processor.
 
+#ifndef ZERO
     _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M);
+#endif // ZERO
 
     FILE *fp = fopen("/proc/meminfo", "r");
     if (fp) {
@@ -4656,6 +4772,7 @@
   // Return immediately if a permit is available.
   if (_counter > 0) {
       _counter = 0 ;
+      OrderAccess::fence();
       return ;
   }
 
@@ -4698,6 +4815,7 @@
     _counter = 0;
     status = pthread_mutex_unlock(_mutex);
     assert (status == 0, "invariant") ;
+    OrderAccess::fence();
     return;
   }
 
@@ -4738,6 +4856,7 @@
     jt->java_suspend_self();
   }
 
+  OrderAccess::fence();
 }
 
 void Parker::unpark() {
diff -r 39e409a664b3 -r 84043c7507b9 src/os/solaris/dtrace/hotspot.d
--- a/src/os/solaris/dtrace/hotspot.d	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os/solaris/dtrace/hotspot.d	Thu Mar 25 16:54:59 2010 -0700
@@ -25,9 +25,20 @@
 provider hotspot {
   probe class__loaded(char*, uintptr_t, void*, uintptr_t);
   probe class__unloaded(char*, uintptr_t, void*, uintptr_t);
+  probe class__initialization__required(char*, uintptr_t, void*, intptr_t,int);
+  probe class__initialization__recursive(char*, uintptr_t, void*, intptr_t,int);
+  probe class__initialization__concurrent(char*, uintptr_t, void*, intptr_t,int);
+  probe class__initialization__erroneous(char*, uintptr_t, void*, intptr_t, int);
+  probe class__initialization__super__failed(char*, uintptr_t, void*, intptr_t,int);
+  probe class__initialization__clinit(char*, uintptr_t, void*, intptr_t,int);
+  probe class__initialization__error(char*, uintptr_t, void*, intptr_t,int);
+  probe class__initialization__end(char*, uintptr_t, void*, intptr_t,int);
   probe vm__init__begin();
   probe vm__init__end();
   probe vm__shutdown();
+  probe vmops__request(char*, uintptr_t, int);
+  probe vmops__begin(char*, uintptr_t, int);
+  probe vmops__end(char*, uintptr_t, int);
   probe gc__begin(uintptr_t);
   probe gc__end();
   probe mem__pool__gc__begin(
@@ -38,6 +49,12 @@
     uintptr_t, uintptr_t, uintptr_t, uintptr_t);
   probe thread__start(char*, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
   probe thread__stop(char*, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
+  probe thread__sleep__begin(long long);
+  probe thread__sleep__end(int);
+  probe thread__yield();
+  probe thread__park__begin(uintptr_t, int, long long);
+  probe thread__park__end(uintptr_t);
+  probe thread__unpark(uintptr_t);
   probe method__compile__begin(
     char*, uintptr_t, char*, uintptr_t, char*, uintptr_t, char*, uintptr_t); 
   probe method__compile__end(
diff -r 39e409a664b3 -r 84043c7507b9 src/os/solaris/dtrace/libjvm_db.c
--- a/src/os/solaris/dtrace/libjvm_db.c	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os/solaris/dtrace/libjvm_db.c	Thu Mar 25 16:54:59 2010 -0700
@@ -937,54 +937,56 @@
   return err;
 }
 
-static int
-scopeDesc_chain(Nmethod_t *N)
-{
+static int scopeDesc_chain(Nmethod_t *N) {
   int32_t decode_offset = 0;
   int32_t err;
 
-  if (debug > 2)
-      fprintf(stderr, "\t scopeDesc_chain: BEGIN\n");
+  if (debug > 2) {
+    fprintf(stderr, "\t scopeDesc_chain: BEGIN\n");
+  }
 
   err = ps_pread(N->J->P, N->pc_desc + OFFSET_PcDesc_scope_decode_offset,
                  &decode_offset, SZ32);
   CHECK_FAIL(err);
 
   while (decode_offset > 0) {
-      if (debug > 2)
-          fprintf(stderr, "\t scopeDesc_chain: decode_offset: %#x\n", decode_offset);
+    Vframe_t *vf = &N->vframes[N->vf_cnt];
 
-      Vframe_t *vf = &N->vframes[N->vf_cnt];
+    if (debug > 2) {
+      fprintf(stderr, "\t scopeDesc_chain: decode_offset: %#x\n", decode_offset);
+    }
+
+    err = scope_desc_at(N, decode_offset, vf);
+    CHECK_FAIL(err);
 
-      err = scope_desc_at(N, decode_offset, vf);
-      CHECK_FAIL(err);
+    if (vf->methodIdx > N->oops_len) {
+      fprintf(stderr, "\t scopeDesc_chain: (methodIdx > oops_len) !\n");
+      return -1;
+    }
+    err = read_pointer(N->J, N->nm + N->oops_beg + (vf->methodIdx-1)*POINTER_SIZE,
+                       &vf->methodOop);
+    CHECK_FAIL(err);
 
-      if (vf->methodIdx > N->oops_len) {
-          fprintf(stderr, "\t scopeDesc_chain: (methodIdx > oops_len) !\n");
-          return -1;
-      }
-      err = read_pointer(N->J, N->nm + N->oops_beg + (vf->methodIdx-1)*POINTER_SIZE,
-                               &vf->methodOop);
+    if (vf->methodOop) {
+      N->vf_cnt++;
+      err = line_number_from_bci(N->J, vf);
       CHECK_FAIL(err);
-
-      if (vf->methodOop) {
-          N->vf_cnt++;
-          err = line_number_from_bci(N->J, vf);
-          CHECK_FAIL(err);
-          if (debug > 2) {
-              fprintf(stderr, "\t scopeDesc_chain: methodOop: %#8llx, line: %ld\n",
-                              vf->methodOop, vf->line);
-          }
+      if (debug > 2) {
+        fprintf(stderr, "\t scopeDesc_chain: methodOop: %#8llx, line: %ld\n",
+                vf->methodOop, vf->line);
       }
-      decode_offset = vf->sender_decode_offset;
+    }
+    decode_offset = vf->sender_decode_offset;
   }
-  if (debug > 2)
-      fprintf(stderr, "\t scopeDesc_chain: END \n\n");
+  if (debug > 2) {
+    fprintf(stderr, "\t scopeDesc_chain: END \n\n");
+  }
   return PS_OK;
 
  fail:
-  if (debug)
-      fprintf(stderr, "\t scopeDesc_chain: FAIL \n\n");
+  if (debug) {
+    fprintf(stderr, "\t scopeDesc_chain: FAIL \n\n");
+  }
   return err;
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/os/solaris/vm/attachListener_solaris.cpp
--- a/src/os/solaris/vm/attachListener_solaris.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os/solaris/vm/attachListener_solaris.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -668,13 +668,18 @@
     }
   }
 
-  if (strcmp(name, "ExtendedDTraceProbes") != 0) {
-    out->print_cr("flag '%s' cannot be changed", name);
-    return JNI_ERR;
+  if (strcmp(name, "ExtendedDTraceProbes") == 0) {
+    DTrace::set_extended_dprobes(flag);
+    return JNI_OK;
   }
 
-  DTrace::set_extended_dprobes(flag);
-  return JNI_OK;
+  if (strcmp(name, "DTraceMonitorProbes") == 0) {
+    DTrace::set_monitor_dprobes(flag);
+    return JNI_OK;
+  }
+
+  out->print_cr("flag '%s' cannot be changed", name);
+  return JNI_ERR;
 }
 
 void AttachListener::pd_detachall() {
diff -r 39e409a664b3 -r 84043c7507b9 src/os/solaris/vm/os_solaris.cpp
--- a/src/os/solaris/vm/os_solaris.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os/solaris/vm/os_solaris.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -457,7 +457,7 @@
 
 
 void os::Solaris::initialize_system_info() {
-  _processor_count = sysconf(_SC_NPROCESSORS_CONF);
+  set_processor_count(sysconf(_SC_NPROCESSORS_CONF));
   _processors_online = sysconf (_SC_NPROCESSORS_ONLN);
   _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
 }
@@ -2698,6 +2698,14 @@
   }
 }
 
+bool os::create_stack_guard_pages(char* addr, size_t size) {
+  return os::commit_memory(addr, size);
+}
+
+bool os::remove_stack_guard_pages(char* addr, size_t size) {
+  return os::uncommit_memory(addr, size);
+}
+
 // Change the page size in a given range.
 void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
   assert((intptr_t)addr % alignment_hint == 0, "Address should be aligned.");
@@ -5803,6 +5811,7 @@
   // Return immediately if a permit is available.
   if (_counter > 0) {
       _counter = 0 ;
+      OrderAccess::fence();
       return ;
   }
 
@@ -5846,6 +5855,7 @@
     _counter = 0;
     status = os::Solaris::mutex_unlock(_mutex);
     assert (status == 0, "invariant") ;
+    OrderAccess::fence();
     return;
   }
 
@@ -5892,6 +5902,7 @@
     jt->java_suspend_self();
   }
 
+  OrderAccess::fence();
 }
 
 void Parker::unpark() {
diff -r 39e409a664b3 -r 84043c7507b9 src/os/windows/vm/os_windows.cpp
--- a/src/os/windows/vm/os_windows.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os/windows/vm/os_windows.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -142,6 +142,9 @@
 }
 
 #ifndef _WIN64
+// previous UnhandledExceptionFilter, if there is one
+static LPTOP_LEVEL_EXCEPTION_FILTER prev_uef_handler = NULL;
+
 LONG WINAPI Handle_FLT_Exception(struct _EXCEPTION_POINTERS* exceptionInfo);
 #endif
 void os::init_system_properties_values() {
@@ -260,7 +263,8 @@
   }
 
 #ifndef _WIN64
-  SetUnhandledExceptionFilter(Handle_FLT_Exception);
+  // set our UnhandledExceptionFilter and save any previous one
+  prev_uef_handler = SetUnhandledExceptionFilter(Handle_FLT_Exception);
 #endif
 
   // Done
@@ -1526,7 +1530,8 @@
     case 5000: st->print(" Windows 2000"); break;
     case 5001: st->print(" Windows XP"); break;
     case 5002:
-    case 6000: {
+    case 6000:
+    case 6001: {
       // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
       // find out whether we are running on 64 bit processor or not.
       SYSTEM_INFO si;
@@ -1549,13 +1554,27 @@
           st->print(" Windows XP x64 Edition");
         else
             st->print(" Windows Server 2003 family");
-      } else { // os_vers == 6000
+      } else if (os_vers == 6000) {
         if (osvi.wProductType == VER_NT_WORKSTATION)
             st->print(" Windows Vista");
         else
             st->print(" Windows Server 2008");
         if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
             st->print(" , 64 bit");
+      } else if (os_vers == 6001) {
+        if (osvi.wProductType == VER_NT_WORKSTATION) {
+            st->print(" Windows 7");
+        } else {
+            // Unrecognized windows, print out its major and minor versions
+            st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+        }
+        if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+            st->print(" , 64 bit");
+      } else { // future os
+        // Unrecognized windows, print out its major and minor versions
+        st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+        if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+            st->print(" , 64 bit");
       }
       break;
     }
@@ -1954,7 +1973,7 @@
 #ifndef  _WIN64
 //-----------------------------------------------------------------------------
 LONG WINAPI Handle_FLT_Exception(struct _EXCEPTION_POINTERS* exceptionInfo) {
-  // handle exception caused by native mothod modifying control word
+  // handle exception caused by native method modifying control word
   PCONTEXT ctx = exceptionInfo->ContextRecord;
   DWORD exception_code = exceptionInfo->ExceptionRecord->ExceptionCode;
 
@@ -1975,6 +1994,13 @@
         return EXCEPTION_CONTINUE_EXECUTION;
       }
   }
+
+  if (prev_uef_handler != NULL) {
+    // We didn't handle this exception so pass it to the previous
+    // UnhandledExceptionFilter.
+    return (prev_uef_handler)(exceptionInfo);
+  }
+
   return EXCEPTION_CONTINUE_SEARCH;
 }
 #else //_WIN64
@@ -2777,6 +2803,14 @@
   return VirtualFree(addr, 0, MEM_RELEASE) != 0;
 }
 
+bool os::create_stack_guard_pages(char* addr, size_t size) {
+  return os::commit_memory(addr, size);
+}
+
+bool os::remove_stack_guard_pages(char* addr, size_t size) {
+  return os::uncommit_memory(addr, size);
+}
+
 // Set protections specified
 bool os::protect_memory(char* addr, size_t bytes, ProtType prot,
                         bool is_committed) {
@@ -3135,7 +3169,7 @@
   _vm_allocation_granularity = si.dwAllocationGranularity;
   _processor_type  = si.dwProcessorType;
   _processor_level = si.wProcessorLevel;
-  _processor_count = si.dwNumberOfProcessors;
+  set_processor_count(si.dwNumberOfProcessors);
 
   MEMORYSTATUSEX ms;
   ms.dwLength = sizeof(ms);
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_x86/vm/globals_linux_x86.hpp
--- a/src/os_cpu/linux_x86/vm/globals_linux_x86.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os_cpu/linux_x86/vm/globals_linux_x86.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,10 +22,9 @@
  *
  */
 
-//
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
-//
+
 define_pd_global(bool, DontYieldALot,            false);
 #ifdef AMD64
 define_pd_global(intx, ThreadStackSize,          1024); // 0 => use system default
@@ -39,11 +38,10 @@
 #endif // AMD64
 
 define_pd_global(intx, CompilerThreadStackSize,  0);
-define_pd_global(intx, SurvivorRatio,            8);
 
-define_pd_global(uintx, JVMInvokeMethodSlack,    8192);
+define_pd_global(uintx,JVMInvokeMethodSlack,     8192);
 
 // Only used on 64 bit platforms
-define_pd_global(uintx, HeapBaseMinAddress,      2*G);
+define_pd_global(uintx,HeapBaseMinAddress,       2*G);
 // Only used on 64 bit Windows platforms
 define_pd_global(bool, UseVectoredExceptions,    false);
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// Implementation of class atomic
+
+#ifdef M68K
+
+/*
+ * __m68k_cmpxchg
+ *
+ * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
+ * Returns newval on success and oldval if no exchange happened.
+ * This implementation is processor specific and works on
+ * 68020 68030 68040 and 68060.
+ *
+ * It will not work on ColdFire, 68000 and 68010 since they lack the CAS
+ * instruction.
+ * Using a kernelhelper would be better for arch complete implementation.
+ *
+ */
+
+static inline int __m68k_cmpxchg(int oldval, int newval, volatile int *ptr) {
+  int ret;
+  __asm __volatile ("cas%.l %0,%2,%1"
+                   : "=d" (ret), "+m" (*(ptr))
+                   : "d" (newval), "0" (oldval));
+  return ret;
+}
+
+/* Perform an atomic compare and swap: if the current value of `*PTR'
+   is OLDVAL, then write NEWVAL into `*PTR'.  Return the contents of
+   `*PTR' before the operation.*/
+static inline int m68k_compare_and_swap(volatile int *ptr,
+                                        int oldval,
+                                        int newval) {
+  for (;;) {
+      int prev = *ptr;
+      if (prev != oldval)
+        return prev;
+
+      if (__m68k_cmpxchg (prev, newval, ptr) == newval)
+        // Success.
+        return prev;
+
+      // We failed even though prev == oldval.  Try again.
+    }
+}
+
+/* Atomically add an int to memory.  */
+static inline int m68k_add_and_fetch(volatile int *ptr, int add_value) {
+  for (;;) {
+      // Loop until success.
+
+      int prev = *ptr;
+
+      if (__m68k_cmpxchg (prev, prev + add_value, ptr) == prev + add_value)
+        return prev + add_value;
+    }
+}
+
+/* Atomically write VALUE into `*PTR' and returns the previous
+   contents of `*PTR'.  */
+static inline int m68k_lock_test_and_set(volatile int *ptr, int newval) {
+  for (;;) {
+      // Loop until success.
+      int prev = *ptr;
+
+      if (__m68k_cmpxchg (prev, newval, ptr) == prev)
+        return prev;
+    }
+}
+#endif // M68K
+
+#ifdef ARM
+
+/*
+ * __kernel_cmpxchg
+ *
+ * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
+ * Return zero if *ptr was changed or non-zero if no exchange happened.
+ * The C flag is also set if *ptr was changed to allow for assembly
+ * optimization in the calling code.
+ *
+ */
+
+typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
+#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
+
+
+
+/* Perform an atomic compare and swap: if the current value of `*PTR'
+   is OLDVAL, then write NEWVAL into `*PTR'.  Return the contents of
+   `*PTR' before the operation.*/
+static inline int arm_compare_and_swap(volatile int *ptr,
+                                       int oldval,
+                                       int newval) {
+  for (;;) {
+      int prev = *ptr;
+      if (prev != oldval)
+        return prev;
+
+      if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+        // Success.
+        return prev;
+
+      // We failed even though prev == oldval.  Try again.
+    }
+}
+
+/* Atomically add an int to memory.  */
+static inline int arm_add_and_fetch(volatile int *ptr, int add_value) {
+  for (;;) {
+      // Loop until a __kernel_cmpxchg succeeds.
+
+      int prev = *ptr;
+
+      if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
+        return prev + add_value;
+    }
+}
+
+/* Atomically write VALUE into `*PTR' and returns the previous
+   contents of `*PTR'.  */
+static inline int arm_lock_test_and_set(volatile int *ptr, int newval) {
+  for (;;) {
+      // Loop until a __kernel_cmpxchg succeeds.
+      int prev = *ptr;
+
+      if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+        return prev;
+    }
+}
+#endif // ARM
+
+inline void Atomic::store(jint store_value, volatile jint* dest) {
+  *dest = store_value;
+}
+
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) {
+  *dest = store_value;
+}
+
+inline jint Atomic::add(jint add_value, volatile jint* dest) {
+#ifdef ARM
+  return arm_add_and_fetch(dest, add_value);
+#else
+#ifdef M68K
+  return m68k_add_and_fetch(dest, add_value);
+#else
+  return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+#ifdef ARM
+  return arm_add_and_fetch(dest, add_value);
+#else
+#ifdef M68K
+  return m68k_add_and_fetch(dest, add_value);
+#else
+  return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+  return (void *) add_ptr(add_value, (volatile intptr_t *) dest);
+}
+
+inline void Atomic::inc(volatile jint* dest) {
+  add(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+  add_ptr(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+  add_ptr(1, dest);
+}
+
+inline void Atomic::dec(volatile jint* dest) {
+  add(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+  add_ptr(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+  add_ptr(-1, dest);
+}
+
+inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
+#ifdef ARM
+  return arm_lock_test_and_set(dest, exchange_value);
+#else
+#ifdef M68K
+  return m68k_lock_test_and_set(dest, exchange_value);
+#else
+  // __sync_lock_test_and_set is a bizarrely named atomic exchange
+  // operation.  Note that some platforms only support this with the
+  // limitation that the only valid value to store is the immediate
+  // constant 1.  There is a test for this in JNI_CreateJavaVM().
+  return __sync_lock_test_and_set (dest, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value,
+                                 volatile intptr_t* dest) {
+#ifdef ARM
+  return arm_lock_test_and_set(dest, exchange_value);
+#else
+#ifdef M68K
+  return m68k_lock_test_and_set(dest, exchange_value);
+#else
+  return __sync_lock_test_and_set (dest, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+  return (void *) xchg_ptr((intptr_t) exchange_value,
+                           (volatile intptr_t*) dest);
+}
+
+inline jint Atomic::cmpxchg(jint exchange_value,
+                            volatile jint* dest,
+                            jint compare_value) {
+#ifdef ARM
+  return arm_compare_and_swap(dest, compare_value, exchange_value);
+#else
+#ifdef M68K
+  return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
+  return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline jlong Atomic::cmpxchg(jlong exchange_value,
+                             volatile jlong* dest,
+                             jlong compare_value) {
+
+  return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
+                                    volatile intptr_t* dest,
+                                    intptr_t compare_value) {
+#ifdef ARM
+  return arm_compare_and_swap(dest, compare_value, exchange_value);
+#else
+#ifdef M68K
+  return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
+  return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value,
+                                 volatile void* dest,
+                                 void* compare_value) {
+
+  return (void *) cmpxchg_ptr((intptr_t) exchange_value,
+                              (volatile intptr_t*) dest,
+                              (intptr_t) compare_value);
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2003 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.
+ *
+ */
+
+// Efficient swapping of data bytes from Java byte
+// ordering to native byte ordering and vice versa.
+
+#include <byteswap.h>
+
+inline u2 Bytes::swap_u2(u2 x) {
+  return bswap_16(x);
+}
+
+inline u4 Bytes::swap_u4(u4 x) {
+  return bswap_32(x);
+}
+
+inline u8 Bytes::swap_u8(u8 x) {
+  return bswap_64(x);
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+//
+// Set the default values for platform dependent flags used by the
+// runtime system.  See globals.hpp for details of what they do.
+//
+
+define_pd_global(bool,  DontYieldALot,           false);
+#ifdef _LP64
+define_pd_global(intx,  ThreadStackSize,         1536);
+define_pd_global(intx,  VMThreadStackSize,       1024);
+#else
+define_pd_global(intx,  ThreadStackSize,         1024);
+define_pd_global(intx,  VMThreadStackSize,       512);
+#endif // _LP64
+define_pd_global(intx,  SurvivorRatio,           8);
+define_pd_global(intx,  CompilerThreadStackSize, 0);
+define_pd_global(uintx, JVMInvokeMethodSlack,    8192);
+
+define_pd_global(bool,  UseVectoredExceptions,   false);
+// Only used on 64 bit platforms
+define_pd_global(uintx, HeapBaseMinAddress,      2*G);
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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
+ * 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.
+ *
+ */
+
+#ifdef ARM
+
+/*
+ * ARM Kernel helper for memory barrier.
+ * Using __asm __volatile ("":::"memory") does not work reliable on ARM
+ * and gcc __sync_synchronize(); implementation does not use the kernel
+ * helper for all gcc versions so it is unreliable to use as well.
+ */
+typedef void (__kernel_dmb_t) (void);
+#define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0)
+
+#define FULL_MEM_BARRIER __kernel_dmb()
+#define READ_MEM_BARRIER __kernel_dmb()
+#define WRITE_MEM_BARRIER __kernel_dmb()
+
+#else // ARM
+
+#define FULL_MEM_BARRIER __sync_synchronize()
+
+#ifdef PPC
+
+#define READ_MEM_BARRIER __asm __volatile ("isync":::"memory")
+#ifdef __NO_LWSYNC__
+#define WRITE_MEM_BARRIER __asm __volatile ("sync":::"memory")
+#else
+#define WRITE_MEM_BARRIER __asm __volatile ("lwsync":::"memory")
+#endif
+
+#else // PPC
+
+#define READ_MEM_BARRIER __asm __volatile ("":::"memory")
+#define WRITE_MEM_BARRIER __asm __volatile ("":::"memory")
+
+#endif // PPC
+
+#endif // ARM
+
+
+inline void OrderAccess::loadload()   { acquire(); }
+inline void OrderAccess::storestore() { release(); }
+inline void OrderAccess::loadstore()  { acquire(); }
+inline void OrderAccess::storeload()  { fence(); }
+
+inline void OrderAccess::acquire() {
+  READ_MEM_BARRIER;
+}
+
+inline void OrderAccess::release() {
+  WRITE_MEM_BARRIER;
+}
+
+inline void OrderAccess::fence() {
+  FULL_MEM_BARRIER;
+}
+
+inline jbyte    OrderAccess::load_acquire(volatile jbyte*   p) { jbyte data = *p; acquire(); return data; }
+inline jshort   OrderAccess::load_acquire(volatile jshort*  p) { jshort data = *p; acquire(); return data; }
+inline jint     OrderAccess::load_acquire(volatile jint*    p) { jint data = *p; acquire(); return data; }
+inline jlong    OrderAccess::load_acquire(volatile jlong*   p) {
+  jlong tmp;
+  os::atomic_copy64(p, &tmp);
+  acquire();
+  return tmp;
+}
+inline jubyte    OrderAccess::load_acquire(volatile jubyte*   p) { jubyte data = *p; acquire(); return data; }
+inline jushort   OrderAccess::load_acquire(volatile jushort*  p) { jushort data = *p; acquire(); return data; }
+inline juint     OrderAccess::load_acquire(volatile juint*    p) { juint data = *p; acquire(); return data; }
+inline julong   OrderAccess::load_acquire(volatile julong*  p) {
+  julong tmp;
+  os::atomic_copy64(p, &tmp);
+  acquire();
+  return tmp;
+}
+inline jfloat   OrderAccess::load_acquire(volatile jfloat*  p) { jfloat data = *p; acquire(); return data; }
+inline jdouble  OrderAccess::load_acquire(volatile jdouble* p) {
+  jdouble tmp;
+  os::atomic_copy64(p, &tmp);
+  acquire();
+  return tmp;
+}
+
+inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t*   p) {
+  intptr_t data = *p;
+  acquire();
+  return data;
+}
+inline void*    OrderAccess::load_ptr_acquire(volatile void*       p) {
+  void *data = *(void* volatile *)p;
+  acquire();
+  return data;
+}
+inline void*    OrderAccess::load_ptr_acquire(const volatile void* p) {
+  void *data = *(void* const volatile *)p;
+  acquire();
+  return data;
+}
+
+inline void     OrderAccess::release_store(volatile jbyte*   p, jbyte   v) { release(); *p = v; }
+inline void     OrderAccess::release_store(volatile jshort*  p, jshort  v) { release(); *p = v; }
+inline void     OrderAccess::release_store(volatile jint*    p, jint    v) { release(); *p = v; }
+inline void     OrderAccess::release_store(volatile jlong*   p, jlong   v)
+{ release(); os::atomic_copy64(&v, p); }
+inline void     OrderAccess::release_store(volatile jubyte*  p, jubyte  v) { release(); *p = v; }
+inline void     OrderAccess::release_store(volatile jushort* p, jushort v) { release(); *p = v; }
+inline void     OrderAccess::release_store(volatile juint*   p, juint   v) { release(); *p = v; }
+inline void     OrderAccess::release_store(volatile julong*  p, julong  v)
+{ release(); os::atomic_copy64(&v, p); }
+inline void     OrderAccess::release_store(volatile jfloat*  p, jfloat  v) { release(); *p = v; }
+inline void     OrderAccess::release_store(volatile jdouble* p, jdouble v)
+{ release(); os::atomic_copy64(&v, p); }
+
+inline void     OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { release(); *p = v; }
+inline void     OrderAccess::release_store_ptr(volatile void*     p, void*    v)
+{ release(); *(void* volatile *)p = v; }
+
+inline void     OrderAccess::store_fence(jbyte*   p, jbyte   v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(jshort*  p, jshort  v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(jint*    p, jint    v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(jlong*   p, jlong   v) { os::atomic_copy64(&v, p); fence(); }
+inline void     OrderAccess::store_fence(jubyte*  p, jubyte  v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(jushort* p, jushort v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(juint*   p, juint   v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(julong*  p, julong  v) { os::atomic_copy64(&v, p); fence(); }
+inline void     OrderAccess::store_fence(jfloat*  p, jfloat  v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(jdouble* p, jdouble v) { os::atomic_copy64(&v, p); fence(); }
+
+inline void     OrderAccess::store_ptr_fence(intptr_t* p, intptr_t v) { *p = v; fence(); }
+inline void     OrderAccess::store_ptr_fence(void**    p, void*    v) { *p = v; fence(); }
+
+inline void     OrderAccess::release_store_fence(volatile jbyte*   p, jbyte   v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jshort*  p, jshort  v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jint*    p, jint    v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jlong*   p, jlong   v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jubyte*  p, jubyte  v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jushort* p, jushort v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile juint*   p, juint   v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile julong*  p, julong  v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jfloat*  p, jfloat  v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { release_store(p, v); fence(); }
+
+inline void     OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { release_store_ptr(p, v); fence(); }
+inline void     OrderAccess::release_store_ptr_fence(volatile void*     p, void*    v) { release_store_ptr(p, v); fence(); }
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,470 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008, 2009, 2010 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.
+ *
+ */
+
+// do not include precompiled header file
+#include "incls/_os_linux_zero.cpp.incl"
+
+address os::current_stack_pointer() {
+  address dummy = (address) &dummy;
+  return dummy;
+}
+
+frame os::get_sender_for_C_frame(frame* fr) {
+  ShouldNotCallThis();
+}
+
+frame os::current_frame() {
+  // The only thing that calls this is the stack printing code in
+  // VMError::report:
+  //   - Step 110 (printing stack bounds) uses the sp in the frame
+  //     to determine the amount of free space on the stack.  We
+  //     set the sp to a close approximation of the real value in
+  //     order to allow this step to complete.
+  //   - Step 120 (printing native stack) tries to walk the stack.
+  //     The frame we create has a NULL pc, which is ignored as an
+  //     invalid frame.
+  frame dummy = frame();
+  dummy.set_sp((intptr_t *) current_stack_pointer());
+  return dummy;
+}
+
+char* os::non_memory_address_word() {
+  // Must never look like an address returned by reserve_memory,
+  // even in its subfields (as defined by the CPU immediate fields,
+  // if the CPU splits constants across multiple instructions).
+#ifdef SPARC
+  // On SPARC, 0 != %hi(any real address), because there is no
+  // allocation in the first 1Kb of the virtual address space.
+  return (char *) 0;
+#else
+  // This is the value for x86; works pretty well for PPC too.
+  return (char *) -1;
+#endif // SPARC
+}
+
+void os::initialize_thread() {
+  // Nothing to do.
+}
+
+address os::Linux::ucontext_get_pc(ucontext_t* uc) {
+  ShouldNotCallThis();
+}
+
+ExtendedPC os::fetch_frame_from_context(void* ucVoid,
+                                        intptr_t** ret_sp,
+                                        intptr_t** ret_fp) {
+  ShouldNotCallThis();
+}
+
+frame os::fetch_frame_from_context(void* ucVoid) {
+  ShouldNotCallThis();
+}
+
+extern "C" int
+JVM_handle_linux_signal(int sig,
+                        siginfo_t* info,
+                        void* ucVoid,
+                        int abort_if_unrecognized) {
+  ucontext_t* uc = (ucontext_t*) ucVoid;
+
+  Thread* t = ThreadLocalStorage::get_thread_slow();
+
+  SignalHandlerMark shm(t);
+
+  // Note: it's not uncommon that JNI code uses signal/sigset to
+  // install then restore certain signal handler (e.g. to temporarily
+  // block SIGPIPE, or have a SIGILL handler when detecting CPU
+  // type). When that happens, JVM_handle_linux_signal() might be
+  // invoked with junk info/ucVoid. To avoid unnecessary crash when
+  // libjsig is not preloaded, try handle signals that do not require
+  // siginfo/ucontext first.
+
+  if (sig == SIGPIPE || sig == SIGXFSZ) {
+    // allow chained handler to go first
+    if (os::Linux::chained_handler(sig, info, ucVoid)) {
+      return true;
+    } else {
+      if (PrintMiscellaneous && (WizardMode || Verbose)) {
+        char buf[64];
+        warning("Ignoring %s - see bugs 4229104 or 646499219",
+                os::exception_name(sig, buf, sizeof(buf)));
+      }
+      return true;
+    }
+  }
+
+  JavaThread* thread = NULL;
+  VMThread* vmthread = NULL;
+  if (os::Linux::signal_handlers_are_installed) {
+    if (t != NULL ){
+      if(t->is_Java_thread()) {
+        thread = (JavaThread*)t;
+      }
+      else if(t->is_VM_thread()){
+        vmthread = (VMThread *)t;
+      }
+    }
+  }
+
+  if (info != NULL && thread != NULL) {
+    // Handle ALL stack overflow variations here
+    if (sig == SIGSEGV) {
+      address addr = (address) info->si_addr;
+
+      // check if fault address is within thread stack
+      if (addr < thread->stack_base() &&
+          addr >= thread->stack_base() - thread->stack_size()) {
+        // stack overflow
+        if (thread->in_stack_yellow_zone(addr)) {
+          thread->disable_stack_yellow_zone();
+          ShouldNotCallThis();
+        }
+        else if (thread->in_stack_red_zone(addr)) {
+          thread->disable_stack_red_zone();
+          ShouldNotCallThis();
+        }
+        else {
+          // Accessing stack address below sp may cause SEGV if
+          // current thread has MAP_GROWSDOWN stack. This should
+          // only happen when current thread was created by user
+          // code with MAP_GROWSDOWN flag and then attached to VM.
+          // See notes in os_linux.cpp.
+          if (thread->osthread()->expanding_stack() == 0) {
+            thread->osthread()->set_expanding_stack();
+            if (os::Linux::manually_expand_stack(thread, addr)) {
+              thread->osthread()->clear_expanding_stack();
+              return true;
+            }
+            thread->osthread()->clear_expanding_stack();
+          }
+          else {
+            fatal("recursive segv. expanding stack.");
+          }
+        }
+      }
+    }
+
+    /*if (thread->thread_state() == _thread_in_Java) {
+      ShouldNotCallThis();
+    }
+    else*/ if (thread->thread_state() == _thread_in_vm &&
+               sig == SIGBUS && thread->doing_unsafe_access()) {
+      ShouldNotCallThis();
+    }
+
+    // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC
+    // kicks in and the heap gets shrunk before the field access.
+    /*if (sig == SIGSEGV || sig == SIGBUS) {
+      address addr = JNI_FastGetField::find_slowcase_pc(pc);
+      if (addr != (address)-1) {
+        stub = addr;
+      }
+    }*/
+
+    // Check to see if we caught the safepoint code in the process
+    // of write protecting the memory serialization page.  It write
+    // enables the page immediately after protecting it so we can
+    // just return to retry the write.
+    if (sig == SIGSEGV &&
+        os::is_memory_serialize_page(thread, (address) info->si_addr)) {
+      // Block current thread until permission is restored.
+      os::block_on_serialize_page_trap();
+      return true;
+    }
+  }
+
+  // signal-chaining
+  if (os::Linux::chained_handler(sig, info, ucVoid)) {
+     return true;
+  }
+
+  if (!abort_if_unrecognized) {
+    // caller wants another chance, so give it to him
+    return false;
+  }
+
+#ifndef PRODUCT
+  if (sig == SIGSEGV) {
+    fatal("\n#"
+          "\n#    /--------------------\\"
+          "\n#    | segmentation fault |"
+          "\n#    \\---\\ /--------------/"
+          "\n#        /"
+          "\n#    [-]        |\\_/|    "
+          "\n#    (+)=C      |o o|__  "
+          "\n#    | |        =-*-=__\\ "
+          "\n#    OOO        c_c_(___)");
+  }
+#endif // !PRODUCT
+
+  const char *fmt = "caught unhandled signal %d";
+  char buf[64];
+
+  sprintf(buf, fmt, sig);
+  fatal(buf);
+}
+
+void os::Linux::init_thread_fpu_state(void) {
+  // Nothing to do
+}
+
+int os::Linux::get_fpu_control_word() {
+  ShouldNotCallThis();
+}
+
+void os::Linux::set_fpu_control_word(int fpu) {
+  ShouldNotCallThis();
+}
+
+bool os::is_allocatable(size_t bytes) {
+#ifdef _LP64
+  return true;
+#else
+  if (bytes < 2 * G) {
+    return true;
+  }
+
+  char* addr = reserve_memory(bytes, NULL);
+
+  if (addr != NULL) {
+    release_memory(addr, bytes);
+  }
+
+  return addr != NULL;
+#endif // _LP64
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// thread stack
+
+size_t os::Linux::min_stack_allowed = 64 * K;
+
+bool os::Linux::supports_variable_stack_size() {
+  return true;
+}
+
+size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
+#ifdef _LP64
+  size_t s = (thr_type == os::compiler_thread ? 4 * M : 1 * M);
+#else
+  size_t s = (thr_type == os::compiler_thread ? 2 * M : 512 * K);
+#endif // _LP64
+  return s;
+}
+
+size_t os::Linux::default_guard_size(os::ThreadType thr_type) {
+  // Only enable glibc guard pages for non-Java threads
+  // (Java threads have HotSpot guard pages)
+  return (thr_type == java_thread ? 0 : page_size());
+}
+
+static void current_stack_region(address *bottom, size_t *size) {
+  pthread_attr_t attr;
+  int res = pthread_getattr_np(pthread_self(), &attr);
+  if (res != 0) {
+    if (res == ENOMEM) {
+      vm_exit_out_of_memory(0, "pthread_getattr_np");
+    }
+    else {
+      fatal1("pthread_getattr_np failed with errno = %d", res);
+    }
+  }
+
+  address stack_bottom;
+  size_t stack_bytes;
+  res = pthread_attr_getstack(&attr, (void **) &stack_bottom, &stack_bytes);
+  if (res != 0) {
+    fatal1("pthread_attr_getstack failed with errno = %d", res);
+  }
+  address stack_top = stack_bottom + stack_bytes;
+
+  // The block of memory returned by pthread_attr_getstack() includes
+  // guard pages where present.  We need to trim these off.
+  size_t page_bytes = os::Linux::page_size();
+  assert(((intptr_t) stack_bottom & (page_bytes - 1)) == 0, "unaligned stack");
+
+  size_t guard_bytes;
+  res = pthread_attr_getguardsize(&attr, &guard_bytes);
+  if (res != 0) {
+    fatal1("pthread_attr_getguardsize failed with errno = %d", res);
+  }
+  int guard_pages = align_size_up(guard_bytes, page_bytes) / page_bytes;
+  assert(guard_bytes == guard_pages * page_bytes, "unaligned guard");
+
+#ifdef IA64
+  // IA64 has two stacks sharing the same area of memory, a normal
+  // stack growing downwards and a register stack growing upwards.
+  // Guard pages, if present, are in the centre.  This code splits
+  // the stack in two even without guard pages, though in theory
+  // there's nothing to stop us allocating more to the normal stack
+  // or more to the register stack if one or the other were found
+  // to grow faster.
+  int total_pages = align_size_down(stack_bytes, page_bytes) / page_bytes;
+  stack_bottom += (total_pages - guard_pages) / 2 * page_bytes;
+#endif // IA64
+
+  stack_bottom += guard_bytes;
+
+  pthread_attr_destroy(&attr);
+
+  // The initial thread has a growable stack, and the size reported
+  // by pthread_attr_getstack is the maximum size it could possibly
+  // be given what currently mapped.  This can be huge, so we cap it.
+  if (os::Linux::is_initial_thread()) {
+    stack_bytes = stack_top - stack_bottom;
+
+    if (stack_bytes > JavaThread::stack_size_at_create())
+      stack_bytes = JavaThread::stack_size_at_create();
+
+    stack_bottom = stack_top - stack_bytes;
+  }
+
+  assert(os::current_stack_pointer() >= stack_bottom, "should do");
+  assert(os::current_stack_pointer() < stack_top, "should do");
+
+  *bottom = stack_bottom;
+  *size = stack_top - stack_bottom;
+}
+
+address os::current_stack_base() {
+  address bottom;
+  size_t size;
+  current_stack_region(&bottom, &size);
+  return bottom + size;
+}
+
+size_t os::current_stack_size() {
+  // stack size includes normal stack and HotSpot guard pages
+  address bottom;
+  size_t size;
+  current_stack_region(&bottom, &size);
+  return size;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// helper functions for fatal error handler
+
+void os::print_context(outputStream* st, void* context) {
+  ShouldNotCallThis();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Stubs for things that would be in linux_zero.s if it existed.
+// You probably want to disassemble these monkeys to check they're ok.
+
+extern "C" {
+  int SpinPause() {
+  }
+
+  int SafeFetch32(int *adr, int errValue) {
+    int value = errValue;
+    value = *adr;
+    return value;
+  }
+  intptr_t SafeFetchN(intptr_t *adr, intptr_t errValue) {
+    intptr_t value = errValue;
+    value = *adr;
+    return value;
+  }
+
+  void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
+    if (from > to) {
+      jshort *end = from + count;
+      while (from < end)
+        *(to++) = *(from++);
+    }
+    else if (from < to) {
+      jshort *end = from;
+      from += count - 1;
+      to   += count - 1;
+      while (from >= end)
+        *(to--) = *(from--);
+    }
+  }
+  void _Copy_conjoint_jints_atomic(jint* from, jint* to, size_t count) {
+    if (from > to) {
+      jint *end = from + count;
+      while (from < end)
+        *(to++) = *(from++);
+    }
+    else if (from < to) {
+      jint *end = from;
+      from += count - 1;
+      to   += count - 1;
+      while (from >= end)
+        *(to--) = *(from--);
+    }
+  }
+  void _Copy_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) {
+    if (from > to) {
+      jlong *end = from + count;
+      while (from < end)
+        os::atomic_copy64(from++, to++);
+    }
+    else if (from < to) {
+      jlong *end = from;
+      from += count - 1;
+      to   += count - 1;
+      while (from >= end)
+        os::atomic_copy64(from--, to--);
+    }
+  }
+
+  void _Copy_arrayof_conjoint_bytes(HeapWord* from,
+                                    HeapWord* to,
+                                    size_t    count) {
+    ShouldNotCallThis();
+  }
+  void _Copy_arrayof_conjoint_jshorts(HeapWord* from,
+                                      HeapWord* to,
+                                      size_t    count) {
+    ShouldNotCallThis();
+  }
+  void _Copy_arrayof_conjoint_jints(HeapWord* from,
+                                    HeapWord* to,
+                                    size_t    count) {
+    ShouldNotCallThis();
+  }
+  void _Copy_arrayof_conjoint_jlongs(HeapWord* from,
+                                     HeapWord* to,
+                                     size_t    count) {
+    ShouldNotCallThis();
+  }
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// Implementations of atomic operations not supported by processors.
+//  -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html
+
+#ifndef _LP64
+extern "C" {
+  long long unsigned int __sync_val_compare_and_swap_8(
+    volatile void *ptr,
+    long long unsigned int oldval,
+    long long unsigned int newval) {
+    ShouldNotCallThis();
+  }
+};
+#endif // !_LP64
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/os_linux_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008, 2010 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.
+ *
+ */
+
+  static void setup_fpu() {}
+
+  static bool is_allocatable(size_t bytes);
+
+  // Used to register dynamic code cache area with the OS
+  // Note: Currently only used in 64 bit Windows implementations
+  static bool register_code_area(char *low, char *high) { return true; }
+
+  // Atomically copy 64 bits of data
+  static void atomic_copy64(volatile void *src, volatile void *dst) {
+#if defined(PPC) && !defined(_LP64)
+    double tmp;
+    asm volatile ("lfd  %0, 0(%1)\n"
+                  "stfd %0, 0(%2)\n"
+                  : "=f"(tmp)
+                  : "b"(src), "b"(dst));
+#elif defined(S390) && !defined(_LP64)
+    double tmp;
+    asm volatile ("ld  %0, 0(%1)\n"
+                  "std %0, 0(%2)\n"
+                  : "=r"(tmp)
+                  : "a"(src), "a"(dst));
+#else
+    *(jlong *) dst = *(jlong *) src;
+#endif
+  }
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+inline void Prefetch::read(void* loc, intx interval) {
+}
+
+inline void Prefetch::write(void* loc, intx interval) {
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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/_threadLS_linux_zero.cpp.incl"
+
+void ThreadLocalStorage::generate_code_for_get_thread() {
+  // nothing to do
+}
+
+void ThreadLocalStorage::pd_init() {
+  // nothing to do
+}
+
+void ThreadLocalStorage::pd_set_thread(Thread* thread) {
+  os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2003 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.
+ *
+ */
+
+// Processor dependent parts of ThreadLocalStorage
+
+ public:
+  static Thread* thread() {
+    return (Thread*) os::thread_local_storage_at(thread_index());
+  }
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/thread_linux_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007, 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
+ * 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.
+ *
+ */
+
+ private:
+  ZeroStack  _zero_stack;
+  ZeroFrame* _top_zero_frame;
+
+  void pd_initialize() {
+    _top_zero_frame = NULL;
+  }
+
+ public:
+  ZeroStack *zero_stack() {
+    return &_zero_stack;
+  }
+
+ public:
+  ZeroFrame *top_zero_frame() {
+    return _top_zero_frame;
+  }
+  void push_zero_frame(ZeroFrame *frame) {
+    *(ZeroFrame **) frame = _top_zero_frame;
+    _top_zero_frame = frame;
+  }
+  void pop_zero_frame() {
+    zero_stack()->set_sp((intptr_t *) _top_zero_frame + 1);
+    _top_zero_frame = *(ZeroFrame **) _top_zero_frame;
+  }
+
+ public:
+  static ByteSize zero_stack_offset() {
+    return byte_offset_of(JavaThread, _zero_stack);
+  }
+  static ByteSize top_zero_frame_offset() {
+    return byte_offset_of(JavaThread, _top_zero_frame);
+  }
+
+ public:
+  void record_base_of_stack_pointer() {
+    assert(top_zero_frame() == NULL, "junk on stack prior to Java call");
+  }
+  void set_base_of_stack_pointer(intptr_t* base_sp) {
+    assert(base_sp == NULL, "should be");
+    assert(top_zero_frame() == NULL, "junk on stack after Java call");
+  }
+
+ public:
+  void set_last_Java_frame() {
+    JavaFrameAnchor *jfa = frame_anchor();
+    jfa->set_last_Java_sp((intptr_t *) top_zero_frame());
+  }
+  void reset_last_Java_frame() {
+    JavaFrameAnchor *jfa = frame_anchor();
+    jfa->set_last_Java_sp(NULL);
+  }
+
+ private:
+  frame pd_last_frame() {
+    assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
+    return frame(last_Java_sp(), zero_stack()->sp());
+  }
+
+ public:
+  // Check for pending suspend requests and pending asynchronous
+  // exceptions.  There are separate accessors for these, but
+  // _suspend_flags is volatile so using them would be unsafe.
+  bool has_special_condition_for_native_trans() {
+    return _suspend_flags != 0;
+  }
+
+ public:
+  bool pd_get_top_frame_for_signal_handler(frame* fr_addr,
+                                           void* ucontext,
+                                           bool isInJava) {
+    ShouldNotCallThis();
+  }
+
+  // These routines are only used on cpu architectures that
+  // have separate register stacks (Itanium).
+  static bool register_stack_overflow() { return false; }
+  static void enable_register_stack_guard() {}
+  static void disable_register_stack_guard() {}
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+// These are the OS and CPU-specific fields, types and integer
+// constants required by the Serviceability Agent. This file is
+// referenced by vmStructs.cpp.
+
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+  /* This must be the last entry, and must be present */                \
+  last_entry()
+
+
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+  /* This must be the last entry, and must be present */                \
+  last_entry()
+
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+  /* This must be the last entry, and must be present */                \
+  last_entry()
+
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+  /* This must be the last entry, and must be present */                \
+  last_entry()
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1997-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.
+ *
+ */
+
+// This file is intentionally empty
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp
--- a/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
--- a/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp
--- a/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,31 +22,25 @@
  *
  */
 
-//
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
-//
+
 define_pd_global(bool, DontYieldALot,            true); // Determined in the design center
 #ifdef AMD64
 define_pd_global(intx, ThreadStackSize,          1024); // 0 => use system default
 define_pd_global(intx, VMThreadStackSize,        1024);
-define_pd_global(intx, SurvivorRatio,            6);
-define_pd_global(uintx, JVMInvokeMethodSlack,    8*K);
+define_pd_global(uintx,JVMInvokeMethodSlack,     8*K);
 #else
-//  UseStackBanging is not pd
-// define_pd_global(bool, UseStackBanging,          true);
-
 // ThreadStackSize 320 allows TaggedStackInterpreter and a couple of test cases
 // to run while keeping the number of threads that can be created high.
 define_pd_global(intx, ThreadStackSize,          320);
 define_pd_global(intx, VMThreadStackSize,        512);
-define_pd_global(intx, SurvivorRatio,            8);
-define_pd_global(uintx, JVMInvokeMethodSlack,    10*K);
+define_pd_global(uintx,JVMInvokeMethodSlack,     10*K);
 #endif // AMD64
 
 define_pd_global(intx, CompilerThreadStackSize,  0);
 
 // Only used on 64 bit platforms
-define_pd_global(uintx, HeapBaseMinAddress,      256*M);
+define_pd_global(uintx,HeapBaseMinAddress,       256*M);
 // Only used on 64 bit Windows platforms
 define_pd_global(bool, UseVectoredExceptions,    false);
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
--- a/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -730,11 +730,12 @@
   st->print(", RSI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RSI]);
   st->print(", RDI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RDI]);
   st->cr();
-  st->print(", R8=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R8]);
+  st->print(  "R8=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R8]);
   st->print(", R9=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R9]);
   st->print(", R10=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R10]);
   st->print(", R11=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R11]);
-  st->print(", R12=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R12]);
+  st->cr();
+  st->print(  "R12=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R12]);
   st->print(", R13=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R13]);
   st->print(", R14=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R14]);
   st->print(", R15=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R15]);
diff -r 39e409a664b3 -r 84043c7507b9 src/os_cpu/windows_x86/vm/globals_windows_x86.hpp
--- a/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -22,10 +22,9 @@
  *
  */
 
-//
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
-//
+
 define_pd_global(bool, DontYieldALot,            false);
 
 // Default stack size on Windows is determined by the executable (java.exe
@@ -35,8 +34,6 @@
 define_pd_global(intx, ThreadStackSize,          0); // 0 => use system default
 define_pd_global(intx, VMThreadStackSize,        0); // 0 => use system default
 
-define_pd_global(intx, SurvivorRatio,            8);
-
 #ifdef ASSERT
 define_pd_global(intx, CompilerThreadStackSize,  1024);
 #else
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/adlc/archDesc.cpp
--- a/src/share/vm/adlc/archDesc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/adlc/archDesc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1031,7 +1031,8 @@
 //---------------------------addSUNcopyright-------------------------------
 // output SUN copyright info
 void ArchDesc::addSunCopyright(char* legal, int size, FILE *fp) {
-  fwrite(legal, size, 1, fp);
+  size_t count = fwrite(legal, 1, size, fp);
+  assert(count == (size_t) size, "copyright info truncated");
   fprintf(fp,"\n");
   fprintf(fp,"// Machine Generated File.  Do Not Edit!\n");
   fprintf(fp,"\n");
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/adlc/formssel.cpp
--- a/src/share/vm/adlc/formssel.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/adlc/formssel.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -828,11 +828,13 @@
     return AdlcVMDeps::Parms;   // Skip the machine-state edges
 
   if( _matrule->_rChild &&
-      ( strcmp(_matrule->_rChild->_opType,"StrComp"   )==0 ||
+      ( strcmp(_matrule->_rChild->_opType,"AryEq"     )==0 ||
+        strcmp(_matrule->_rChild->_opType,"StrComp"   )==0 ||
         strcmp(_matrule->_rChild->_opType,"StrEquals" )==0 ||
         strcmp(_matrule->_rChild->_opType,"StrIndexOf")==0 )) {
-        // String.(compareTo/equals/indexOf) take 1 control and 4 memory edges.
-    return 5;
+        // String.(compareTo/equals/indexOf) and Arrays.equals
+        // take 1 control and 1 memory edges.
+    return 2;
   }
 
   // Check for handling of 'Memory' input/edge in the ideal world.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/adlc/output_c.cpp
--- a/src/share/vm/adlc/output_c.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/adlc/output_c.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
@@ -1496,7 +1496,7 @@
   unsigned      i;
 
   // Generate Expand function header
-  fprintf(fp,"MachNode *%sNode::Expand(State *state, Node_List &proj_list) {\n", node->_ident);
+  fprintf(fp,"MachNode *%sNode::Expand(State *state, Node_List &proj_list, Node* mem) {\n", node->_ident);
   fprintf(fp,"Compile* C = Compile::current();\n");
   // Generate expand code
   if( node->expands() ) {
@@ -1546,15 +1546,16 @@
     // Build a mapping from operand index to input edges
     fprintf(fp,"  unsigned idx0 = oper_input_base();\n");
 
-    // The order in which inputs are added to a node is very
+    // The order in which the memory input is added to a node is very
     // strange.  Store nodes get a memory input before Expand is
-    // called and all other nodes get it afterwards so
-    // oper_input_base is wrong during expansion.  This code adjusts
-    // is so that expansion will work correctly.
-    bool missing_memory_edge = node->_matrule->needs_ideal_memory_edge(_globalNames) &&
-                               node->is_ideal_store() == Form::none;
-    if (missing_memory_edge) {
-      fprintf(fp,"  idx0--; // Adjust base because memory edge hasn't been inserted yet\n");
+    // called and other nodes get it afterwards or before depending on
+    // match order so oper_input_base is wrong during expansion.  This
+    // code adjusts it so that expansion will work correctly.
+    int has_memory_edge = node->_matrule->needs_ideal_memory_edge(_globalNames);
+    if (has_memory_edge) {
+      fprintf(fp,"  if (mem == (Node*)1) {\n");
+      fprintf(fp,"    idx0--; // Adjust base because memory edge hasn't been inserted yet\n");
+      fprintf(fp,"  }\n");
     }
 
     for( i = 0; i < node->num_opnds(); i++ ) {
@@ -1611,9 +1612,11 @@
         int node_mem_op = node->memory_operand(_globalNames);
         assert( node_mem_op != InstructForm::NO_MEMORY_OPERAND,
                 "expand rule member needs memory but top-level inst doesn't have any" );
-        if (!missing_memory_edge) {
+        if (has_memory_edge) {
           // Copy memory edge
-          fprintf(fp,"  n%d->add_req(_in[1]);\t// Add memory edge\n", cnt);
+          fprintf(fp,"  if (mem != (Node*)1) {\n");
+          fprintf(fp,"    n%d->add_req(_in[1]);\t// Add memory edge\n", cnt);
+          fprintf(fp,"  }\n");
         }
       }
 
@@ -1689,7 +1692,7 @@
       } // done iterating over a new instruction's operands
 
       // Invoke Expand() for the newly created instruction.
-      fprintf(fp,"  result = n%d->Expand( state, proj_list );\n", cnt);
+      fprintf(fp,"  result = n%d->Expand( state, proj_list, mem );\n", cnt);
       assert( !new_inst->expands(), "Do not have complete support for recursive expansion");
     } // done iterating over new instructions
     fprintf(fp,"\n");
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/adlc/output_h.cpp
--- a/src/share/vm/adlc/output_h.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/adlc/output_h.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
@@ -1754,7 +1754,7 @@
         instr->has_temps() ||
         instr->_matrule != NULL &&
         instr->num_opnds() != instr->num_unique_opnds() ) {
-      fprintf(fp,"  virtual MachNode      *Expand(State *state, Node_List &proj_list);\n");
+      fprintf(fp,"  virtual MachNode      *Expand(State *state, Node_List &proj_list, Node* mem);\n");
     }
 
     if (instr->is_pinned(_globalNames)) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/asm/codeBuffer.hpp
--- a/src/share/vm/asm/codeBuffer.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/asm/codeBuffer.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -39,6 +39,7 @@
                  Dtrace_trap = OSR_Entry,  // dtrace probes can never have an OSR entry so reuse it
                  Exceptions,     // Offset where exception handler lives
                  Deopt,          // Offset where deopt handler lives
+                 DeoptMH,        // Offset where MethodHandle deopt handler lives
                  max_Entries };
 
   // special value to note codeBlobs where profile (forte) stack walking is
@@ -51,12 +52,13 @@
 
 public:
   CodeOffsets() {
-    _values[Entry] = 0;
+    _values[Entry         ] = 0;
     _values[Verified_Entry] = 0;
     _values[Frame_Complete] = frame_never_safe;
-    _values[OSR_Entry] = 0;
-    _values[Exceptions] = -1;
-    _values[Deopt] = -1;
+    _values[OSR_Entry     ] = 0;
+    _values[Exceptions    ] = -1;
+    _values[Deopt         ] = -1;
+    _values[DeoptMH       ] = -1;
   }
 
   int value(Entries e) { return _values[e]; }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_Compilation.cpp
--- a/src/share/vm/c1/c1_Compilation.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_Compilation.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -205,6 +205,8 @@
 void Compilation::emit_code_epilog(LIR_Assembler* assembler) {
   CHECK_BAILOUT();
 
+  CodeOffsets* code_offsets = assembler->offsets();
+
   // generate code or slow cases
   assembler->emit_slow_case_stubs();
   CHECK_BAILOUT();
@@ -213,10 +215,18 @@
   assembler->emit_exception_entries(exception_info_list());
   CHECK_BAILOUT();
 
-  // generate code for exception handler
-  assembler->emit_exception_handler();
+  // Generate code for exception handler.
+  code_offsets->set_value(CodeOffsets::Exceptions, assembler->emit_exception_handler());
   CHECK_BAILOUT();
-  assembler->emit_deopt_handler();
+
+  // Generate code for deopt handler.
+  code_offsets->set_value(CodeOffsets::Deopt, assembler->emit_deopt_handler());
+  CHECK_BAILOUT();
+
+  // Generate code for MethodHandle deopt handler.  We can use the
+  // same code as for the normal deopt handler, we just need a
+  // different entry point address.
+  code_offsets->set_value(CodeOffsets::DeoptMH, assembler->emit_deopt_handler());
   CHECK_BAILOUT();
 
   // done
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_GraphBuilder.cpp
--- a/src/share/vm/c1/c1_GraphBuilder.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -365,7 +365,7 @@
     if (_next_loop_index < 31) _next_loop_index++;
   } else {
     // block already marked as loop header
-    assert(is_power_of_2(_loop_map.at(block->block_id())), "exactly one bit must be set");
+    assert(is_power_of_2((unsigned int)_loop_map.at(block->block_id())), "exactly one bit must be set");
   }
 }
 
@@ -1442,7 +1442,7 @@
         switch (field_type) {
         case T_ARRAY:
         case T_OBJECT:
-          if (field_val.as_object()->has_encoding()) {
+          if (field_val.as_object()->should_be_constant()) {
             constant =  new Constant(as_ValueType(field_val));
           }
           break;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_IR.cpp
--- a/src/share/vm/c1/c1_IR.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_IR.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_IR.hpp
--- a/src/share/vm/c1/c1_IR.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_IR.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
@@ -251,8 +251,10 @@
     DebugToken* expvals = recorder->create_scope_values(expressions());
     DebugToken* monvals = recorder->create_monitor_values(monitors());
     // reexecute allowed only for the topmost frame
-    bool      reexecute = topmost ? should_reexecute() : false;
-    recorder->describe_scope(pc_offset, scope()->method(), bci(), reexecute, locvals, expvals, monvals);
+    bool reexecute = topmost ? should_reexecute() : false;
+    bool is_method_handle_invoke = false;
+    bool return_oop = false; // This flag will be ignored since it used only for C2 with escape analysis.
+    recorder->describe_scope(pc_offset, scope()->method(), bci(), reexecute, is_method_handle_invoke, return_oop, locvals, expvals, monvals);
   }
 };
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_InstructionPrinter.cpp
--- a/src/share/vm/c1/c1_InstructionPrinter.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_InstructionPrinter.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -133,12 +133,12 @@
       ciMethod* m = (ciMethod*)value;
       output()->print("<method %s.%s>", m->holder()->name()->as_utf8(), m->name()->as_utf8());
     } else {
-      output()->print("<object 0x%x>", value->encoding());
+      output()->print("<object 0x%x>", value->constant_encoding());
     }
   } else if (type->as_InstanceConstant() != NULL) {
-    output()->print("<instance 0x%x>", type->as_InstanceConstant()->value()->encoding());
+    output()->print("<instance 0x%x>", type->as_InstanceConstant()->value()->constant_encoding());
   } else if (type->as_ArrayConstant() != NULL) {
-    output()->print("<array 0x%x>", type->as_ArrayConstant()->value()->encoding());
+    output()->print("<array 0x%x>", type->as_ArrayConstant()->value()->constant_encoding());
   } else if (type->as_ClassConstant() != NULL) {
     ciInstanceKlass* klass = type->as_ClassConstant()->value();
     if (!klass->is_loaded()) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_LIR.cpp
--- a/src/share/vm/c1/c1_LIR.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_LIR.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -567,8 +567,6 @@
     case lir_rem:
     case lir_sqrt:
     case lir_abs:
-    case lir_log:
-    case lir_log10:
     case lir_logic_and:
     case lir_logic_or:
     case lir_logic_xor:
@@ -644,13 +642,16 @@
 
     case lir_tan:
     case lir_sin:
-    case lir_cos: {
+    case lir_cos:
+    case lir_log:
+    case lir_log10: {
       assert(op->as_Op2() != NULL, "must be");
       LIR_Op2* op2 = (LIR_Op2*)op;
 
-      // sin and cos need two temporary fpu stack slots, so register
-      // two temp operands.  Register input operand as temp to
-      // guarantee that they do not overlap
+      // On x86 tan/sin/cos need two temporary fpu stack slots and
+      // log/log10 need one so handle opr2 and tmp as temp inputs.
+      // Register input operand as temp to guarantee that it doesn't
+      // overlap with the input.
       assert(op2->_info == NULL, "not used");
       assert(op2->_opr1->is_valid(), "used");
       do_input(op2->_opr1); do_temp(op2->_opr1);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_LIR.hpp
--- a/src/share/vm/c1/c1_LIR.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_LIR.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2010 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
@@ -1840,8 +1840,8 @@
 
   void abs (LIR_Opr from, LIR_Opr to, LIR_Opr tmp)                { append(new LIR_Op2(lir_abs , from, tmp, to)); }
   void sqrt(LIR_Opr from, LIR_Opr to, LIR_Opr tmp)                { append(new LIR_Op2(lir_sqrt, from, tmp, to)); }
-  void log (LIR_Opr from, LIR_Opr to, LIR_Opr tmp)                { append(new LIR_Op2(lir_log,  from, tmp, to)); }
-  void log10 (LIR_Opr from, LIR_Opr to, LIR_Opr tmp)              { append(new LIR_Op2(lir_log10, from, tmp, to)); }
+  void log (LIR_Opr from, LIR_Opr to, LIR_Opr tmp)                { append(new LIR_Op2(lir_log,  from, LIR_OprFact::illegalOpr, to, tmp)); }
+  void log10 (LIR_Opr from, LIR_Opr to, LIR_Opr tmp)              { append(new LIR_Op2(lir_log10, from, LIR_OprFact::illegalOpr, to, tmp)); }
   void sin (LIR_Opr from, LIR_Opr to, LIR_Opr tmp1, LIR_Opr tmp2) { append(new LIR_Op2(lir_sin , from, tmp1, to, tmp2)); }
   void cos (LIR_Opr from, LIR_Opr to, LIR_Opr tmp1, LIR_Opr tmp2) { append(new LIR_Op2(lir_cos , from, tmp1, to, tmp2)); }
   void tan (LIR_Opr from, LIR_Opr to, LIR_Opr tmp1, LIR_Opr tmp2) { append(new LIR_Op2(lir_tan , from, tmp1, to, tmp2)); }
@@ -2000,7 +2000,7 @@
   typedef enum { inputMode, firstMode = inputMode, tempMode, outputMode, numModes, invalidMode = -1 } OprMode;
 
   enum {
-    maxNumberOfOperands = 14,
+    maxNumberOfOperands = 16,
     maxNumberOfInfos = 4
   };
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_LIRAssembler.cpp
--- a/src/share/vm/c1/c1_LIRAssembler.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_LIRAssembler.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_LIRAssembler.hpp
--- a/src/share/vm/c1/c1_LIRAssembler.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_LIRAssembler.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2010 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
@@ -133,9 +133,9 @@
   void add_call_info_here(CodeEmitInfo* info)                              { add_call_info(code_offset(), info); }
 
   // code patterns
-  void emit_exception_handler();
+  int  emit_exception_handler();
   void emit_exception_entries(ExceptionInfoList* info_list);
-  void emit_deopt_handler();
+  int  emit_deopt_handler();
 
   void emit_code(BlockList* hir);
   void emit_block(BlockBegin* block);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_LIRGenerator.cpp
--- a/src/share/vm/c1/c1_LIRGenerator.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2010 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
@@ -440,7 +440,7 @@
     __ oop2reg_patch(NULL, r, info);
   } else {
     // no patching needed
-    __ oop2reg(obj->encoding(), r);
+    __ oop2reg(obj->constant_encoding(), r);
   }
 }
 
@@ -831,7 +831,7 @@
     int taken_count_offset     = md->byte_offset_of_slot(data, BranchData::taken_offset());
     int not_taken_count_offset = md->byte_offset_of_slot(data, BranchData::not_taken_offset());
     LIR_Opr md_reg = new_register(T_OBJECT);
-    __ move(LIR_OprFact::oopConst(md->encoding()), md_reg);
+    __ move(LIR_OprFact::oopConst(md->constant_encoding()), md_reg);
     LIR_Opr data_offset_reg = new_register(T_INT);
     __ cmove(lir_cond(cond),
              LIR_OprFact::intConst(taken_count_offset),
@@ -1071,7 +1071,7 @@
     LIR_OprList* args = new LIR_OprList();
     args->append(getThreadPointer());
     LIR_Opr meth = new_register(T_OBJECT);
-    __ oop2reg(method()->encoding(), meth);
+    __ oop2reg(method()->constant_encoding(), meth);
     args->append(meth);
     call_runtime(&signature, args, CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), voidType, NULL);
   }
@@ -1765,7 +1765,7 @@
     __ null_check(exception_opr, new CodeEmitInfo(info, true));
   }
 
-  if (compilation()->env()->jvmti_can_post_exceptions() &&
+  if (compilation()->env()->jvmti_can_post_on_exceptions() &&
       !block()->is_set(BlockBegin::default_exception_handler_flag)) {
     // we need to go through the exception lookup path to get JVMTI
     // notification done
@@ -1784,7 +1784,7 @@
     LIR_OprList* args = new LIR_OprList();
     args->append(getThreadPointer());
     LIR_Opr meth = new_register(T_OBJECT);
-    __ oop2reg(method()->encoding(), meth);
+    __ oop2reg(method()->constant_encoding(), meth);
     args->append(meth);
     call_runtime(&signature, args, CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), voidType, NULL);
   }
@@ -1855,12 +1855,26 @@
     addr = new LIR_Address(base_op, index_op->as_jint(), dst_type);
   } else {
 #ifdef X86
+#ifdef _LP64
+    if (!index_op->is_illegal() && index_op->type() == T_INT) {
+      LIR_Opr tmp = new_pointer_register();
+      __ convert(Bytecodes::_i2l, index_op, tmp);
+      index_op = tmp;
+    }
+#endif
     addr = new LIR_Address(base_op, index_op, LIR_Address::Scale(log2_scale), 0, dst_type);
 #else
     if (index_op->is_illegal() || log2_scale == 0) {
+#ifdef _LP64
+      if (!index_op->is_illegal() && index_op->type() == T_INT) {
+        LIR_Opr tmp = new_pointer_register();
+        __ convert(Bytecodes::_i2l, index_op, tmp);
+        index_op = tmp;
+      }
+#endif
       addr = new LIR_Address(base_op, index_op, dst_type);
     } else {
-      LIR_Opr tmp = new_register(T_INT);
+      LIR_Opr tmp = new_pointer_register();
       __ shift_left(index_op, log2_scale, tmp);
       addr = new LIR_Address(base_op, tmp, dst_type);
     }
@@ -1915,10 +1929,25 @@
   LIR_Opr index_op = idx.result();
   if (log2_scale != 0) {
     // temporary fix (platform dependent code without shift on Intel would be better)
-    index_op = new_register(T_INT);
-    __ move(idx.result(), index_op);
+    index_op = new_pointer_register();
+#ifdef _LP64
+    if(idx.result()->type() == T_INT) {
+      __ convert(Bytecodes::_i2l, idx.result(), index_op);
+    } else {
+#endif
+      __ move(idx.result(), index_op);
+#ifdef _LP64
+    }
+#endif
     __ shift_left(index_op, log2_scale, index_op);
   }
+#ifdef _LP64
+  else if(!index_op->is_illegal() && index_op->type() == T_INT) {
+    LIR_Opr tmp = new_pointer_register();
+    __ convert(Bytecodes::_i2l, index_op, tmp);
+    index_op = tmp;
+  }
+#endif
 
   LIR_Address* addr = new LIR_Address(base_op, index_op, x->basic_type());
   __ move(value.result(), addr);
@@ -2207,7 +2236,7 @@
     LIR_OprList* args = new LIR_OprList();
     args->append(getThreadPointer());
     LIR_Opr meth = new_register(T_OBJECT);
-    __ oop2reg(method()->encoding(), meth);
+    __ oop2reg(method()->constant_encoding(), meth);
     args->append(meth);
     call_runtime(&signature, args, CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry), voidType, NULL);
   }
@@ -2216,7 +2245,7 @@
     LIR_Opr obj;
     if (method()->is_static()) {
       obj = new_register(T_OBJECT);
-      __ oop2reg(method()->holder()->java_mirror()->encoding(), obj);
+      __ oop2reg(method()->holder()->java_mirror()->constant_encoding(), obj);
     } else {
       Local* receiver = x->state()->local_at(0)->as_Local();
       assert(receiver != NULL, "must already exist");
@@ -2660,7 +2689,7 @@
     }
 
     LIR_Opr meth = new_register(T_OBJECT);
-    __ oop2reg(method()->encoding(), meth);
+    __ oop2reg(method()->constant_encoding(), meth);
     LIR_Opr result = increment_and_return_counter(meth, offset, InvocationCounter::count_increment);
     __ cmp(lir_cond_aboveEqual, result, LIR_OprFact::intConst(limit));
     CodeStub* overflow = new CounterOverflowStub(info, info->bci());
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_LinearScan.cpp
--- a/src/share/vm/c1/c1_LinearScan.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_LinearScan.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -2464,6 +2464,10 @@
 
     case T_LONG: // fall through
     case T_DOUBLE: {
+#ifdef _LP64
+      scope_values->append(&_int_0_scope_value);
+      scope_values->append(new ConstantLongValue(c->as_jlong_bits()));
+#else
       if (hi_word_offset_in_bytes > lo_word_offset_in_bytes) {
         scope_values->append(new ConstantIntValue(c->as_jint_hi_bits()));
         scope_values->append(new ConstantIntValue(c->as_jint_lo_bits()));
@@ -2471,7 +2475,7 @@
         scope_values->append(new ConstantIntValue(c->as_jint_lo_bits()));
         scope_values->append(new ConstantIntValue(c->as_jint_hi_bits()));
       }
-
+#endif
       return 2;
     }
 
@@ -2503,17 +2507,18 @@
   } else if (opr->is_single_cpu()) {
     bool is_oop = opr->is_oop_register();
     int cache_idx = opr->cpu_regnr() * 2 + (is_oop ? 1 : 0);
+    Location::Type int_loc_type = NOT_LP64(Location::normal) LP64_ONLY(Location::int_in_long);
 
     ScopeValue* sv = _scope_value_cache.at(cache_idx);
     if (sv == NULL) {
-      Location::Type loc_type = is_oop ? Location::oop : Location::normal;
+      Location::Type loc_type = is_oop ? Location::oop : int_loc_type;
       VMReg rname = frame_map()->regname(opr);
       sv = new LocationValue(Location::new_reg_loc(loc_type, rname));
       _scope_value_cache.at_put(cache_idx, sv);
     }
 
     // check if cached value is correct
-    DEBUG_ONLY(assert_equal(sv, new LocationValue(Location::new_reg_loc(is_oop ? Location::oop : Location::normal, frame_map()->regname(opr)))));
+    DEBUG_ONLY(assert_equal(sv, new LocationValue(Location::new_reg_loc(is_oop ? Location::oop : int_loc_type, frame_map()->regname(opr)))));
 
     scope_values->append(sv);
     return 1;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_Runtime1.cpp
--- a/src/share/vm/c1/c1_Runtime1.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_Runtime1.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -110,8 +110,8 @@
     RegisterMap reg_map(thread, false);
     frame runtime_frame = thread->last_frame();
     frame caller_frame = runtime_frame.sender(&reg_map);
-    VM_DeoptimizeFrame deopt(thread, caller_frame.id());
-    VMThread::execute(&deopt);
+    // bypass VM_DeoptimizeFrame and deoptimize the frame directly
+    Deoptimization::deoptimize_frame(thread, caller_frame.id());
     assert(caller_is_deopted(), "Must be deoptimized");
   }
 }
@@ -354,7 +354,7 @@
 
 
 JRT_ENTRY(void, Runtime1::post_jvmti_exception_throw(JavaThread* thread))
-  if (JvmtiExport::can_post_exceptions()) {
+  if (JvmtiExport::can_post_on_exceptions()) {
     vframeStream vfst(thread, true);
     address bcp = vfst.method()->bcp_from(vfst.bci());
     JvmtiExport::post_exception_throw(thread, vfst.method(), bcp, thread->exception_oop());
@@ -425,7 +425,7 @@
   assert(exception.not_null(), "NULL exceptions should be handled by throw_exception");
   assert(exception->is_oop(), "just checking");
   // Check that exception is a subclass of Throwable, otherwise we have a VerifyError
-  if (!(exception->is_a(SystemDictionary::throwable_klass()))) {
+  if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
     if (ExitVMOnVerifyError) vm_exit(-1);
     ShouldNotReachHere();
   }
@@ -437,7 +437,7 @@
   bool guard_pages_enabled = thread->stack_yellow_zone_enabled();
   if (!guard_pages_enabled) guard_pages_enabled = thread->reguard_stack();
 
-  if (JvmtiExport::can_post_exceptions()) {
+  if (JvmtiExport::can_post_on_exceptions()) {
     // To ensure correct notification of exception catches and throws
     // we have to deoptimize here.  If we attempted to notify the
     // catches and throws during this exception lookup it's possible
@@ -1075,6 +1075,7 @@
 };
 
 
+// Below length is the # elements copied.
 template <class T> int obj_arraycopy_work(oopDesc* src, T* src_addr,
                                           oopDesc* dst, T* dst_addr,
                                           int length) {
@@ -1083,22 +1084,22 @@
   // barrier. The assert will fail if this is not the case.
   // Note that we use the non-virtual inlineable variant of write_ref_array.
   BarrierSet* bs = Universe::heap()->barrier_set();
-  assert(bs->has_write_ref_array_opt(),
-         "Barrier set must have ref array opt");
+  assert(bs->has_write_ref_array_opt(), "Barrier set must have ref array opt");
+  assert(bs->has_write_ref_array_pre_opt(), "For pre-barrier as well.");
   if (src == dst) {
     // same object, no check
+    bs->write_ref_array_pre(dst_addr, length);
     Copy::conjoint_oops_atomic(src_addr, dst_addr, length);
-    bs->write_ref_array(MemRegion((HeapWord*)dst_addr,
-                                  (HeapWord*)(dst_addr + length)));
+    bs->write_ref_array((HeapWord*)dst_addr, length);
     return ac_ok;
   } else {
     klassOop bound = objArrayKlass::cast(dst->klass())->element_klass();
     klassOop stype = objArrayKlass::cast(src->klass())->element_klass();
     if (stype == bound || Klass::cast(stype)->is_subtype_of(bound)) {
       // Elements are guaranteed to be subtypes, so no check necessary
+      bs->write_ref_array_pre(dst_addr, length);
       Copy::conjoint_oops_atomic(src_addr, dst_addr, length);
-      bs->write_ref_array(MemRegion((HeapWord*)dst_addr,
-                                    (HeapWord*)(dst_addr + length)));
+      bs->write_ref_array((HeapWord*)dst_addr, length);
       return ac_ok;
     }
   }
@@ -1162,9 +1163,16 @@
 #endif
 
   if (num == 0) return;
+  BarrierSet* bs = Universe::heap()->barrier_set();
+  assert(bs->has_write_ref_array_opt(), "Barrier set must have ref array opt");
+  assert(bs->has_write_ref_array_pre_opt(), "For pre-barrier as well.");
+  if (UseCompressedOops) {
+    bs->write_ref_array_pre((narrowOop*)dst, num);
+  } else {
+    bs->write_ref_array_pre((oop*)dst, num);
+  }
   Copy::conjoint_oops_atomic((oop*) src, (oop*) dst, num);
-  BarrierSet* bs = Universe::heap()->barrier_set();
-  bs->write_ref_array(MemRegion(dst, dst + num));
+  bs->write_ref_array(dst, num);
 JRT_END
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/c1/c1_ValueType.cpp
--- a/src/share/vm/c1/c1_ValueType.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/c1/c1_ValueType.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -86,7 +86,7 @@
 
 jobject ObjectType::encoding() const {
   assert(is_constant(), "must be");
-  return constant_value()->encoding();
+  return constant_value()->constant_encoding();
 }
 
 bool ObjectType::is_loaded() const {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/bcEscapeAnalyzer.hpp
--- a/src/share/vm/ci/bcEscapeAnalyzer.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/bcEscapeAnalyzer.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -61,9 +61,11 @@
   BCEscapeAnalyzer* _parent;
   int               _level;
 
+ public:
   class  ArgumentMap;
   class  StateInfo;
 
+ private:
   // helper functions
   bool is_argument(int i)    { return i >= 0 && i < _arg_size; }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciCPCache.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/ci/ciCPCache.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 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/_ciCPCache.cpp.incl"
+
+// ciCPCache
+
+// ------------------------------------------------------------------
+// ciCPCache::get_f1_offset
+size_t ciCPCache::get_f1_offset(int index) {
+  // Calculate the offset from the constantPoolCacheOop to the f1
+  // field.
+  ByteSize f1_offset =
+    constantPoolCacheOopDesc::entry_offset(index) +
+    ConstantPoolCacheEntry::f1_offset();
+
+  return in_bytes(f1_offset);
+}
+
+
+// ------------------------------------------------------------------
+// ciCPCache::print
+//
+// Print debugging information about the cache.
+void ciCPCache::print() {
+  Unimplemented();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciCPCache.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/ci/ciCPCache.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+// ciCPCache
+//
+// This class represents a constant pool cache.
+//
+// Note: This class is called ciCPCache as ciConstantPoolCache is used
+// for something different.
+class ciCPCache : public ciObject {
+public:
+  ciCPCache(constantPoolCacheHandle cpcache) : ciObject(cpcache) {}
+
+  // What kind of ciObject is this?
+  bool is_cpcache() const { return true; }
+
+  // Get the offset in bytes from the oop to the f1 field of the
+  // requested entry.
+  size_t get_f1_offset(int index);
+
+  void print();
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciCallSite.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/ci/ciCallSite.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009 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/_ciCallSite.cpp.incl"
+
+// ciCallSite
+
+// ------------------------------------------------------------------
+// ciCallSite::get_target
+//
+// Return the target MethodHandle of this CallSite.
+ciMethodHandle* ciCallSite::get_target() const {
+  VM_ENTRY_MARK;
+  oop method_handle_oop = java_dyn_CallSite::target(get_oop());
+  return CURRENT_ENV->get_object(method_handle_oop)->as_method_handle();
+}
+
+// ------------------------------------------------------------------
+// ciCallSite::print
+//
+// Print debugging information about the CallSite.
+void ciCallSite::print() {
+  Unimplemented();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciCallSite.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/ci/ciCallSite.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+// ciCallSite
+//
+// The class represents a java.dyn.CallSite object.
+class ciCallSite : public ciInstance {
+public:
+  ciCallSite(instanceHandle h_i) : ciInstance(h_i) {}
+
+  // What kind of ciObject is this?
+  bool is_call_site() const { return true; }
+
+  // Return the target MethodHandle of this CallSite.
+  ciMethodHandle* get_target() const;
+
+  void print();
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciClassList.hpp
--- a/src/share/vm/ci/ciClassList.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciClassList.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -25,6 +25,7 @@
 class ciEnv;
 class ciObjectFactory;
 class ciConstantPoolCache;
+class ciCPCache;
 
 class ciField;
 class ciConstant;
@@ -42,6 +43,8 @@
 class ciObject;
 class   ciNullObject;
 class   ciInstance;
+class     ciCallSite;
+class     ciMethodHandle;
 class   ciMethod;
 class   ciMethodData;
 class     ciReceiverTypeData;  // part of ciMethodData
@@ -78,6 +81,7 @@
 // Any more access must be given explicitly.
 #define CI_PACKAGE_ACCESS_TO           \
 friend class ciObjectFactory;          \
+friend class ciCallSite;               \
 friend class ciConstantPoolCache;      \
 friend class ciField;                  \
 friend class ciConstant;               \
@@ -93,6 +97,7 @@
 friend class ciInstance;               \
 friend class ciMethod;                 \
 friend class ciMethodData;             \
+friend class ciMethodHandle;           \
 friend class ciReceiverTypeData;       \
 friend class ciSymbol;                 \
 friend class ciArray;                  \
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciEnv.cpp
--- a/src/share/vm/ci/ciEnv.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciEnv.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -38,14 +38,9 @@
 ciTypeArrayKlassKlass* ciEnv::_type_array_klass_klass_instance;
 ciObjArrayKlassKlass*  ciEnv::_obj_array_klass_klass_instance;
 
-ciInstanceKlass* ciEnv::_ArrayStoreException;
-ciInstanceKlass* ciEnv::_Class;
-ciInstanceKlass* ciEnv::_ClassCastException;
-ciInstanceKlass* ciEnv::_Object;
-ciInstanceKlass* ciEnv::_Throwable;
-ciInstanceKlass* ciEnv::_Thread;
-ciInstanceKlass* ciEnv::_OutOfMemoryError;
-ciInstanceKlass* ciEnv::_String;
+#define WK_KLASS_DEFN(name, ignore_s, ignore_o) ciInstanceKlass* ciEnv::_##name = NULL;
+WK_KLASSES_DO(WK_KLASS_DEFN)
+#undef WK_KLASS_DEFN
 
 ciSymbol*        ciEnv::_unloaded_cisymbol = NULL;
 ciInstanceKlass* ciEnv::_unloaded_ciinstance_klass = NULL;
@@ -110,6 +105,8 @@
   _ArrayIndexOutOfBoundsException_instance = NULL;
   _ArrayStoreException_instance = NULL;
   _ClassCastException_instance = NULL;
+  _the_null_string = NULL;
+  _the_min_jint_string = NULL;
 }
 
 ciEnv::ciEnv(Arena* arena) {
@@ -163,6 +160,8 @@
   _ArrayIndexOutOfBoundsException_instance = NULL;
   _ArrayStoreException_instance = NULL;
   _ClassCastException_instance = NULL;
+  _the_null_string = NULL;
+  _the_min_jint_string = NULL;
 }
 
 ciEnv::~ciEnv() {
@@ -179,7 +178,7 @@
   _jvmti_can_hotswap_or_post_breakpoint = JvmtiExport::can_hotswap_or_post_breakpoint();
   _jvmti_can_examine_or_deopt_anywhere  = JvmtiExport::can_examine_or_deopt_anywhere();
   _jvmti_can_access_local_variables     = JvmtiExport::can_access_local_variables();
-  _jvmti_can_post_exceptions            = JvmtiExport::can_post_exceptions();
+  _jvmti_can_post_on_exceptions         = JvmtiExport::can_post_on_exceptions();
 }
 
 // ------------------------------------------------------------------
@@ -248,6 +247,22 @@
   return _ClassCastException_instance;
 }
 
+ciInstance* ciEnv::the_null_string() {
+  if (_the_null_string == NULL) {
+    VM_ENTRY_MARK;
+    _the_null_string = get_object(Universe::the_null_string())->as_instance();
+  }
+  return _the_null_string;
+}
+
+ciInstance* ciEnv::the_min_jint_string() {
+  if (_the_min_jint_string == NULL) {
+    VM_ENTRY_MARK;
+    _the_min_jint_string = get_object(Universe::the_min_jint_string())->as_instance();
+  }
+  return _the_min_jint_string;
+}
+
 // ------------------------------------------------------------------
 // ciEnv::get_method_from_handle
 ciMethod* ciEnv::get_method_from_handle(jobject method) {
@@ -257,7 +272,7 @@
 
 // ------------------------------------------------------------------
 // ciEnv::make_array
-ciArray* ciEnv::make_array(GrowableArray<ciObject*>* objects) {
+ciArray* ciEnv::make_system_array(GrowableArray<ciObject*>* objects) {
   VM_ENTRY_MARK;
   int length = objects->length();
   objArrayOop a = oopFactory::new_system_objArray(length, THREAD);
@@ -419,12 +434,11 @@
 // ciEnv::get_klass_by_index_impl
 //
 // Implementation of get_klass_by_index.
-ciKlass* ciEnv::get_klass_by_index_impl(ciInstanceKlass* accessor,
+ciKlass* ciEnv::get_klass_by_index_impl(constantPoolHandle cpool,
                                         int index,
-                                        bool& is_accessible) {
-  assert(accessor->get_instanceKlass()->is_linked(), "must be linked before accessing constant pool");
+                                        bool& is_accessible,
+                                        ciInstanceKlass* accessor) {
   EXCEPTION_CONTEXT;
-  constantPoolHandle cpool(THREAD, accessor->get_instanceKlass()->constants());
   KlassHandle klass (THREAD, constantPoolOopDesc::klass_at_if_loaded(cpool, index));
   symbolHandle klass_name;
   if (klass.is_null()) {
@@ -486,22 +500,21 @@
 // ciEnv::get_klass_by_index
 //
 // Get a klass from the constant pool.
-ciKlass* ciEnv::get_klass_by_index(ciInstanceKlass* accessor,
+ciKlass* ciEnv::get_klass_by_index(constantPoolHandle cpool,
                                    int index,
-                                   bool& is_accessible) {
-  GUARDED_VM_ENTRY(return get_klass_by_index_impl(accessor, index, is_accessible);)
+                                   bool& is_accessible,
+                                   ciInstanceKlass* accessor) {
+  GUARDED_VM_ENTRY(return get_klass_by_index_impl(cpool, index, is_accessible, accessor);)
 }
 
 // ------------------------------------------------------------------
 // ciEnv::get_constant_by_index_impl
 //
 // Implementation of get_constant_by_index().
-ciConstant ciEnv::get_constant_by_index_impl(ciInstanceKlass* accessor,
-                                             int index) {
+ciConstant ciEnv::get_constant_by_index_impl(constantPoolHandle cpool,
+                                             int index,
+                                             ciInstanceKlass* accessor) {
   EXCEPTION_CONTEXT;
-  instanceKlass* ik_accessor = accessor->get_instanceKlass();
-  assert(ik_accessor->is_linked(), "must be linked before accessing constant pool");
-  constantPoolOop cpool = ik_accessor->constants();
   constantTag tag = cpool->tag_at(index);
   if (tag.is_int()) {
     return ciConstant(T_INT, (jint)cpool->int_at(index));
@@ -529,7 +542,7 @@
   } else if (tag.is_klass() || tag.is_unresolved_klass()) {
     // 4881222: allow ldc to take a class type
     bool ignore;
-    ciKlass* klass = get_klass_by_index_impl(accessor, index, ignore);
+    ciKlass* klass = get_klass_by_index_impl(cpool, index, ignore, accessor);
     if (HAS_PENDING_EXCEPTION) {
       CLEAR_PENDING_EXCEPTION;
       record_out_of_memory_failure();
@@ -538,6 +551,11 @@
     assert (klass->is_instance_klass() || klass->is_array_klass(),
             "must be an instance or array klass ");
     return ciConstant(T_OBJECT, klass);
+  } else if (tag.is_object()) {
+    oop obj = cpool->object_at(index);
+    assert(obj->is_instance(), "must be an instance");
+    ciObject* ciobj = get_object(obj);
+    return ciConstant(T_OBJECT, ciobj);
   } else {
     ShouldNotReachHere();
     return ciConstant();
@@ -574,9 +592,10 @@
 // Pull a constant out of the constant pool.  How appropriate.
 //
 // Implementation note: this query is currently in no way cached.
-ciConstant ciEnv::get_constant_by_index(ciInstanceKlass* accessor,
-                                        int index) {
-  GUARDED_VM_ENTRY(return get_constant_by_index_impl(accessor, index); )
+ciConstant ciEnv::get_constant_by_index(constantPoolHandle cpool,
+                                        int index,
+                                        ciInstanceKlass* accessor) {
+  GUARDED_VM_ENTRY(return get_constant_by_index_impl(cpool, index, accessor);)
 }
 
 // ------------------------------------------------------------------
@@ -586,7 +605,7 @@
 //
 // Implementation note: this query is currently in no way cached.
 bool ciEnv::is_unresolved_string(ciInstanceKlass* accessor,
-                                        int index) const {
+                                 int index) const {
   GUARDED_VM_ENTRY(return is_unresolved_string_impl(accessor->get_instanceKlass(), index); )
 }
 
@@ -597,7 +616,7 @@
 //
 // Implementation note: this query is currently in no way cached.
 bool ciEnv::is_unresolved_klass(ciInstanceKlass* accessor,
-                                        int index) const {
+                                int index) const {
   GUARDED_VM_ENTRY(return is_unresolved_klass_impl(accessor->get_instanceKlass(), index); )
 }
 
@@ -678,22 +697,17 @@
 
 // ------------------------------------------------------------------
 // ciEnv::get_method_by_index_impl
-ciMethod* ciEnv::get_method_by_index_impl(ciInstanceKlass* accessor,
-                                     int index, Bytecodes::Code bc) {
-  // Get the method's declared holder.
-
-  assert(accessor->get_instanceKlass()->is_linked(), "must be linked before accessing constant pool");
-  constantPoolHandle cpool = accessor->get_instanceKlass()->constants();
+ciMethod* ciEnv::get_method_by_index_impl(constantPoolHandle cpool,
+                                          int index, Bytecodes::Code bc,
+                                          ciInstanceKlass* accessor) {
   int holder_index = cpool->klass_ref_index_at(index);
   bool holder_is_accessible;
-  ciKlass* holder = get_klass_by_index_impl(accessor, holder_index, holder_is_accessible);
+  ciKlass* holder = get_klass_by_index_impl(cpool, holder_index, holder_is_accessible, accessor);
   ciInstanceKlass* declared_holder = get_instance_klass_for_declared_method_holder(holder);
 
   // Get the method's name and signature.
-  int nt_index = cpool->name_and_type_ref_index_at(index);
-  int sig_index = cpool->signature_ref_index_at(nt_index);
   symbolOop name_sym = cpool->name_ref_at(index);
-  symbolOop sig_sym = cpool->symbol_at(sig_index);
+  symbolOop sig_sym  = cpool->signature_ref_at(index);
 
   if (holder_is_accessible) { // Our declared holder is loaded.
     instanceKlass* lookup = declared_holder->get_instanceKlass();
@@ -715,6 +729,33 @@
 
 
 // ------------------------------------------------------------------
+// ciEnv::get_fake_invokedynamic_method_impl
+ciMethod* ciEnv::get_fake_invokedynamic_method_impl(constantPoolHandle cpool,
+                                                    int index, Bytecodes::Code bc) {
+  assert(bc == Bytecodes::_invokedynamic, "must be invokedynamic");
+
+  // Get the CallSite from the constant pool cache.
+  ConstantPoolCacheEntry* cpc_entry = cpool->cache()->secondary_entry_at(index);
+  assert(cpc_entry != NULL && cpc_entry->is_secondary_entry(), "sanity");
+  Handle call_site = cpc_entry->f1();
+
+  // Call site might not be linked yet.
+  if (call_site.is_null()) {
+    ciInstanceKlass* mh_klass = get_object(SystemDictionary::MethodHandle_klass())->as_instance_klass();
+    ciSymbol*       sig_sym   = get_object(cpool->signature_ref_at(index))->as_symbol();
+    return get_unloaded_method(mh_klass, ciSymbol::invoke_name(), sig_sym);
+  }
+
+  // Get the methodOop from the CallSite.
+  methodOop method_oop = (methodOop) java_dyn_CallSite::vmmethod(call_site());
+  assert(method_oop != NULL, "sanity");
+  assert(method_oop->is_method_handle_invoke(), "consistent");
+
+  return get_object(method_oop)->as_method();
+}
+
+
+// ------------------------------------------------------------------
 // ciEnv::get_instance_klass_for_declared_method_holder
 ciInstanceKlass* ciEnv::get_instance_klass_for_declared_method_holder(ciKlass* method_holder) {
   // For the case of <array>.clone(), the method holder can be a ciArrayKlass
@@ -736,15 +777,19 @@
 }
 
 
-
-
 // ------------------------------------------------------------------
 // ciEnv::get_method_by_index
-ciMethod* ciEnv::get_method_by_index(ciInstanceKlass* accessor,
-                                     int index, Bytecodes::Code bc) {
-  GUARDED_VM_ENTRY(return get_method_by_index_impl(accessor, index, bc);)
+ciMethod* ciEnv::get_method_by_index(constantPoolHandle cpool,
+                                     int index, Bytecodes::Code bc,
+                                     ciInstanceKlass* accessor) {
+  if (bc == Bytecodes::_invokedynamic) {
+    GUARDED_VM_ENTRY(return get_fake_invokedynamic_method_impl(cpool, index, bc);)
+  } else {
+    GUARDED_VM_ENTRY(return get_method_by_index_impl(cpool, index, bc, accessor);)
+  }
 }
 
+
 // ------------------------------------------------------------------
 // ciEnv::name_buffer
 char *ciEnv::name_buffer(int req_len) {
@@ -846,8 +891,8 @@
            JvmtiExport::can_examine_or_deopt_anywhere()) ||
           (!jvmti_can_access_local_variables() &&
            JvmtiExport::can_access_local_variables()) ||
-          (!jvmti_can_post_exceptions() &&
-           JvmtiExport::can_post_exceptions()) )) {
+          (!jvmti_can_post_on_exceptions() &&
+           JvmtiExport::can_post_on_exceptions()) )) {
       record_failure("Jvmti state change invalidated dependencies");
     }
 
@@ -917,18 +962,10 @@
     if (nm == NULL) {
       // The CodeCache is full.  Print out warning and disable compilation.
       record_failure("code cache is full");
-      UseInterpreter = true;
-      if (UseCompiler || AlwaysCompileLoopMethods ) {
-#ifndef PRODUCT
-        warning("CodeCache is full. Compiler has been disabled");
-        if (CompileTheWorld || ExitOnFullCodeCache) {
-          before_exit(JavaThread::current());
-          exit_globals(); // will delete tty
-          vm_direct_exit(CompileTheWorld ? 0 : 1);
-        }
-#endif
-        UseCompiler               = false;
-        AlwaysCompileLoopMethods  = false;
+      {
+        MutexUnlocker ml(Compile_lock);
+        MutexUnlocker locker(MethodCompileQueue_lock);
+        CompileBroker::handle_full_code_cache();
       }
     } else {
       NOT_PRODUCT(nm->set_has_debug_info(has_debug_info); )
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciEnv.hpp
--- a/src/share/vm/ci/ciEnv.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciEnv.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -57,7 +57,7 @@
   bool  _jvmti_can_hotswap_or_post_breakpoint;
   bool  _jvmti_can_examine_or_deopt_anywhere;
   bool  _jvmti_can_access_local_variables;
-  bool  _jvmti_can_post_exceptions;
+  bool  _jvmti_can_post_on_exceptions;
 
   // Cache DTrace flags
   bool  _dtrace_extended_probes;
@@ -74,14 +74,9 @@
   static ciTypeArrayKlassKlass* _type_array_klass_klass_instance;
   static ciObjArrayKlassKlass*  _obj_array_klass_klass_instance;
 
-  static ciInstanceKlass* _ArrayStoreException;
-  static ciInstanceKlass* _Class;
-  static ciInstanceKlass* _ClassCastException;
-  static ciInstanceKlass* _Object;
-  static ciInstanceKlass* _Throwable;
-  static ciInstanceKlass* _Thread;
-  static ciInstanceKlass* _OutOfMemoryError;
-  static ciInstanceKlass* _String;
+#define WK_KLASS_DECL(name, ignore_s, ignore_o) static ciInstanceKlass* _##name;
+  WK_KLASSES_DO(WK_KLASS_DECL)
+#undef WK_KLASS_DECL
 
   static ciSymbol*        _unloaded_cisymbol;
   static ciInstanceKlass* _unloaded_ciinstance_klass;
@@ -97,6 +92,9 @@
   ciInstance* _ArrayStoreException_instance;
   ciInstance* _ClassCastException_instance;
 
+  ciInstance* _the_null_string;      // The Java string "null"
+  ciInstance* _the_min_jint_string; // The Java string "-2147483648"
+
   // Look up a klass by name from a particular class loader (the accessor's).
   // If require_local, result must be defined in that class loader, or NULL.
   // If !require_local, a result from remote class loader may be reported,
@@ -114,37 +112,45 @@
                              bool require_local);
 
   // Constant pool access.
-  ciKlass*   get_klass_by_index(ciInstanceKlass* loading_klass,
+  ciKlass*   get_klass_by_index(constantPoolHandle cpool,
                                 int klass_index,
-                                bool& is_accessible);
-  ciConstant get_constant_by_index(ciInstanceKlass* loading_klass,
-                                   int constant_index);
+                                bool& is_accessible,
+                                ciInstanceKlass* loading_klass);
+  ciConstant get_constant_by_index(constantPoolHandle cpool,
+                                   int constant_index,
+                                   ciInstanceKlass* accessor);
   bool       is_unresolved_string(ciInstanceKlass* loading_klass,
                                    int constant_index) const;
   bool       is_unresolved_klass(ciInstanceKlass* loading_klass,
                                    int constant_index) const;
   ciField*   get_field_by_index(ciInstanceKlass* loading_klass,
                                 int field_index);
-  ciMethod*  get_method_by_index(ciInstanceKlass* loading_klass,
-                                 int method_index, Bytecodes::Code bc);
+  ciMethod*  get_method_by_index(constantPoolHandle cpool,
+                                 int method_index, Bytecodes::Code bc,
+                                 ciInstanceKlass* loading_klass);
 
   // Implementation methods for loading and constant pool access.
   ciKlass* get_klass_by_name_impl(ciKlass* accessing_klass,
                                   ciSymbol* klass_name,
                                   bool require_local);
-  ciKlass*   get_klass_by_index_impl(ciInstanceKlass* loading_klass,
+  ciKlass*   get_klass_by_index_impl(constantPoolHandle cpool,
                                      int klass_index,
-                                     bool& is_accessible);
-  ciConstant get_constant_by_index_impl(ciInstanceKlass* loading_klass,
-                                        int constant_index);
+                                     bool& is_accessible,
+                                     ciInstanceKlass* loading_klass);
+  ciConstant get_constant_by_index_impl(constantPoolHandle cpool,
+                                        int constant_index,
+                                        ciInstanceKlass* loading_klass);
   bool       is_unresolved_string_impl (instanceKlass* loading_klass,
                                         int constant_index) const;
   bool       is_unresolved_klass_impl (instanceKlass* loading_klass,
                                         int constant_index) const;
   ciField*   get_field_by_index_impl(ciInstanceKlass* loading_klass,
                                      int field_index);
-  ciMethod*  get_method_by_index_impl(ciInstanceKlass* loading_klass,
-                                      int method_index, Bytecodes::Code bc);
+  ciMethod*  get_method_by_index_impl(constantPoolHandle cpool,
+                                      int method_index, Bytecodes::Code bc,
+                                      ciInstanceKlass* loading_klass);
+  ciMethod*  get_fake_invokedynamic_method_impl(constantPoolHandle cpool,
+                                                int index, Bytecodes::Code bc);
 
   // Helper methods
   bool       check_klass_accessibility(ciKlass* accessing_klass,
@@ -253,7 +259,7 @@
   bool  jvmti_can_hotswap_or_post_breakpoint() const { return _jvmti_can_hotswap_or_post_breakpoint; }
   bool  jvmti_can_examine_or_deopt_anywhere()  const { return _jvmti_can_examine_or_deopt_anywhere; }
   bool  jvmti_can_access_local_variables()     const { return _jvmti_can_access_local_variables; }
-  bool  jvmti_can_post_exceptions()            const { return _jvmti_can_post_exceptions; }
+  bool  jvmti_can_post_on_exceptions()         const { return _jvmti_can_post_on_exceptions; }
 
   // Cache DTrace flags
   void  cache_dtrace_flags();
@@ -286,30 +292,13 @@
 
 
   // Access to certain well known ciObjects.
-  ciInstanceKlass* ArrayStoreException_klass() {
-    return _ArrayStoreException;
-  }
-  ciInstanceKlass* Class_klass() {
-    return _Class;
-  }
-  ciInstanceKlass* ClassCastException_klass() {
-    return _ClassCastException;
-  }
-  ciInstanceKlass* Object_klass() {
-    return _Object;
+#define WK_KLASS_FUNC(name, ignore_s, ignore_o) \
+  ciInstanceKlass* name() { \
+    return _##name;\
   }
-  ciInstanceKlass* Throwable_klass() {
-    return _Throwable;
-  }
-  ciInstanceKlass* Thread_klass() {
-    return _Thread;
-  }
-  ciInstanceKlass* OutOfMemoryError_klass() {
-    return _OutOfMemoryError;
-  }
-  ciInstanceKlass* String_klass() {
-    return _String;
-  }
+  WK_KLASSES_DO(WK_KLASS_FUNC)
+#undef WK_KLASS_FUNC
+
   ciInstance* NullPointerException_instance() {
     assert(_NullPointerException_instance != NULL, "initialization problem");
     return _NullPointerException_instance;
@@ -324,6 +313,9 @@
   ciInstance* ArrayStoreException_instance();
   ciInstance* ClassCastException_instance();
 
+  ciInstance* the_null_string();
+  ciInstance* the_min_jint_string();
+
   static ciSymbol* unloaded_cisymbol() {
     return _unloaded_cisymbol;
   }
@@ -339,8 +331,8 @@
   // but consider adding to vmSymbols.hpp instead.
 
   // Use this to make a holder for non-perm compile time constants.
-  // The resulting array is guaranteed to satisfy "has_encoding".
-  ciArray*  make_array(GrowableArray<ciObject*>* objects);
+  // The resulting array is guaranteed to satisfy "can_be_constant".
+  ciArray*  make_system_array(GrowableArray<ciObject*>* objects);
 
   // converts the ciKlass* representing the holder of a method into a
   // ciInstanceKlass*.  This is needed since the holder of a method in
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciExceptionHandler.cpp
--- a/src/share/vm/ci/ciExceptionHandler.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciExceptionHandler.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
@@ -34,12 +34,16 @@
 //
 // Get the exception klass that this handler catches.
 ciInstanceKlass* ciExceptionHandler::catch_klass() {
+  VM_ENTRY_MARK;
   assert(!is_catch_all(), "bad index");
   if (_catch_klass == NULL) {
     bool will_link;
-    ciKlass* k = CURRENT_ENV->get_klass_by_index(_loading_klass,
+    assert(_loading_klass->get_instanceKlass()->is_linked(), "must be linked before accessing constant pool");
+    constantPoolHandle cpool(_loading_klass->get_instanceKlass()->constants());
+    ciKlass* k = CURRENT_ENV->get_klass_by_index(cpool,
                                                  _catch_klass_index,
-                                                 will_link);
+                                                 will_link,
+                                                 _loading_klass);
     if (!will_link && k->is_loaded()) {
       GUARDED_VM_ENTRY(
         k = CURRENT_ENV->get_unloaded_klass(_loading_klass, k->name());
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciField.cpp
--- a/src/share/vm/ci/ciField.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciField.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
@@ -86,7 +86,7 @@
     bool ignore;
     // This is not really a class reference; the index always refers to the
     // field's type signature, as a symbol.  Linkage checks do not apply.
-    _type = ciEnv::current(thread)->get_klass_by_index(klass, sig_index, ignore);
+    _type = ciEnv::current(thread)->get_klass_by_index(cpool, sig_index, ignore, klass);
   } else {
     _type = ciType::make(field_type);
   }
@@ -100,9 +100,9 @@
   int holder_index = cpool->klass_ref_index_at(index);
   bool holder_is_accessible;
   ciInstanceKlass* declared_holder =
-    ciEnv::current(thread)->get_klass_by_index(klass, holder_index,
-                                               holder_is_accessible)
-      ->as_instance_klass();
+    ciEnv::current(thread)->get_klass_by_index(cpool, holder_index,
+                                               holder_is_accessible,
+                                               klass)->as_instance_klass();
 
   // The declared holder of this field may not have been loaded.
   // Bail out with partial field information.
@@ -161,6 +161,18 @@
          "bootstrap classes must not create & cache unshared fields");
 }
 
+static bool trust_final_non_static_fields(ciInstanceKlass* holder) {
+  if (holder == NULL)
+    return false;
+  if (holder->name() == ciSymbol::java_lang_System())
+    // Never trust strangely unstable finals:  System.out, etc.
+    return false;
+  // Even if general trusting is disabled, trust system-built closures in these packages.
+  if (holder->is_in_package("java/dyn") || holder->is_in_package("sun/dyn"))
+    return true;
+  return TrustFinalNonStaticFields;
+}
+
 void ciField::initialize_from(fieldDescriptor* fd) {
   // Get the flags, offset, and canonical holder of the field.
   _flags = ciFlags(fd->access_flags());
@@ -168,8 +180,18 @@
   _holder = CURRENT_ENV->get_object(fd->field_holder())->as_instance_klass();
 
   // Check to see if the field is constant.
-  if (_holder->is_initialized() &&
-      this->is_final() && this->is_static()) {
+  if (_holder->is_initialized() && this->is_final()) {
+    if (!this->is_static()) {
+      // A field can be constant if it's a final static field or if it's
+      // a final non-static field of a trusted class ({java,sun}.dyn).
+      if (trust_final_non_static_fields(_holder)) {
+        _is_constant = true;
+        return;
+      }
+      _is_constant = false;
+      return;
+    }
+
     // This field just may be constant.  The only cases where it will
     // not be constant are:
     //
@@ -182,8 +204,8 @@
     //    java.lang.System.out, and java.lang.System.err.
 
     klassOop k = _holder->get_klassOop();
-    assert( SystemDictionary::system_klass() != NULL, "Check once per vm");
-    if( k == SystemDictionary::system_klass() ) {
+    assert( SystemDictionary::System_klass() != NULL, "Check once per vm");
+    if( k == SystemDictionary::System_klass() ) {
       // Check offsets for case 2: System.in, System.out, or System.err
       if( _offset == java_lang_System::in_offset_in_bytes()  ||
           _offset == java_lang_System::out_offset_in_bytes() ||
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciField.hpp
--- a/src/share/vm/ci/ciField.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciField.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -138,10 +138,18 @@
 
   // Get the constant value of this field.
   ciConstant constant_value() {
-    assert(is_constant(), "illegal call to constant_value()");
+    assert(is_static() && is_constant(), "illegal call to constant_value()");
     return _constant_value;
   }
 
+  // Get the constant value of non-static final field in the given
+  // object.
+  ciConstant constant_value_of(ciObject* object) {
+    assert(!is_static() && is_constant(), "only if field is non-static constant");
+    assert(object->is_instance(), "must be instance");
+    return object->as_instance()->field_value(this);
+  }
+
   // Check for link time errors.  Accessing a field from a
   // certain class via a certain bytecode may or may not be legal.
   // This call checks to see if an exception may be raised by
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciInstance.cpp
--- a/src/share/vm/ci/ciInstance.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciInstance.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -36,7 +36,7 @@
   VM_ENTRY_MARK;
   oop m = get_oop();
   // Return NULL if it is not java.lang.Class.
-  if (m == NULL || m->klass() != SystemDictionary::class_klass()) {
+  if (m == NULL || m->klass() != SystemDictionary::Class_klass()) {
     return NULL;
   }
   // Return either a primitive type or a klass.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciInstanceKlass.cpp
--- a/src/share/vm/ci/ciInstanceKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciInstanceKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -75,7 +75,7 @@
   _java_mirror = NULL;
 
   if (is_shared()) {
-    if (h_k() != SystemDictionary::object_klass()) {
+    if (h_k() != SystemDictionary::Object_klass()) {
       super();
     }
     java_mirror();
@@ -232,8 +232,48 @@
 // ------------------------------------------------------------------
 // ciInstanceKlass::uses_default_loader
 bool ciInstanceKlass::uses_default_loader() {
-  VM_ENTRY_MARK;
-  return loader() == NULL;
+  // Note:  We do not need to resolve the handle or enter the VM
+  // in order to test null-ness.
+  return _loader == NULL;
+}
+
+// ------------------------------------------------------------------
+// ciInstanceKlass::is_in_package
+//
+// Is this klass in the given package?
+bool ciInstanceKlass::is_in_package(const char* packagename, int len) {
+  // To avoid class loader mischief, this test always rejects application classes.
+  if (!uses_default_loader())
+    return false;
+  GUARDED_VM_ENTRY(
+    return is_in_package_impl(packagename, len);
+  )
+}
+
+bool ciInstanceKlass::is_in_package_impl(const char* packagename, int len) {
+  ASSERT_IN_VM;
+
+  // If packagename contains trailing '/' exclude it from the
+  // prefix-test since we test for it explicitly.
+  if (packagename[len - 1] == '/')
+    len--;
+
+  if (!name()->starts_with(packagename, len))
+    return false;
+
+  // Test if the class name is something like "java/lang".
+  if ((len + 1) > name()->utf8_length())
+    return false;
+
+  // Test for trailing '/'
+  if ((char) name()->byte_at(len) != '/')
+    return false;
+
+  // Make sure it's not actually in a subpackage:
+  if (name()->index_of_at(len+1, "/", 1) >= 0)
+    return false;
+
+  return true;
 }
 
 // ------------------------------------------------------------------
@@ -341,6 +381,20 @@
 }
 
 // ------------------------------------------------------------------
+// ciInstanceKlass::get_field_by_name
+ciField* ciInstanceKlass::get_field_by_name(ciSymbol* name, ciSymbol* signature, bool is_static) {
+  VM_ENTRY_MARK;
+  instanceKlass* k = get_instanceKlass();
+  fieldDescriptor fd;
+  klassOop def = k->find_field(name->get_symbolOop(), signature->get_symbolOop(), is_static, &fd);
+  if (def == NULL) {
+    return NULL;
+  }
+  ciField* field = new (CURRENT_THREAD_ENV->arena()) ciField(&fd);
+  return field;
+}
+
+// ------------------------------------------------------------------
 // ciInstanceKlass::non_static_fields.
 
 class NonStaticFieldFiller: public FieldClosure {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciInstanceKlass.hpp
--- a/src/share/vm/ci/ciInstanceKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciInstanceKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -29,10 +29,11 @@
 // be loaded.
 class ciInstanceKlass : public ciKlass {
   CI_PACKAGE_ACCESS
+  friend class ciBytecodeStream;
   friend class ciEnv;
+  friend class ciExceptionHandler;
   friend class ciMethod;
   friend class ciField;
-  friend class ciBytecodeStream;
 
 private:
   jobject                _loader;
@@ -78,6 +79,8 @@
 
   const char* type_string() { return "ciInstanceKlass"; }
 
+  bool is_in_package_impl(const char* packagename, int len);
+
   void print_impl(outputStream* st);
 
   ciConstantPoolCache* field_cache();
@@ -148,6 +151,7 @@
 
   ciInstanceKlass* get_canonical_holder(int offset);
   ciField* get_field_by_offset(int field_offset, bool is_static);
+  ciField* get_field_by_name(ciSymbol* name, ciSymbol* signature, bool is_static);
 
   GrowableArray<ciField*>* non_static_fields();
 
@@ -195,6 +199,12 @@
 
   bool is_java_lang_Object();
 
+  // Is this klass in the given package?
+  bool is_in_package(const char* packagename) {
+    return is_in_package(packagename, (int) strlen(packagename));
+  }
+  bool is_in_package(const char* packagename, int len);
+
   // What kind of ciObject is this?
   bool is_instance_klass() { return true; }
   bool is_java_klass()     { return true; }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciKlass.cpp
--- a/src/share/vm/ci/ciKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciKlass.hpp
--- a/src/share/vm/ci/ciKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
@@ -69,7 +69,7 @@
   ciKlass(KlassHandle k_h);
 
   // What is the name of this klass?
-  ciSymbol* name() { return _name; }
+  ciSymbol* name() const { return _name; }
 
   // What is its layout helper value?
   jint layout_helper() { return _layout_helper; }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciMethod.cpp
--- a/src/share/vm/ci/ciMethod.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciMethod.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -325,10 +325,10 @@
 }
 
 // ------------------------------------------------------------------
-// ciMethod::liveness_at_bci
+// ciMethod::raw_liveness_at_bci
 //
 // Which local variables are live at a specific bci?
-MethodLivenessResult ciMethod::liveness_at_bci(int bci) {
+MethodLivenessResult ciMethod::raw_liveness_at_bci(int bci) {
   check_is_loaded();
   if (_liveness == NULL) {
     // Create the liveness analyzer.
@@ -336,7 +336,17 @@
     _liveness = new (arena) MethodLiveness(arena, this);
     _liveness->compute_liveness();
   }
-  MethodLivenessResult result = _liveness->get_liveness_at(bci);
+  return _liveness->get_liveness_at(bci);
+}
+
+// ------------------------------------------------------------------
+// ciMethod::liveness_at_bci
+//
+// Which local variables are live at a specific bci?  When debugging
+// will return true for all locals in some cases to improve debug
+// information.
+MethodLivenessResult ciMethod::liveness_at_bci(int bci) {
+  MethodLivenessResult result = raw_liveness_at_bci(bci);
   if (CURRENT_ENV->jvmti_can_access_local_variables() || DeoptimizeALot || CompileTheWorld) {
     // Keep all locals live for the user's edification and amusement.
     result.at_put_range(0, result.size(), true);
@@ -426,15 +436,21 @@
           // we will set result._method also.
         }
         // Determine call site's morphism.
-        // The call site count could be == (receivers_count_total + 1)
-        // not only in the case of a polymorphic call but also in the case
-        // when a method data snapshot is taken after the site count was updated
-        // but before receivers counters were updated.
-        if (morphism == result._limit) {
-           // There were no array klasses and morphism <= MorphismLimit.
-           if (morphism <  ciCallProfile::MorphismLimit ||
-               morphism == ciCallProfile::MorphismLimit &&
-               (receivers_count_total+1) >= count) {
+        // The call site count is 0 with known morphism (onlt 1 or 2 receivers)
+        // or < 0 in the case of a type check failured for checkcast, aastore, instanceof.
+        // The call site count is > 0 in the case of a polymorphic virtual call.
+        if (morphism > 0 && morphism == result._limit) {
+           // The morphism <= MorphismLimit.
+           if ((morphism <  ciCallProfile::MorphismLimit) ||
+               (morphism == ciCallProfile::MorphismLimit && count == 0)) {
+#ifdef ASSERT
+             if (count > 0) {
+               this->print_short_name(tty);
+               tty->print_cr(" @ bci:%d", bci);
+               this->print_codes();
+               assert(false, "this call site should not be polymorphic");
+             }
+#endif
              result._morphism = morphism;
            }
         }
@@ -442,10 +458,8 @@
         // zero or less, presume that this is a typecheck profile and
         // do nothing.  Otherwise, increase count to be the sum of all
         // receiver's counts.
-        if (count > 0) {
-          if (count < receivers_count_total) {
-            count = receivers_count_total;
-          }
+        if (count >= 0) {
+          count += receivers_count_total;
         }
       }
       result._count = count;
@@ -677,7 +691,7 @@
 // ------------------------------------------------------------------
 // invokedynamic support
 //
-bool ciMethod::is_method_handle_invoke() {
+bool ciMethod::is_method_handle_invoke() const {
   check_is_loaded();
   bool flag = ((flags().as_int() & JVM_MH_INVOKE_BITS) == JVM_MH_INVOKE_BITS);
 #ifdef ASSERT
@@ -690,6 +704,12 @@
   return flag;
 }
 
+bool ciMethod::is_method_handle_adapter() const {
+  check_is_loaded();
+  VM_ENTRY_MARK;
+  return get_methodOop()->is_method_handle_adapter();
+}
+
 ciInstance* ciMethod::method_handle_type() {
   check_is_loaded();
   VM_ENTRY_MARK;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciMethod.hpp
--- a/src/share/vm/ci/ciMethod.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciMethod.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -38,6 +38,8 @@
   CI_PACKAGE_ACCESS
   friend class ciEnv;
   friend class ciExceptionHandlerStream;
+  friend class ciBytecodeStream;
+  friend class ciMethodHandle;
 
  private:
   // General method information.
@@ -149,6 +151,12 @@
   bool          has_monitor_bytecodes() const    { return _uses_monitors; }
   bool          has_balanced_monitors();
 
+  // Returns a bitmap indicating which locals are required to be
+  // maintained as live for deopt.  raw_liveness_at_bci is always the
+  // direct output of the liveness computation while liveness_at_bci
+  // may mark all locals as live to improve support for debugging Java
+  // code by maintaining the state of as many locals as possible.
+  MethodLivenessResult raw_liveness_at_bci(int bci);
   MethodLivenessResult liveness_at_bci(int bci);
 
   // Get the interpreters viewpoint on oop liveness.  MethodLiveness is
@@ -207,7 +215,10 @@
   bool check_call(int refinfo_index, bool is_static) const;
   void build_method_data();  // make sure it exists in the VM also
   int scale_count(int count, float prof_factor = 1.);  // make MDO count commensurate with IIC
-  bool is_method_handle_invoke();
+
+  // JSR 292 support
+  bool is_method_handle_invoke()  const;
+  bool is_method_handle_adapter() const;
   ciInstance* method_handle_type();
 
   // What kind of ciObject is this?
@@ -245,4 +256,10 @@
   // Print the name of this method in various incarnations.
   void print_name(outputStream* st = tty);
   void print_short_name(outputStream* st = tty);
+
+  methodOop get_method_handle_target() {
+    klassOop receiver_limit_oop = NULL;
+    int flags = 0;
+    return MethodHandles::decode_method(get_oop(), receiver_limit_oop, flags);
+  }
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciMethodHandle.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/ci/ciMethodHandle.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2009 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/_ciMethodHandle.cpp.incl"
+
+// ciMethodHandle
+
+// ------------------------------------------------------------------
+// ciMethodHandle::get_adapter
+//
+// Return an adapter for this MethodHandle.
+ciMethod* ciMethodHandle::get_adapter(bool is_invokedynamic) const {
+  VM_ENTRY_MARK;
+
+  Handle h(get_oop());
+  methodHandle callee(_callee->get_methodOop());
+  MethodHandleCompiler mhc(h, callee, is_invokedynamic, THREAD);
+  methodHandle m = mhc.compile(CHECK_NULL);
+  return CURRENT_ENV->get_object(m())->as_method();
+}
+
+
+// ------------------------------------------------------------------
+// ciMethodHandle::print_impl
+//
+// Implementation of the print method.
+void ciMethodHandle::print_impl(outputStream* st) {
+  st->print(" type=");
+  get_oop()->print();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciMethodHandle.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/ci/ciMethodHandle.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+// ciMethodHandle
+//
+// The class represents a java.dyn.MethodHandle object.
+class ciMethodHandle : public ciInstance {
+private:
+  ciMethod* _callee;
+
+  // Return an adapter for this MethodHandle.
+  ciMethod* get_adapter(bool is_invokedynamic) const;
+
+protected:
+  void print_impl(outputStream* st);
+
+public:
+  ciMethodHandle(instanceHandle h_i) : ciInstance(h_i) {};
+
+  // What kind of ciObject is this?
+  bool is_method_handle() const { return true; }
+
+  ciMethod* callee() const { return _callee; }
+  void  set_callee(ciMethod* m) { _callee = m; }
+
+  // Return an adapter for a MethodHandle call.
+  ciMethod* get_method_handle_adapter() const {
+    return get_adapter(false);
+  }
+
+  // Return an adapter for an invokedynamic call.
+  ciMethod* get_invokedynamic_adapter() const {
+    return get_adapter(true);
+  }
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciObject.cpp
--- a/src/share/vm/ci/ciObject.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciObject.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -55,6 +55,7 @@
   }
   _klass = NULL;
   _ident = 0;
+  init_flags_from(o);
 }
 
 // ------------------------------------------------------------------
@@ -69,6 +70,7 @@
   }
   _klass = NULL;
   _ident = 0;
+  init_flags_from(h());
 }
 
 // ------------------------------------------------------------------
@@ -158,7 +160,7 @@
 }
 
 // ------------------------------------------------------------------
-// ciObject::encoding
+// ciObject::constant_encoding
 //
 // The address which the compiler should embed into the
 // generated code to represent this oop.  This address
@@ -172,16 +174,24 @@
 //
 // This method should be changed to return an generified address
 // to discourage use of the JNI handle.
-jobject ciObject::encoding() {
+jobject ciObject::constant_encoding() {
   assert(is_null_object() || handle() != NULL, "cannot embed null pointer");
-  assert(has_encoding(), "oop must be NULL or perm");
+  assert(can_be_constant(), "oop must be NULL or perm");
   return handle();
 }
 
 // ------------------------------------------------------------------
-// ciObject::has_encoding
-bool ciObject::has_encoding() {
-  return handle() == NULL || is_perm();
+// ciObject::can_be_constant
+bool ciObject::can_be_constant() {
+  if (ScavengeRootsInCode >= 1)  return true;  // now everybody can encode as a constant
+  return handle() == NULL || !is_scavengable();
+}
+
+// ------------------------------------------------------------------
+// ciObject::should_be_constant()
+bool ciObject::should_be_constant() {
+  if (ScavengeRootsInCode >= 2)  return true;  // force everybody to be a constant
+  return handle() == NULL || !is_scavengable();
 }
 
 
@@ -195,8 +205,9 @@
 void ciObject::print(outputStream* st) {
   st->print("<%s", type_string());
   GUARDED_VM_ENTRY(print_impl(st);)
-  st->print(" ident=%d %s address=0x%x>", ident(),
+  st->print(" ident=%d %s%s address=0x%x>", ident(),
         is_perm() ? "PERM" : "",
+        is_scavengable() ? "SCAVENGABLE" : "",
         (address)this);
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciObject.hpp
--- a/src/share/vm/ci/ciObject.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciObject.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -51,9 +51,10 @@
   ciKlass* _klass;
   uint     _ident;
 
-  enum { FLAG_BITS   = 1};
+  enum { FLAG_BITS   = 2 };
   enum {
-         PERM_FLAG    = 1
+         PERM_FLAG        = 1,
+         SCAVENGABLE_FLAG = 2
        };
 protected:
   ciObject();
@@ -68,8 +69,15 @@
     return JNIHandles::resolve_non_null(_handle);
   }
 
-  void set_perm() {
-    _ident |=  PERM_FLAG;
+  void init_flags_from(oop x) {
+    int flags = 0;
+    if (x != NULL) {
+      if (x->is_perm())
+        flags |= PERM_FLAG;
+      if (x->is_scavengable())
+        flags |= SCAVENGABLE_FLAG;
+    }
+    _ident |= flags;
   }
 
   // Virtual behavior of the print() method.
@@ -91,17 +99,27 @@
   // A hash value for the convenience of compilers.
   int hash();
 
-  // Tells if this oop has an encoding.  (I.e., is it null or perm?)
+  // Tells if this oop has an encoding as a constant.
+  // True if is_scavengable is false.
+  // Also true if ScavengeRootsInCode is non-zero.
   // If it does not have an encoding, the compiler is responsible for
   // making other arrangements for dealing with the oop.
-  // See ciEnv::make_perm_array
-  bool has_encoding();
+  // See ciEnv::make_array
+  bool can_be_constant();
+
+  // Tells if this oop should be made a constant.
+  // True if is_scavengable is false or ScavengeRootsInCode > 1.
+  bool should_be_constant();
 
   // Is this object guaranteed to be in the permanent part of the heap?
   // If so, CollectedHeap::can_elide_permanent_oop_store_barriers is relevant.
   // If the answer is false, no guarantees are made.
   bool is_perm() { return (_ident & PERM_FLAG) != 0; }
 
+  // Might this object possibly move during a scavenge operation?
+  // If the answer is true and ScavengeRootsInCode==0, the oop cannot be embedded in code.
+  bool is_scavengable() { return (_ident & SCAVENGABLE_FLAG) != 0; }
+
   // The address which the compiler should embed into the
   // generated code to represent this oop.  This address
   // is not the true address of the oop -- it will get patched
@@ -109,13 +127,16 @@
   //
   // Usage note: no address arithmetic allowed.  Oop must
   // be registered with the oopRecorder.
-  jobject encoding();
+  jobject constant_encoding();
 
   // What kind of ciObject is this?
   virtual bool is_null_object() const       { return false; }
+  virtual bool is_call_site() const         { return false; }
+  virtual bool is_cpcache() const           { return false; }
   virtual bool is_instance()                { return false; }
   virtual bool is_method()                  { return false; }
   virtual bool is_method_data()             { return false; }
+  virtual bool is_method_handle() const     { return false; }
   virtual bool is_array()                   { return false; }
   virtual bool is_obj_array()               { return false; }
   virtual bool is_type_array()              { return false; }
@@ -167,6 +188,14 @@
     assert(is_null_object(), "bad cast");
     return (ciNullObject*)this;
   }
+  ciCallSite*              as_call_site() {
+    assert(is_call_site(), "bad cast");
+    return (ciCallSite*) this;
+  }
+  ciCPCache*               as_cpcache() {
+    assert(is_cpcache(), "bad cast");
+    return (ciCPCache*) this;
+  }
   ciInstance*              as_instance() {
     assert(is_instance(), "bad cast");
     return (ciInstance*)this;
@@ -179,6 +208,10 @@
     assert(is_method_data(), "bad cast");
     return (ciMethodData*)this;
   }
+  ciMethodHandle*          as_method_handle() {
+    assert(is_method_handle(), "bad cast");
+    return (ciMethodHandle*) this;
+  }
   ciArray*                 as_array() {
     assert(is_array(), "bad cast");
     return (ciArray*)this;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciObjectFactory.cpp
--- a/src/share/vm/ci/ciObjectFactory.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciObjectFactory.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
@@ -144,30 +144,13 @@
   ciEnv::_obj_array_klass_klass_instance =
     get(Universe::objArrayKlassKlassObj())
       ->as_obj_array_klass_klass();
-  ciEnv::_ArrayStoreException =
-    get(SystemDictionary::ArrayStoreException_klass())
-      ->as_instance_klass();
-  ciEnv::_Class =
-    get(SystemDictionary::class_klass())
-      ->as_instance_klass();
-  ciEnv::_ClassCastException =
-    get(SystemDictionary::ClassCastException_klass())
-      ->as_instance_klass();
-  ciEnv::_Object =
-    get(SystemDictionary::object_klass())
-      ->as_instance_klass();
-  ciEnv::_Throwable =
-    get(SystemDictionary::throwable_klass())
-      ->as_instance_klass();
-  ciEnv::_Thread =
-    get(SystemDictionary::thread_klass())
-      ->as_instance_klass();
-  ciEnv::_OutOfMemoryError =
-    get(SystemDictionary::OutOfMemoryError_klass())
-      ->as_instance_klass();
-  ciEnv::_String =
-    get(SystemDictionary::string_klass())
-      ->as_instance_klass();
+
+#define WK_KLASS_DEFN(name, ignore_s, opt)                              \
+  if (SystemDictionary::name() != NULL) \
+    ciEnv::_##name = get(SystemDictionary::name())->as_instance_klass();
+
+  WK_KLASSES_DO(WK_KLASS_DEFN)
+#undef WK_KLASS_DEFN
 
   for (int len = -1; len != _ci_objects->length(); ) {
     len = _ci_objects->length();
@@ -261,12 +244,11 @@
     ciObject* new_object = create_new_object(keyHandle());
     assert(keyHandle() == new_object->get_oop(), "must be properly recorded");
     init_ident_of(new_object);
-    if (!keyHandle->is_perm()) {
+    if (!new_object->is_perm()) {
       // Not a perm-space object.
       insert_non_perm(bucket, keyHandle(), new_object);
       return new_object;
     }
-    new_object->set_perm();
     if (len != _ci_objects->length()) {
       // creating the new object has recursively entered new objects
       // into the table.  We need to recompute our index.
@@ -325,13 +307,21 @@
     return new (arena()) ciMethodData(h_md);
   } else if (o->is_instance()) {
     instanceHandle h_i(THREAD, (instanceOop)o);
-    return new (arena()) ciInstance(h_i);
+    if (java_dyn_CallSite::is_instance(o))
+      return new (arena()) ciCallSite(h_i);
+    else if (java_dyn_MethodHandle::is_instance(o))
+      return new (arena()) ciMethodHandle(h_i);
+    else
+      return new (arena()) ciInstance(h_i);
   } else if (o->is_objArray()) {
     objArrayHandle h_oa(THREAD, (objArrayOop)o);
     return new (arena()) ciObjArray(h_oa);
   } else if (o->is_typeArray()) {
     typeArrayHandle h_ta(THREAD, (typeArrayOop)o);
     return new (arena()) ciTypeArray(h_ta);
+  } else if (o->is_constantPoolCache()) {
+    constantPoolCacheHandle h_cpc(THREAD, (constantPoolCacheOop) o);
+    return new (arena()) ciCPCache(h_cpc);
   }
 
   // The oop is of some type not supported by the compiler interface.
@@ -568,7 +558,7 @@
   if (key->is_perm() && _non_perm_count == 0) {
     return emptyBucket;
   } else if (key->is_instance()) {
-    if (key->klass() == SystemDictionary::class_klass()) {
+    if (key->klass() == SystemDictionary::Class_klass()) {
       // class mirror instances are always perm
       return emptyBucket;
     }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciStreams.cpp
--- a/src/share/vm/ci/ciStreams.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciStreams.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -186,8 +186,9 @@
 // If this bytecode is a new, newarray, multianewarray, instanceof,
 // or checkcast, get the referenced klass.
 ciKlass* ciBytecodeStream::get_klass(bool& will_link) {
-  return CURRENT_ENV->get_klass_by_index(_holder, get_klass_index(),
-                                         will_link);
+  VM_ENTRY_MARK;
+  constantPoolHandle cpool(_method->get_methodOop()->constants());
+  return CURRENT_ENV->get_klass_by_index(cpool, get_klass_index(), will_link, _holder);
 }
 
 // ------------------------------------------------------------------
@@ -213,7 +214,9 @@
 // If this bytecode is one of the ldc variants, get the referenced
 // constant.
 ciConstant ciBytecodeStream::get_constant() {
-  return CURRENT_ENV->get_constant_by_index(_holder, get_constant_index());
+  VM_ENTRY_MARK;
+  constantPoolHandle cpool(_method->get_methodOop()->constants());
+  return CURRENT_ENV->get_constant_by_index(cpool, get_constant_index(), _holder);
 }
 
 // ------------------------------------------------------------------
@@ -264,9 +267,11 @@
 // There is no "will_link" result passed back.  The user is responsible
 // for checking linkability when retrieving the associated field.
 ciInstanceKlass* ciBytecodeStream::get_declared_field_holder() {
+  VM_ENTRY_MARK;
+  constantPoolHandle cpool(_method->get_methodOop()->constants());
   int holder_index = get_field_holder_index();
   bool ignore;
-  return CURRENT_ENV->get_klass_by_index(_holder, holder_index, ignore)
+  return CURRENT_ENV->get_klass_by_index(cpool, holder_index, ignore, _holder)
       ->as_instance_klass();
 }
 
@@ -277,9 +282,10 @@
 // referenced by the current bytecode.  Used for generating
 // deoptimization information.
 int ciBytecodeStream::get_field_holder_index() {
-  VM_ENTRY_MARK;
-  constantPoolOop cpool = _holder->get_instanceKlass()->constants();
-  return cpool->klass_ref_index_at(get_field_index());
+  GUARDED_VM_ENTRY(
+    constantPoolOop cpool = _holder->get_instanceKlass()->constants();
+    return cpool->klass_ref_index_at(get_field_index());
+  )
 }
 
 // ------------------------------------------------------------------
@@ -321,7 +327,9 @@
 //
 // If this is a method invocation bytecode, get the invoked method.
 ciMethod* ciBytecodeStream::get_method(bool& will_link) {
-  ciMethod* m = CURRENT_ENV->get_method_by_index(_holder, get_method_index(),cur_bc());
+  VM_ENTRY_MARK;
+  constantPoolHandle cpool(_method->get_methodOop()->constants());
+  ciMethod* m = CURRENT_ENV->get_method_by_index(cpool, get_method_index(), cur_bc(), _holder);
   will_link = m->is_loaded();
   return m;
 }
@@ -338,11 +346,13 @@
 // There is no "will_link" result passed back.  The user is responsible
 // for checking linkability when retrieving the associated method.
 ciKlass* ciBytecodeStream::get_declared_method_holder() {
+  VM_ENTRY_MARK;
+  constantPoolHandle cpool(_method->get_methodOop()->constants());
   bool ignore;
-  // report as Dynamic for invokedynamic, which is syntactically classless
+  // report as InvokeDynamic for invokedynamic, which is syntactically classless
   if (cur_bc() == Bytecodes::_invokedynamic)
-    return CURRENT_ENV->get_klass_by_name(_holder, ciSymbol::java_dyn_Dynamic(), false);
-  return CURRENT_ENV->get_klass_by_index(_holder, get_method_holder_index(), ignore);
+    return CURRENT_ENV->get_klass_by_name(_holder, ciSymbol::java_dyn_InvokeDynamic(), false);
+  return CURRENT_ENV->get_klass_by_index(cpool, get_method_holder_index(), ignore, _holder);
 }
 
 // ------------------------------------------------------------------
@@ -352,8 +362,7 @@
 // referenced by the current bytecode.  Used for generating
 // deoptimization information.
 int ciBytecodeStream::get_method_holder_index() {
-  VM_ENTRY_MARK;
-  constantPoolOop cpool = _holder->get_instanceKlass()->constants();
+  constantPoolOop cpool = _method->get_methodOop()->constants();
   return cpool->klass_ref_index_at(get_method_index());
 }
 
@@ -370,3 +379,31 @@
   int name_and_type_index = cpool->name_and_type_ref_index_at(method_index);
   return cpool->signature_ref_index_at(name_and_type_index);
 }
+
+// ------------------------------------------------------------------
+// ciBytecodeStream::get_cpcache
+ciCPCache* ciBytecodeStream::get_cpcache() {
+  VM_ENTRY_MARK;
+  // Get the constant pool.
+  constantPoolOop      cpool   = _holder->get_instanceKlass()->constants();
+  constantPoolCacheOop cpcache = cpool->cache();
+
+  return CURRENT_ENV->get_object(cpcache)->as_cpcache();
+}
+
+// ------------------------------------------------------------------
+// ciBytecodeStream::get_call_site
+ciCallSite* ciBytecodeStream::get_call_site() {
+  VM_ENTRY_MARK;
+  // Get the constant pool.
+  constantPoolOop      cpool   = _holder->get_instanceKlass()->constants();
+  constantPoolCacheOop cpcache = cpool->cache();
+
+  // Get the CallSite from the constant pool cache.
+  int method_index = get_method_index();
+  ConstantPoolCacheEntry* cpcache_entry = cpcache->secondary_entry_at(method_index);
+  oop call_site_oop = cpcache_entry->f1();
+
+  // Create a CallSite object and return it.
+  return CURRENT_ENV->get_object(call_site_oop)->as_call_site();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciStreams.hpp
--- a/src/share/vm/ci/ciStreams.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciStreams.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -232,6 +232,9 @@
   int       get_method_holder_index();
   int       get_method_signature_index();
 
+  ciCPCache*  get_cpcache();
+  ciCallSite* get_call_site();
+
  private:
   void assert_index_size(int required_size) const {
 #ifdef ASSERT
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciSymbol.cpp
--- a/src/share/vm/ci/ciSymbol.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciSymbol.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
@@ -60,6 +60,22 @@
 }
 
 // ------------------------------------------------------------------
+// ciSymbol::starts_with
+//
+// Tests if the symbol starts with the given prefix.
+bool ciSymbol::starts_with(const char* prefix, int len) const {
+  GUARDED_VM_ENTRY(return get_symbolOop()->starts_with(prefix, len);)
+}
+
+// ------------------------------------------------------------------
+// ciSymbol::index_of
+//
+// Determines where the symbol contains the given substring.
+int ciSymbol::index_of_at(int i, const char* str, int len) const {
+  GUARDED_VM_ENTRY(return get_symbolOop()->index_of_at(i, str, len);)
+}
+
+// ------------------------------------------------------------------
 // ciSymbol::utf8_length
 int ciSymbol::utf8_length() {
   GUARDED_VM_ENTRY(return get_symbolOop()->utf8_length();)
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciSymbol.hpp
--- a/src/share/vm/ci/ciSymbol.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciSymbol.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
@@ -28,6 +28,7 @@
 // machine.
 class ciSymbol : public ciObject {
   CI_PACKAGE_ACCESS
+  // These friends all make direct use of get_symbolOop:
   friend class ciEnv;
   friend class ciInstanceKlass;
   friend class ciSignature;
@@ -38,13 +39,13 @@
   ciSymbol(symbolOop s) : ciObject(s) {}
   ciSymbol(symbolHandle s);   // for use with vmSymbolHandles
 
-  symbolOop get_symbolOop() { return (symbolOop)get_oop(); }
+  symbolOop get_symbolOop() const { return (symbolOop)get_oop(); }
 
   const char* type_string() { return "ciSymbol"; }
 
   void print_impl(outputStream* st);
 
-  int         byte_at(int i);
+  // This is public in symbolOop but private here, because the base can move:
   jbyte*      base();
 
   // Make a ciSymbol from a C string (implementation).
@@ -55,6 +56,15 @@
   const char* as_utf8();
   int         utf8_length();
 
+  // Return the i-th utf8 byte, where i < utf8_length
+  int         byte_at(int i);
+
+  // Tests if the symbol starts with the given prefix.
+  bool starts_with(const char* prefix, int len) const;
+
+  // Determines where the symbol contains the given substring.
+  int index_of_at(int i, const char* str, int len) const;
+
   // What kind of ciObject is this?
   bool is_symbol() { return true; }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciType.cpp
--- a/src/share/vm/ci/ciType.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciType.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -111,7 +111,7 @@
   // short, etc.
   // Note: Bare T_ADDRESS means a raw pointer type, not a return_address.
   assert((uint)t < T_CONFLICT+1, "range check");
-  if (t == T_OBJECT)  return ciEnv::_Object;  // java/lang/Object
+  if (t == T_OBJECT)  return ciEnv::_Object_klass;  // java/lang/Object
   assert(_basic_types[t] != NULL, "domain check");
   return _basic_types[t];
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciTypeFlow.cpp
--- a/src/share/vm/ci/ciTypeFlow.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciTypeFlow.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -635,8 +635,15 @@
   ciMethod* method = str->get_method(will_link);
   if (!will_link) {
     // We weren't able to find the method.
-    ciKlass* unloaded_holder = method->holder();
-    trap(str, unloaded_holder, str->get_method_holder_index());
+    if (str->cur_bc() == Bytecodes::_invokedynamic) {
+      trap(str, NULL,
+           Deoptimization::make_trap_request
+           (Deoptimization::Reason_uninitialized,
+            Deoptimization::Action_reinterpret));
+    } else {
+      ciKlass* unloaded_holder = method->holder();
+      trap(str, unloaded_holder, str->get_method_holder_index());
+    }
   } else {
     ciSignature* signature = method->signature();
     ciSignatureStream sigstr(signature);
@@ -1292,8 +1299,8 @@
   case Bytecodes::_invokeinterface: do_invoke(str, true);           break;
   case Bytecodes::_invokespecial:   do_invoke(str, true);           break;
   case Bytecodes::_invokestatic:    do_invoke(str, false);          break;
-
   case Bytecodes::_invokevirtual:   do_invoke(str, true);           break;
+  case Bytecodes::_invokedynamic:   do_invoke(str, false);          break;
 
   case Bytecodes::_istore:   store_local_int(str->get_index());     break;
   case Bytecodes::_istore_0: store_local_int(0);                    break;
@@ -2486,8 +2493,13 @@
         // Assume irreducible entries need more data flow
         add_to_work_list(succ);
       }
-      lp = lp->parent();
-      assert(lp != NULL, "nested loop must have parent by now");
+      Loop* plp = lp->parent();
+      if (plp == NULL) {
+        // This only happens for some irreducible cases.  The parent
+        // will be updated during a later pass.
+        break;
+      }
+      lp = plp;
     }
 
     // Merge loop tree branch for all successors.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/ci/ciUtilities.hpp
--- a/src/share/vm/ci/ciUtilities.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/ci/ciUtilities.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -79,7 +79,7 @@
   THREAD);                                       \
   if (HAS_PENDING_EXCEPTION) {                   \
     if (PENDING_EXCEPTION->klass() ==            \
-        SystemDictionary::threaddeath_klass()) { \
+        SystemDictionary::ThreadDeath_klass()) { \
       /* Kill the compilation. */                \
       fatal("unhandled ci exception");           \
       return (result);                           \
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -430,7 +430,7 @@
   case JVM_CONSTANT_UnresolvedClass :
     // Patching a class means pre-resolving it.
     // The name in the constant pool is ignored.
-    if (patch->klass() == SystemDictionary::class_klass()) { // %%% java_lang_Class::is_instance
+    if (patch->klass() == SystemDictionary::Class_klass()) { // %%% java_lang_Class::is_instance
       guarantee_property(!java_lang_Class::is_primitive(patch()),
                          "Illegal class patch at %d in class file %s",
                          index, CHECK);
@@ -643,7 +643,7 @@
       guarantee_property(value_type.is_int(), "Inconsistent constant value type in class file %s", CHECK);
       break;
     case T_OBJECT:
-      guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;", 18)
+      guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;")
                          && (value_type.is_string() || value_type.is_unresolved_string())),
                          "Bad string initial value in class file %s", CHECK);
       break;
@@ -766,16 +766,16 @@
 
 
 struct FieldAllocationCount {
-  int static_oop_count;
-  int static_byte_count;
-  int static_short_count;
-  int static_word_count;
-  int static_double_count;
-  int nonstatic_oop_count;
-  int nonstatic_byte_count;
-  int nonstatic_short_count;
-  int nonstatic_word_count;
-  int nonstatic_double_count;
+  unsigned int static_oop_count;
+  unsigned int static_byte_count;
+  unsigned int static_short_count;
+  unsigned int static_word_count;
+  unsigned int static_double_count;
+  unsigned int nonstatic_oop_count;
+  unsigned int nonstatic_byte_count;
+  unsigned int nonstatic_short_count;
+  unsigned int nonstatic_word_count;
+  unsigned int nonstatic_double_count;
 };
 
 typeArrayHandle ClassFileParser::parse_fields(constantPoolHandle cp, bool is_interface,
@@ -1718,9 +1718,7 @@
   m->set_exception_table(exception_handlers());
 
   // Copy byte codes
-  if (code_length > 0) {
-    memcpy(m->code_base(), code_start, code_length);
-  }
+  m->set_code(code_start);
 
   // Copy line number table
   if (linenumber_table != NULL) {
@@ -2511,23 +2509,12 @@
       fac_ptr->nonstatic_byte_count -= 1;
       (*fields_ptr)->ushort_at_put(i + instanceKlass::signature_index_offset,
                                    word_sig_index);
-      if (wordSize == jintSize) {
-        fac_ptr->nonstatic_word_count += 1;
-      } else {
-        fac_ptr->nonstatic_double_count += 1;
-      }
-
-      FieldAllocationType atype = (FieldAllocationType) (*fields_ptr)->ushort_at(i+4);
+      fac_ptr->nonstatic_word_count += 1;
+
+      FieldAllocationType atype = (FieldAllocationType) (*fields_ptr)->ushort_at(i + instanceKlass::low_offset);
       assert(atype == NONSTATIC_BYTE, "");
       FieldAllocationType new_atype = NONSTATIC_WORD;
-      if (wordSize > jintSize) {
-        if (Universe::field_type_should_be_aligned(T_LONG)) {
-          atype = NONSTATIC_ALIGNED_DOUBLE;
-        } else {
-          atype = NONSTATIC_DOUBLE;
-        }
-      }
-      (*fields_ptr)->ushort_at_put(i+4, new_atype);
+      (*fields_ptr)->ushort_at_put(i + instanceKlass::low_offset, new_atype);
 
       found_vmentry = true;
       break;
@@ -2547,6 +2534,7 @@
                                                     KlassHandle host_klass,
                                                     GrowableArray<Handle>* cp_patches,
                                                     symbolHandle& parsed_name,
+                                                    bool verify,
                                                     TRAPS) {
   // So that JVMTI can cache class file in the state before retransformable agents
   // have modified it
@@ -2591,7 +2579,7 @@
   instanceKlassHandle nullHandle;
 
   // Figure out whether we can skip format checking (matching classic VM behavior)
-  _need_verify = Verifier::should_verify_for(class_loader());
+  _need_verify = Verifier::should_verify_for(class_loader(), verify);
 
   // Set the verify flag in stream
   cfs->set_verify(_need_verify);
@@ -2908,11 +2896,11 @@
     }
     // end of "discovered" field compactibility fix
 
-    int nonstatic_double_count = fac.nonstatic_double_count;
-    int nonstatic_word_count   = fac.nonstatic_word_count;
-    int nonstatic_short_count  = fac.nonstatic_short_count;
-    int nonstatic_byte_count   = fac.nonstatic_byte_count;
-    int nonstatic_oop_count    = fac.nonstatic_oop_count;
+    unsigned int nonstatic_double_count = fac.nonstatic_double_count;
+    unsigned int nonstatic_word_count   = fac.nonstatic_word_count;
+    unsigned int nonstatic_short_count  = fac.nonstatic_short_count;
+    unsigned int nonstatic_byte_count   = fac.nonstatic_byte_count;
+    unsigned int nonstatic_oop_count    = fac.nonstatic_oop_count;
 
     bool super_has_nonstatic_fields =
             (super_klass() != NULL && super_klass->has_nonstatic_fields());
@@ -2922,26 +2910,26 @@
               nonstatic_oop_count) != 0);
 
 
-    // Prepare list of oops for oop maps generation.
-    u2* nonstatic_oop_offsets;
-    u2* nonstatic_oop_length;
-    int nonstatic_oop_map_count = 0;
+    // Prepare list of oops for oop map generation.
+    int* nonstatic_oop_offsets;
+    unsigned int* nonstatic_oop_counts;
+    unsigned int nonstatic_oop_map_count = 0;
 
     nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD(
-              THREAD, u2,  nonstatic_oop_count+1);
-    nonstatic_oop_length  = NEW_RESOURCE_ARRAY_IN_THREAD(
-              THREAD, u2,  nonstatic_oop_count+1);
+              THREAD, int, nonstatic_oop_count + 1);
+    nonstatic_oop_counts  = NEW_RESOURCE_ARRAY_IN_THREAD(
+              THREAD, unsigned int, nonstatic_oop_count + 1);
 
     // Add fake fields for java.lang.Class instances (also see above).
     // FieldsAllocationStyle and CompactFields values will be reset to default.
     if(class_name() == vmSymbols::java_lang_Class() && class_loader.is_null()) {
       java_lang_Class_fix_post(&next_nonstatic_field_offset);
-      nonstatic_oop_offsets[0] = (u2)first_nonstatic_field_offset;
-      int fake_oop_count       = (( next_nonstatic_field_offset -
-                                    first_nonstatic_field_offset ) / heapOopSize);
-      nonstatic_oop_length [0] = (u2)fake_oop_count;
-      nonstatic_oop_map_count  = 1;
-      nonstatic_oop_count     -= fake_oop_count;
+      nonstatic_oop_offsets[0] = first_nonstatic_field_offset;
+      const uint fake_oop_count = (next_nonstatic_field_offset -
+                                   first_nonstatic_field_offset) / heapOopSize;
+      nonstatic_oop_counts[0] = fake_oop_count;
+      nonstatic_oop_map_count = 1;
+      nonstatic_oop_count -= fake_oop_count;
       first_nonstatic_oop_offset = first_nonstatic_field_offset;
     } else {
       first_nonstatic_oop_offset = 0; // will be set for first oop field
@@ -3084,7 +3072,7 @@
     int len = fields->length();
     for (int i = 0; i < len; i += instanceKlass::next_offset) {
       int real_offset;
-      FieldAllocationType atype = (FieldAllocationType) fields->ushort_at(i+4);
+      FieldAllocationType atype = (FieldAllocationType) fields->ushort_at(i + instanceKlass::low_offset);
       switch (atype) {
         case STATIC_OOP:
           real_offset = next_static_oop_offset;
@@ -3119,13 +3107,15 @@
           // Update oop maps
           if( nonstatic_oop_map_count > 0 &&
               nonstatic_oop_offsets[nonstatic_oop_map_count - 1] ==
-              (u2)(real_offset - nonstatic_oop_length[nonstatic_oop_map_count - 1] * heapOopSize) ) {
+              real_offset -
+              int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) *
+              heapOopSize ) {
             // Extend current oop map
-            nonstatic_oop_length[nonstatic_oop_map_count - 1] += 1;
+            nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1;
           } else {
             // Create new oop map
-            nonstatic_oop_offsets[nonstatic_oop_map_count] = (u2)real_offset;
-            nonstatic_oop_length [nonstatic_oop_map_count] = 1;
+            nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
+            nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
             nonstatic_oop_map_count += 1;
             if( first_nonstatic_oop_offset == 0 ) { // Undefined
               first_nonstatic_oop_offset = real_offset;
@@ -3170,8 +3160,8 @@
         default:
           ShouldNotReachHere();
       }
-      fields->short_at_put(i+4, extract_low_short_from_int(real_offset) );
-      fields->short_at_put(i+5, extract_high_short_from_int(real_offset) );
+      fields->short_at_put(i + instanceKlass::low_offset,  extract_low_short_from_int(real_offset));
+      fields->short_at_put(i + instanceKlass::high_offset, extract_high_short_from_int(real_offset));
     }
 
     // Size of instances
@@ -3182,8 +3172,10 @@
 
     assert(instance_size == align_object_size(align_size_up((instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize), wordSize) / wordSize), "consistent layout helper value");
 
-    // Size of non-static oop map blocks (in words) allocated at end of klass
-    int nonstatic_oop_map_size = compute_oop_map_size(super_klass, nonstatic_oop_map_count, first_nonstatic_oop_offset);
+    // Number of non-static oop map blocks allocated at end of klass.
+    const unsigned int total_oop_map_count =
+      compute_oop_map_count(super_klass, nonstatic_oop_map_count,
+                            first_nonstatic_oop_offset);
 
     // Compute reference type
     ReferenceType rt;
@@ -3194,17 +3186,19 @@
     }
 
     // We can now create the basic klassOop for this klass
-    klassOop ik = oopFactory::new_instanceKlass(
-                                    vtable_size, itable_size,
-                                    static_field_size, nonstatic_oop_map_size,
-                                    rt, CHECK_(nullHandle));
+    klassOop ik = oopFactory::new_instanceKlass(vtable_size, itable_size,
+                                                static_field_size,
+                                                total_oop_map_count,
+                                                rt, CHECK_(nullHandle));
     instanceKlassHandle this_klass (THREAD, ik);
 
-    assert(this_klass->static_field_size() == static_field_size &&
-           this_klass->nonstatic_oop_map_size() == nonstatic_oop_map_size, "sanity check");
+    assert(this_klass->static_field_size() == static_field_size, "sanity");
+    assert(this_klass->nonstatic_oop_map_count() == total_oop_map_count,
+           "sanity");
 
     // Fill in information already parsed
     this_klass->set_access_flags(access_flags);
+    this_klass->set_should_verify_class(verify);
     jint lh = Klass::instance_layout_helper(instance_size, false);
     this_klass->set_layout_helper(lh);
     assert(this_klass->oop_is_instance(), "layout is correct");
@@ -3224,6 +3218,12 @@
       this_klass->set_has_final_method();
     }
     this_klass->set_method_ordering(method_ordering());
+    // The instanceKlass::_methods_jmethod_ids cache and the
+    // instanceKlass::_methods_cached_itable_indices cache are
+    // both managed on the assumption that the initial cache
+    // size is equal to the number of methods in the class. If
+    // that changes, then instanceKlass::idnum_can_increment()
+    // has to be changed accordingly.
     this_klass->set_initial_method_idnum(methods->length());
     this_klass->set_name(cp->klass_name_at(this_class_index));
     if (LinkWellKnownClasses || is_anonymous())  // I am well known to myself
@@ -3282,7 +3282,7 @@
     klassItable::setup_itable_offset_table(this_klass);
 
     // Do final class setup
-    fill_oop_maps(this_klass, nonstatic_oop_map_count, nonstatic_oop_offsets, nonstatic_oop_length);
+    fill_oop_maps(this_klass, nonstatic_oop_map_count, nonstatic_oop_offsets, nonstatic_oop_counts);
 
     set_precomputed_flags(this_klass);
 
@@ -3375,66 +3375,73 @@
 }
 
 
-int ClassFileParser::compute_oop_map_size(instanceKlassHandle super, int nonstatic_oop_map_count, int first_nonstatic_oop_offset) {
-  int map_size = super.is_null() ? 0 : super->nonstatic_oop_map_size();
+unsigned int
+ClassFileParser::compute_oop_map_count(instanceKlassHandle super,
+                                       unsigned int nonstatic_oop_map_count,
+                                       int first_nonstatic_oop_offset) {
+  unsigned int map_count =
+    super.is_null() ? 0 : super->nonstatic_oop_map_count();
   if (nonstatic_oop_map_count > 0) {
     // We have oops to add to map
-    if (map_size == 0) {
-      map_size = nonstatic_oop_map_count;
+    if (map_count == 0) {
+      map_count = nonstatic_oop_map_count;
     } else {
-      // Check whether we should add a new map block or whether the last one can be extended
-      OopMapBlock* first_map = super->start_of_nonstatic_oop_maps();
-      OopMapBlock* last_map = first_map + map_size - 1;
-
-      int next_offset = last_map->offset() + (last_map->length() * heapOopSize);
+      // Check whether we should add a new map block or whether the last one can
+      // be extended
+      OopMapBlock* const first_map = super->start_of_nonstatic_oop_maps();
+      OopMapBlock* const last_map = first_map + map_count - 1;
+
+      int next_offset = last_map->offset() + last_map->count() * heapOopSize;
       if (next_offset == first_nonstatic_oop_offset) {
         // There is no gap bettwen superklass's last oop field and first
         // local oop field, merge maps.
         nonstatic_oop_map_count -= 1;
       } else {
         // Superklass didn't end with a oop field, add extra maps
-        assert(next_offset<first_nonstatic_oop_offset, "just checking");
+        assert(next_offset < first_nonstatic_oop_offset, "just checking");
       }
-      map_size += nonstatic_oop_map_count;
+      map_count += nonstatic_oop_map_count;
     }
   }
-  return map_size;
+  return map_count;
 }
 
 
 void ClassFileParser::fill_oop_maps(instanceKlassHandle k,
-                        int nonstatic_oop_map_count,
-                        u2* nonstatic_oop_offsets, u2* nonstatic_oop_length) {
+                                    unsigned int nonstatic_oop_map_count,
+                                    int* nonstatic_oop_offsets,
+                                    unsigned int* nonstatic_oop_counts) {
   OopMapBlock* this_oop_map = k->start_of_nonstatic_oop_maps();
-  OopMapBlock* last_oop_map = this_oop_map + k->nonstatic_oop_map_size();
-  instanceKlass* super = k->superklass();
-  if (super != NULL) {
-    int super_oop_map_size     = super->nonstatic_oop_map_size();
+  const instanceKlass* const super = k->superklass();
+  const unsigned int super_count = super ? super->nonstatic_oop_map_count() : 0;
+  if (super_count > 0) {
+    // Copy maps from superklass
     OopMapBlock* super_oop_map = super->start_of_nonstatic_oop_maps();
-    // Copy maps from superklass
-    while (super_oop_map_size-- > 0) {
+    for (unsigned int i = 0; i < super_count; ++i) {
       *this_oop_map++ = *super_oop_map++;
     }
   }
+
   if (nonstatic_oop_map_count > 0) {
-    if (this_oop_map + nonstatic_oop_map_count > last_oop_map) {
-      // Calculated in compute_oop_map_size() number of oop maps is less then
-      // collected oop maps since there is no gap between superklass's last oop
-      // field and first local oop field. Extend the last oop map copied
+    if (super_count + nonstatic_oop_map_count > k->nonstatic_oop_map_count()) {
+      // The counts differ because there is no gap between superklass's last oop
+      // field and the first local oop field.  Extend the last oop map copied
       // from the superklass instead of creating new one.
       nonstatic_oop_map_count--;
       nonstatic_oop_offsets++;
       this_oop_map--;
-      this_oop_map->set_length(this_oop_map->length() + *nonstatic_oop_length++);
+      this_oop_map->set_count(this_oop_map->count() + *nonstatic_oop_counts++);
       this_oop_map++;
     }
-    assert((this_oop_map + nonstatic_oop_map_count) == last_oop_map, "just checking");
+
     // Add new map blocks, fill them
     while (nonstatic_oop_map_count-- > 0) {
       this_oop_map->set_offset(*nonstatic_oop_offsets++);
-      this_oop_map->set_length(*nonstatic_oop_length++);
+      this_oop_map->set_count(*nonstatic_oop_counts++);
       this_oop_map++;
     }
+    assert(k->start_of_nonstatic_oop_maps() + k->nonstatic_oop_map_count() ==
+           this_oop_map, "sanity");
   }
 }
 
@@ -3462,8 +3469,8 @@
 #endif
 
   // Check if this klass supports the java.lang.Cloneable interface
-  if (SystemDictionary::cloneable_klass_loaded()) {
-    if (k->is_subtype_of(SystemDictionary::cloneable_klass())) {
+  if (SystemDictionary::Cloneable_klass_loaded()) {
+    if (k->is_subtype_of(SystemDictionary::Cloneable_klass())) {
       k->set_is_cloneable();
     }
   }
@@ -3746,8 +3753,9 @@
 }
 
 bool ClassFileParser::is_supported_version(u2 major, u2 minor) {
-  u2 max_version = JDK_Version::is_gte_jdk17x_version() ?
-    JAVA_MAX_SUPPORTED_VERSION : JAVA_6_VERSION;
+  u2 max_version =
+    JDK_Version::is_gte_jdk17x_version() ? JAVA_MAX_SUPPORTED_VERSION :
+    (JDK_Version::is_gte_jdk16x_version() ? JAVA_6_VERSION : JAVA_1_5_VERSION);
   return (major >= JAVA_MIN_SUPPORTED_VERSION) &&
          (major <= max_version) &&
          ((major != max_version) ||
@@ -4168,7 +4176,7 @@
       // Check if ch is Java identifier start or is Java identifier part
       // 4672820: call java.lang.Character methods directly without generating separate tables.
       EXCEPTION_MARK;
-      instanceKlassHandle klass (THREAD, SystemDictionary::char_klass());
+      instanceKlassHandle klass (THREAD, SystemDictionary::Character_klass());
 
       // return value
       JavaValue result(T_BOOLEAN);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/classFileParser.hpp
--- a/src/share/vm/classfile/classFileParser.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/classFileParser.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -125,10 +125,13 @@
                                        int runtime_invisible_annotations_length, TRAPS);
 
   // Final setup
-  int  compute_oop_map_size(instanceKlassHandle super, int nonstatic_oop_count,
-                            int first_nonstatic_oop_offset);
-  void fill_oop_maps(instanceKlassHandle k, int nonstatic_oop_map_count,
-                     u2* nonstatic_oop_offsets, u2* nonstatic_oop_length);
+  unsigned int compute_oop_map_count(instanceKlassHandle super,
+                                     unsigned int nonstatic_oop_count,
+                                     int first_nonstatic_oop_offset);
+  void fill_oop_maps(instanceKlassHandle k,
+                     unsigned int nonstatic_oop_map_count,
+                     int* nonstatic_oop_offsets,
+                     unsigned int* nonstatic_oop_counts);
   void set_precomputed_flags(instanceKlassHandle k);
   objArrayHandle compute_transitive_interfaces(instanceKlassHandle super,
                                                objArrayHandle local_ifs, TRAPS);
@@ -257,9 +260,10 @@
                                      Handle class_loader,
                                      Handle protection_domain,
                                      symbolHandle& parsed_name,
+                                     bool verify,
                                      TRAPS) {
     KlassHandle no_host_klass;
-    return parseClassFile(name, class_loader, protection_domain, no_host_klass, NULL, parsed_name, THREAD);
+    return parseClassFile(name, class_loader, protection_domain, no_host_klass, NULL, parsed_name, verify, THREAD);
   }
   instanceKlassHandle parseClassFile(symbolHandle name,
                                      Handle class_loader,
@@ -267,6 +271,7 @@
                                      KlassHandle host_klass,
                                      GrowableArray<Handle>* cp_patches,
                                      symbolHandle& parsed_name,
+                                     bool verify,
                                      TRAPS);
 
   // Verifier checks
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/classLoader.cpp
--- a/src/share/vm/classfile/classLoader.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/classLoader.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -819,7 +819,7 @@
     _package_hash_table->copy_pkgnames(packages);
   }
   // Allocate objArray and fill with java.lang.String
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
                                            nof_entries, CHECK_0);
   objArrayHandle result(THREAD, r);
   for (int i = 0; i < nof_entries; i++) {
@@ -874,6 +874,7 @@
                                                        class_loader,
                                                        protection_domain,
                                                        parsed_name,
+                                                       false,
                                                        CHECK_(h));
 
     // add to package table
@@ -1248,6 +1249,7 @@
 }
 
 int ClassLoader::_compile_the_world_counter = 0;
+static int _codecache_sweep_counter = 0;
 
 void ClassLoader::compile_the_world_in(char* name, Handle loader, TRAPS) {
   int len = (int)strlen(name);
@@ -1292,6 +1294,13 @@
           for (int n = 0; n < k->methods()->length(); n++) {
             methodHandle m (THREAD, methodOop(k->methods()->obj_at(n)));
             if (CompilationPolicy::canBeCompiled(m)) {
+
+              if (++_codecache_sweep_counter == CompileTheWorldSafepointInterval) {
+                // Give sweeper a chance to keep up with CTW
+                VM_ForceSafepoint op;
+                VMThread::execute(&op);
+                _codecache_sweep_counter = 0;
+              }
               // Force compilation
               CompileBroker::compile_method(m, InvocationEntryBci,
                                             methodHandle(), 0, "CTW", THREAD);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/classLoader.hpp
--- a/src/share/vm/classfile/classLoader.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/classLoader.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/javaAssertions.cpp
--- a/src/share/vm/classfile/javaAssertions.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/javaAssertions.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -95,14 +95,14 @@
   int len;
   typeArrayOop t;
   len = OptionList::count(_packages);
-  objArrayOop pn = oopFactory::new_objArray(SystemDictionary::string_klass(), len, CHECK_NULL);
+  objArrayOop pn = oopFactory::new_objArray(SystemDictionary::String_klass(), len, CHECK_NULL);
   objArrayHandle pkgNames (THREAD, pn);
   t = oopFactory::new_typeArray(T_BOOLEAN, len, CHECK_NULL);
   typeArrayHandle pkgEnabled(THREAD, t);
   fillJavaArrays(_packages, len, pkgNames, pkgEnabled, CHECK_NULL);
 
   len = OptionList::count(_classes);
-  objArrayOop cn = oopFactory::new_objArray(SystemDictionary::string_klass(), len, CHECK_NULL);
+  objArrayOop cn = oopFactory::new_objArray(SystemDictionary::String_klass(), len, CHECK_NULL);
   objArrayHandle classNames (THREAD, cn);
   t = oopFactory::new_typeArray(T_BOOLEAN, len, CHECK_NULL);
   typeArrayHandle classEnabled(THREAD, t);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/javaClasses.cpp
--- a/src/share/vm/classfile/javaClasses.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/javaClasses.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -68,9 +68,9 @@
   // and the char array it points to end up in the same cache line.
   oop obj;
   if (tenured) {
-    obj = instanceKlass::cast(SystemDictionary::string_klass())->allocate_permanent_instance(CHECK_NH);
+    obj = instanceKlass::cast(SystemDictionary::String_klass())->allocate_permanent_instance(CHECK_NH);
   } else {
-    obj = instanceKlass::cast(SystemDictionary::string_klass())->allocate_instance(CHECK_NH);
+    obj = instanceKlass::cast(SystemDictionary::String_klass())->allocate_instance(CHECK_NH);
   }
 
   // Create the char array.  The String object must be handlized here
@@ -252,7 +252,7 @@
   typeArrayOop value  = java_lang_String::value(obj);
   int          offset = java_lang_String::offset(obj);
   int          length = java_lang_String::length(obj);
-  jchar* base = value->char_at_addr(offset);
+  jchar* base = (length == 0) ? NULL : value->char_at_addr(offset);
   symbolOop sym = SymbolTable::lookup_unicode(base, length, THREAD);
   return symbolHandle(THREAD, sym);
 }
@@ -261,7 +261,7 @@
   typeArrayOop value  = java_lang_String::value(java_string);
   int          offset = java_lang_String::offset(java_string);
   int          length = java_lang_String::length(java_string);
-  jchar* base = value->char_at_addr(offset);
+  jchar* base = (length == 0) ? NULL : value->char_at_addr(offset);
   return SymbolTable::probe_unicode(base, length);
 }
 
@@ -293,7 +293,7 @@
 
 bool java_lang_String::equals(oop java_string, jchar* chars, int len) {
   assert(SharedSkipVerify ||
-         java_string->klass() == SystemDictionary::string_klass(),
+         java_string->klass() == SystemDictionary::String_klass(),
          "must be java_string");
   typeArrayOop value  = java_lang_String::value(java_string);
   int          offset = java_lang_String::offset(java_string);
@@ -311,7 +311,7 @@
 
 void java_lang_String::print(Handle java_string, outputStream* st) {
   oop          obj    = java_string();
-  assert(obj->klass() == SystemDictionary::string_klass(), "must be java_string");
+  assert(obj->klass() == SystemDictionary::String_klass(), "must be java_string");
   typeArrayOop value  = java_lang_String::value(obj);
   int          offset = java_lang_String::offset(obj);
   int          length = java_lang_String::length(obj);
@@ -339,9 +339,9 @@
   // class is put into the system dictionary.
   int computed_modifiers = k->compute_modifier_flags(CHECK_0);
   k->set_modifier_flags(computed_modifiers);
-  if (SystemDictionary::class_klass_loaded()) {
+  if (SystemDictionary::Class_klass_loaded()) {
     // Allocate mirror (java.lang.Class instance)
-    Handle mirror = instanceKlass::cast(SystemDictionary::class_klass())->allocate_permanent_instance(CHECK_0);
+    Handle mirror = instanceKlass::cast(SystemDictionary::Class_klass())->allocate_permanent_instance(CHECK_0);
     // Setup indirections
     mirror->obj_field_put(klass_offset,  k());
     k->set_java_mirror(mirror());
@@ -378,7 +378,7 @@
 oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) {
   // This should be improved by adding a field at the Java level or by
   // introducing a new VM klass (see comment in ClassFileParser)
-  oop java_class = instanceKlass::cast(SystemDictionary::class_klass())->allocate_permanent_instance(CHECK_0);
+  oop java_class = instanceKlass::cast(SystemDictionary::Class_klass())->allocate_permanent_instance(CHECK_0);
   if (type != T_VOID) {
     klassOop aklass = Universe::typeArrayKlassObj(type);
     assert(aklass != NULL, "correct bootstrap");
@@ -502,7 +502,7 @@
 
 oop java_lang_Class::primitive_mirror(BasicType t) {
   oop mirror = Universe::java_mirror(t);
-  assert(mirror != NULL && mirror->is_a(SystemDictionary::class_klass()), "must be a Class");
+  assert(mirror != NULL && mirror->is_a(SystemDictionary::Class_klass()), "must be a Class");
   assert(java_lang_Class::is_primitive(mirror), "must be primitive");
   return mirror;
 }
@@ -515,14 +515,14 @@
   assert(!offsets_computed, "offsets should be initialized only once");
   offsets_computed = true;
 
-  klassOop k = SystemDictionary::class_klass();
+  klassOop k = SystemDictionary::Class_klass();
   // The classRedefinedCount field is only present starting in 1.5,
   // so don't go fatal.
   compute_optional_offset(classRedefinedCount_offset,
     k, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature());
 
   // The field indicating parallelCapable (parallelLockMap) is only present starting in 7,
-  klassOop k1 = SystemDictionary::classloader_klass();
+  klassOop k1 = SystemDictionary::ClassLoader_klass();
   compute_optional_offset(parallelCapable_offset,
     k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature());
 }
@@ -588,7 +588,7 @@
 void java_lang_Thread::compute_offsets() {
   assert(_group_offset == 0, "offsets should be initialized only once");
 
-  klassOop k = SystemDictionary::thread_klass();
+  klassOop k = SystemDictionary::Thread_klass();
   compute_offset(_name_offset,      k, vmSymbols::name_name(),      vmSymbols::char_array_signature());
   compute_offset(_group_offset,     k, vmSymbols::group_name(),     vmSymbols::threadgroup_signature());
   compute_offset(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), vmSymbols::classloader_signature());
@@ -847,7 +847,7 @@
 void java_lang_ThreadGroup::compute_offsets() {
   assert(_parent_offset == 0, "offsets should be initialized only once");
 
-  klassOop k = SystemDictionary::threadGroup_klass();
+  klassOop k = SystemDictionary::ThreadGroup_klass();
 
   compute_offset(_parent_offset,      k, vmSymbols::parent_name(),      vmSymbols::threadgroup_signature());
   compute_offset(_name_offset,        k, vmSymbols::name_name(),        vmSymbols::string_signature());
@@ -1121,11 +1121,23 @@
   }
 
   void flush() {
+    // The following appears to have been an optimization to save from
+    // doing a barrier for each individual store into the _methods array,
+    // but rather to do it for the entire array after the series of writes.
+    // That optimization seems to have been lost when compressed oops was
+    // implemented. However, the extra card-marks below was left in place,
+    // but is now redundant because the individual stores into the
+    // _methods array already execute the barrier code. CR 6918185 has
+    // been filed so the original code may be restored by deferring the
+    // barriers until after the entire sequence of stores, thus re-enabling
+    // the intent of the original optimization. In the meantime the redundant
+    // card mark below is now disabled.
     if (_dirty && _methods != NULL) {
+#if 0
       BarrierSet* bs = Universe::heap()->barrier_set();
       assert(bs->has_write_ref_array_opt(), "Barrier set must have ref array opt");
-      bs->write_ref_array(MemRegion((HeapWord*)_methods->base(),
-                                    _methods->array_size()));
+      bs->write_ref_array((HeapWord*)_methods->base(), _methods->length());
+#endif
       _dirty = false;
     }
   }
@@ -1169,9 +1181,7 @@
       method = mhandle();
     }
 
-     _methods->obj_at_put(_index, method);
-    // bad for UseCompressedOops
-    // *_methods->obj_at_addr(_index) = method;
+    _methods->obj_at_put(_index, method);
     _bcis->ushort_at_put(_index, bci);
     _index++;
     _dirty = true;
@@ -1229,13 +1239,10 @@
 
     // Compiled java method case.
     if (decode_offset != 0) {
-      bool dummy_reexecute = false;
       DebugInfoReadStream stream(nm, decode_offset);
       decode_offset = stream.read_int();
       method = (methodOop)nm->oop_at(stream.read_int());
-      //fill_in_stack_trace does not need the reexecute information which is designed
-      //for the deopt to reexecute
-      bci = stream.read_bci_and_reexecute(dummy_reexecute);
+      bci = stream.read_bci();
     } else {
       if (fr.is_first_frame()) break;
       address pc = fr.pc();
@@ -1348,7 +1355,7 @@
   // No-op if stack trace is disabled
   if (!StackTraceInThrowable) return;
 
-  assert(throwable->is_a(SystemDictionary::throwable_klass()), "sanity check");
+  assert(throwable->is_a(SystemDictionary::Throwable_klass()), "sanity check");
 
   oop backtrace = java_lang_Throwable::backtrace(throwable());
   assert(backtrace != NULL, "backtrace not preallocated");
@@ -1453,7 +1460,7 @@
   assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4");
 
   // Allocate java.lang.StackTraceElement instance
-  klassOop k = SystemDictionary::stackTraceElement_klass();
+  klassOop k = SystemDictionary::StackTraceElement_klass();
   assert(k != NULL, "must be loaded in 1.4+");
   instanceKlassHandle ik (THREAD, k);
   if (ik->should_be_initialized()) {
@@ -1491,7 +1498,7 @@
 
 
 void java_lang_reflect_AccessibleObject::compute_offsets() {
-  klassOop k = SystemDictionary::reflect_accessible_object_klass();
+  klassOop k = SystemDictionary::reflect_AccessibleObject_klass();
   compute_offset(override_offset, k, vmSymbols::override_name(), vmSymbols::bool_signature());
 }
 
@@ -1506,7 +1513,7 @@
 }
 
 void java_lang_reflect_Method::compute_offsets() {
-  klassOop k = SystemDictionary::reflect_method_klass();
+  klassOop k = SystemDictionary::reflect_Method_klass();
   compute_offset(clazz_offset,          k, vmSymbols::clazz_name(),          vmSymbols::class_signature());
   compute_offset(name_offset,           k, vmSymbols::name_name(),           vmSymbols::string_signature());
   compute_offset(returnType_offset,     k, vmSymbols::returnType_name(),     vmSymbols::class_signature());
@@ -1527,7 +1534,7 @@
 
 Handle java_lang_reflect_Method::create(TRAPS) {
   assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
-  klassOop klass = SystemDictionary::reflect_method_klass();
+  klassOop klass = SystemDictionary::reflect_Method_klass();
   // This class is eagerly initialized during VM initialization, since we keep a refence
   // to one of the methods
   assert(instanceKlass::cast(klass)->is_initialized(), "must be initialized");
@@ -1669,7 +1676,7 @@
 }
 
 void java_lang_reflect_Constructor::compute_offsets() {
-  klassOop k = SystemDictionary::reflect_constructor_klass();
+  klassOop k = SystemDictionary::reflect_Constructor_klass();
   compute_offset(clazz_offset,          k, vmSymbols::clazz_name(),          vmSymbols::class_signature());
   compute_offset(parameterTypes_offset, k, vmSymbols::parameterTypes_name(), vmSymbols::class_array_signature());
   compute_offset(exceptionTypes_offset, k, vmSymbols::exceptionTypes_name(), vmSymbols::class_array_signature());
@@ -1793,7 +1800,7 @@
 }
 
 void java_lang_reflect_Field::compute_offsets() {
-  klassOop k = SystemDictionary::reflect_field_klass();
+  klassOop k = SystemDictionary::reflect_Field_klass();
   compute_offset(clazz_offset,     k, vmSymbols::clazz_name(),     vmSymbols::class_signature());
   compute_offset(name_offset,      k, vmSymbols::name_name(),      vmSymbols::string_signature());
   compute_offset(type_offset,      k, vmSymbols::type_name(),      vmSymbols::class_signature());
@@ -1900,7 +1907,7 @@
 
 
 void sun_reflect_ConstantPool::compute_offsets() {
-  klassOop k = SystemDictionary::reflect_constant_pool_klass();
+  klassOop k = SystemDictionary::reflect_ConstantPool_klass();
   // This null test can be removed post beta
   if (k != NULL) {
     compute_offset(_cp_oop_offset, k, vmSymbols::constantPoolOop_name(), vmSymbols::object_signature());
@@ -1910,7 +1917,7 @@
 
 Handle sun_reflect_ConstantPool::create(TRAPS) {
   assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
-  klassOop k = SystemDictionary::reflect_constant_pool_klass();
+  klassOop k = SystemDictionary::reflect_ConstantPool_klass();
   instanceKlassHandle klass (THREAD, k);
   // Ensure it is initialized
   klass->initialize(CHECK_NH);
@@ -1930,7 +1937,7 @@
 }
 
 void sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets() {
-  klassOop k = SystemDictionary::reflect_unsafe_static_field_accessor_impl_klass();
+  klassOop k = SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass();
   // This null test can be removed post beta
   if (k != NULL) {
     compute_offset(_base_offset, k,
@@ -2076,7 +2083,7 @@
 
 // Support for java_lang_ref_Reference
 oop java_lang_ref_Reference::pending_list_lock() {
-  instanceKlass* ik = instanceKlass::cast(SystemDictionary::reference_klass());
+  instanceKlass* ik = instanceKlass::cast(SystemDictionary::Reference_klass());
   char *addr = (((char *)ik->start_of_static_fields()) + static_lock_offset);
   if (UseCompressedOops) {
     return oopDesc::load_decode_heap_oop((narrowOop *)addr);
@@ -2086,7 +2093,7 @@
 }
 
 HeapWord *java_lang_ref_Reference::pending_list_addr() {
-  instanceKlass* ik = instanceKlass::cast(SystemDictionary::reference_klass());
+  instanceKlass* ik = instanceKlass::cast(SystemDictionary::Reference_klass());
   char *addr = (((char *)ik->start_of_static_fields()) + static_pending_offset);
   // XXX This might not be HeapWord aligned, almost rather be char *.
   return (HeapWord*)addr;
@@ -2109,17 +2116,17 @@
 }
 
 jlong java_lang_ref_SoftReference::clock() {
-  instanceKlass* ik = instanceKlass::cast(SystemDictionary::soft_reference_klass());
+  instanceKlass* ik = instanceKlass::cast(SystemDictionary::SoftReference_klass());
   int offset = ik->offset_of_static_fields() + static_clock_offset;
 
-  return SystemDictionary::soft_reference_klass()->long_field(offset);
+  return SystemDictionary::SoftReference_klass()->long_field(offset);
 }
 
 void java_lang_ref_SoftReference::set_clock(jlong value) {
-  instanceKlass* ik = instanceKlass::cast(SystemDictionary::soft_reference_klass());
+  instanceKlass* ik = instanceKlass::cast(SystemDictionary::SoftReference_klass());
   int offset = ik->offset_of_static_fields() + static_clock_offset;
 
-  SystemDictionary::soft_reference_klass()->long_field_put(offset, value);
+  SystemDictionary::SoftReference_klass()->long_field_put(offset, value);
 }
 
 
@@ -2407,6 +2414,10 @@
   return ptypes(mt)->obj_at(idx);
 }
 
+int java_dyn_MethodType::ptype_count(oop mt) {
+  return ptypes(mt)->length();
+}
+
 
 
 // Support for java_dyn_MethodTypeForm
@@ -2433,15 +2444,15 @@
 }
 
 
-// Support for sun_dyn_CallSiteImpl
-
-int sun_dyn_CallSiteImpl::_type_offset;
-int sun_dyn_CallSiteImpl::_target_offset;
-int sun_dyn_CallSiteImpl::_vmmethod_offset;
-
-void sun_dyn_CallSiteImpl::compute_offsets() {
+// Support for java_dyn_CallSite
+
+int java_dyn_CallSite::_type_offset;
+int java_dyn_CallSite::_target_offset;
+int java_dyn_CallSite::_vmmethod_offset;
+
+void java_dyn_CallSite::compute_offsets() {
   if (!EnableInvokeDynamic)  return;
-  klassOop k = SystemDictionary::CallSiteImpl_klass();
+  klassOop k = SystemDictionary::CallSite_klass();
   if (k != NULL) {
     compute_offset(_type_offset,   k, vmSymbols::type_name(),   vmSymbols::java_dyn_MethodType_signature(), true);
     compute_offset(_target_offset, k, vmSymbols::target_name(), vmSymbols::java_dyn_MethodHandle_signature(), true);
@@ -2449,23 +2460,23 @@
   }
 }
 
-oop sun_dyn_CallSiteImpl::type(oop site) {
+oop java_dyn_CallSite::type(oop site) {
   return site->obj_field(_type_offset);
 }
 
-oop sun_dyn_CallSiteImpl::target(oop site) {
+oop java_dyn_CallSite::target(oop site) {
   return site->obj_field(_target_offset);
 }
 
-void sun_dyn_CallSiteImpl::set_target(oop site, oop target) {
+void java_dyn_CallSite::set_target(oop site, oop target) {
   site->obj_field_put(_target_offset, target);
 }
 
-oop sun_dyn_CallSiteImpl::vmmethod(oop site) {
+oop java_dyn_CallSite::vmmethod(oop site) {
   return site->obj_field(_vmmethod_offset);
 }
 
-void sun_dyn_CallSiteImpl::set_vmmethod(oop site, oop ref) {
+void java_dyn_CallSite::set_vmmethod(oop site, oop ref) {
   site->obj_field_put(_vmmethod_offset, ref);
 }
 
@@ -2538,7 +2549,7 @@
     // the generated bytecodes for reflection, and if so, "magically"
     // delegate to its parent to prevent class loading from occurring
     // in places where applications using reflection didn't expect it.
-    klassOop delegating_cl_class = SystemDictionary::reflect_delegating_classloader_klass();
+    klassOop delegating_cl_class = SystemDictionary::reflect_DelegatingClassLoader_klass();
     // This might be null in non-1.4 JDKs
     if (delegating_cl_class != NULL && loader->is_a(delegating_cl_class)) {
       return parent(loader);
@@ -2553,7 +2564,7 @@
 void java_lang_System::compute_offsets() {
   assert(offset_of_static_fields == 0, "offsets should be initialized only once");
 
-  instanceKlass* ik = instanceKlass::cast(SystemDictionary::system_klass());
+  instanceKlass* ik = instanceKlass::cast(SystemDictionary::System_klass());
   offset_of_static_fields = ik->offset_of_static_fields();
 }
 
@@ -2814,7 +2825,7 @@
     java_dyn_MethodTypeForm::compute_offsets();
   }
   if (EnableInvokeDynamic) {
-    sun_dyn_CallSiteImpl::compute_offsets();
+    java_dyn_CallSite::compute_offsets();
   }
   java_security_AccessControlContext::compute_offsets();
   // Initialize reflection classes. The layouts of these classes
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/javaClasses.hpp
--- a/src/share/vm/classfile/javaClasses.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/javaClasses.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -111,7 +111,7 @@
 
   // Testers
   static bool is_instance(oop obj) {
-    return obj != NULL && obj->klass() == SystemDictionary::string_klass();
+    return obj != NULL && obj->klass() == SystemDictionary::String_klass();
   }
 
   // Debugging
@@ -161,7 +161,7 @@
   static void print_signature(oop java_class, outputStream *st);
   // Testing
   static bool is_instance(oop obj) {
-    return obj != NULL && obj->klass() == SystemDictionary::class_klass();
+    return obj != NULL && obj->klass() == SystemDictionary::Class_klass();
   }
   static bool is_primitive(oop java_class);
   static BasicType primitive_type(oop java_class);
@@ -903,19 +903,20 @@
   // Relevant integer codes (keep these in synch. with MethodHandleNatives.Constants):
   enum {
     OP_RETYPE_ONLY   = 0x0, // no argument changes; straight retype
-    OP_CHECK_CAST    = 0x1, // ref-to-ref conversion; requires a Class argument
-    OP_PRIM_TO_PRIM  = 0x2, // converts from one primitive to another
-    OP_REF_TO_PRIM   = 0x3, // unboxes a wrapper to produce a primitive
-    OP_PRIM_TO_REF   = 0x4, // boxes a primitive into a wrapper (NYI)
-    OP_SWAP_ARGS     = 0x5, // swap arguments (vminfo is 2nd arg)
-    OP_ROT_ARGS      = 0x6, // rotate arguments (vminfo is displaced arg)
-    OP_DUP_ARGS      = 0x7, // duplicates one or more arguments (at TOS)
-    OP_DROP_ARGS     = 0x8, // remove one or more argument slots
-    OP_COLLECT_ARGS  = 0x9, // combine one or more arguments into a varargs (NYI)
-    OP_SPREAD_ARGS   = 0xA, // expand in place a varargs array (of known size)
-    OP_FLYBY         = 0xB, // operate first on reified argument list (NYI)
-    OP_RICOCHET      = 0xC, // run an adapter chain on the return value (NYI)
-    CONV_OP_LIMIT    = 0xD, // limit of CONV_OP enumeration
+    OP_RETYPE_RAW    = 0x1, // straight retype, trusted (void->int, Object->T)
+    OP_CHECK_CAST    = 0x2, // ref-to-ref conversion; requires a Class argument
+    OP_PRIM_TO_PRIM  = 0x3, // converts from one primitive to another
+    OP_REF_TO_PRIM   = 0x4, // unboxes a wrapper to produce a primitive
+    OP_PRIM_TO_REF   = 0x5, // boxes a primitive into a wrapper (NYI)
+    OP_SWAP_ARGS     = 0x6, // swap arguments (vminfo is 2nd arg)
+    OP_ROT_ARGS      = 0x7, // rotate arguments (vminfo is displaced arg)
+    OP_DUP_ARGS      = 0x8, // duplicates one or more arguments (at TOS)
+    OP_DROP_ARGS     = 0x9, // remove one or more argument slots
+    OP_COLLECT_ARGS  = 0xA, // combine one or more arguments into a varargs (NYI)
+    OP_SPREAD_ARGS   = 0xB, // expand in place a varargs array (of known size)
+    OP_FLYBY         = 0xC, // operate first on reified argument list (NYI)
+    OP_RICOCHET      = 0xD, // run an adapter chain on the return value (NYI)
+    CONV_OP_LIMIT    = 0xE, // limit of CONV_OP enumeration
 
     CONV_OP_MASK     = 0xF00, // this nybble contains the conversion op field
     CONV_VMINFO_MASK = 0x0FF, // LSB is reserved for JVM use
@@ -1026,6 +1027,7 @@
   static oop            form(oop mt);
 
   static oop            ptype(oop mt, int index);
+  static int            ptype_count(oop mt);
 
   static symbolOop      as_signature(oop mt, bool intern_if_not_found, TRAPS);
   static void           print_signature(oop mt, outputStream* st);
@@ -1060,9 +1062,9 @@
 };
 
 
-// Interface to sun.dyn.CallSiteImpl objects
+// Interface to java.dyn.CallSite objects
 
-class sun_dyn_CallSiteImpl: AllStatic {
+class java_dyn_CallSite: AllStatic {
   friend class JavaClasses;
 
 private:
@@ -1082,6 +1084,14 @@
   static oop            vmmethod(oop site);
   static void       set_vmmethod(oop site, oop ref);
 
+  // Testers
+  static bool is_subclass(klassOop klass) {
+    return Klass::cast(klass)->is_subclass_of(SystemDictionary::CallSite_klass());
+  }
+  static bool is_instance(oop obj) {
+    return obj != NULL && is_subclass(obj->klass());
+  }
+
   // Accessors for code generation:
   static int target_offset_in_bytes()           { return _target_offset; }
   static int type_offset_in_bytes()             { return _type_offset; }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/loaderConstraints.cpp
--- a/src/share/vm/classfile/loaderConstraints.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/loaderConstraints.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -457,7 +457,8 @@
 }
 
 
-void LoaderConstraintTable::verify(Dictionary* dictionary) {
+void LoaderConstraintTable::verify(Dictionary* dictionary,
+                                   PlaceholderTable* placeholders) {
   Thread *thread = Thread::current();
   for (int cindex = 0; cindex < _loader_constraint_size; cindex++) {
     for (LoaderConstraintEntry* probe = bucket(cindex);
@@ -472,7 +473,23 @@
         unsigned int d_hash = dictionary->compute_hash(name, loader);
         int d_index = dictionary->hash_to_index(d_hash);
         klassOop k = dictionary->find_class(d_index, d_hash, name, loader);
-        guarantee(k == probe->klass(), "klass should be in dictionary");
+        if (k != NULL) {
+          // We found the class in the system dictionary, so we should
+          // make sure that the klassOop matches what we already have.
+          guarantee(k == probe->klass(), "klass should be in dictionary");
+        } else {
+          // If we don't find the class in the system dictionary, it
+          // has to be in the placeholders table.
+          unsigned int p_hash = placeholders->compute_hash(name, loader);
+          int p_index = placeholders->hash_to_index(p_hash);
+          PlaceholderEntry* entry = placeholders->get_entry(p_index, p_hash,
+                                                            name, loader);
+
+          // The instanceKlass might not be on the entry, so the only
+          // thing we can check here is whether we were successful in
+          // finding the class in the placeholders table.
+          guarantee(entry != NULL, "klass should be in the placeholders");
+        }
       }
       for (int n = 0; n< probe->num_loaders(); n++) {
         guarantee(probe->loader(n)->is_oop_or_null(), "should be oop");
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/loaderConstraints.hpp
--- a/src/share/vm/classfile/loaderConstraints.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/loaderConstraints.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -84,7 +84,7 @@
 
   void purge_loader_constraints(BoolObjectClosure* is_alive);
 
-  void verify(Dictionary* dictionary);
+  void verify(Dictionary* dictionary, PlaceholderTable* placeholders);
 #ifndef PRODUCT
   void print();
 #endif
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/systemDictionary.cpp
--- a/src/share/vm/classfile/systemDictionary.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/systemDictionary.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -60,10 +60,10 @@
 }
 
 void SystemDictionary::compute_java_system_loader(TRAPS) {
-  KlassHandle system_klass(THREAD, WK_KLASS(classloader_klass));
+  KlassHandle system_klass(THREAD, WK_KLASS(ClassLoader_klass));
   JavaValue result(T_OBJECT);
   JavaCalls::call_static(&result,
-                         KlassHandle(THREAD, WK_KLASS(classloader_klass)),
+                         KlassHandle(THREAD, WK_KLASS(ClassLoader_klass)),
                          vmSymbolHandles::getSystemClassLoader_name(),
                          vmSymbolHandles::void_classloader_signature(),
                          CHECK);
@@ -99,6 +99,15 @@
   return java_lang_Class::parallelCapable(class_loader());
 }
 // ----------------------------------------------------------------------------
+// ParallelDefineClass flag does not apply to bootclass loader
+bool SystemDictionary::is_parallelDefine(Handle class_loader) {
+   if (class_loader.is_null()) return false;
+   if (AllowParallelDefineClass && java_lang_Class::parallelCapable(class_loader())) {
+     return true;
+   }
+   return false;
+}
+// ----------------------------------------------------------------------------
 // Resolving of classes
 
 // Forwards to resolve_or_null
@@ -119,7 +128,7 @@
     // in which case we have to check whether the pending exception is a ClassNotFoundException,
     // and if so convert it to a NoClassDefFoundError
     // And chain the original ClassNotFoundException
-    if (throw_error && PENDING_EXCEPTION->is_a(SystemDictionary::classNotFoundException_klass())) {
+    if (throw_error && PENDING_EXCEPTION->is_a(SystemDictionary::ClassNotFoundException_klass())) {
       ResourceMark rm(THREAD);
       assert(klass_h() == NULL, "Should not have result with exception pending");
       Handle e(THREAD, PENDING_EXCEPTION);
@@ -350,7 +359,7 @@
 
   assert(class_loader() != NULL, "should not have non-null protection domain for null classloader");
 
-  KlassHandle system_loader(THREAD, SystemDictionary::classloader_klass());
+  KlassHandle system_loader(THREAD, SystemDictionary::ClassLoader_klass());
   JavaCalls::call_special(&result,
                          class_loader,
                          system_loader,
@@ -724,17 +733,17 @@
       // Do actual loading
       k = load_instance_class(name, class_loader, THREAD);
 
-      // For UnsyncloadClass and AllowParallelDefineClass only:
+      // For UnsyncloadClass only
       // If they got a linkageError, check if a parallel class load succeeded.
       // If it did, then for bytecode resolution the specification requires
       // that we return the same result we did for the other thread, i.e. the
       // successfully loaded instanceKlass
       // Should not get here for classloaders that support parallelism
-      // with the new cleaner mechanism
+      // with the new cleaner mechanism, even with AllowParallelDefineClass
       // Bootstrap goes through here to allow for an extra guarantee check
       if (UnsyncloadClass || (class_loader.is_null())) {
         if (k.is_null() && HAS_PENDING_EXCEPTION
-          && PENDING_EXCEPTION->is_a(SystemDictionary::linkageError_klass())) {
+          && PENDING_EXCEPTION->is_a(SystemDictionary::LinkageError_klass())) {
           MutexLocker mu(SystemDictionary_lock, THREAD);
           klassOop check = find_class(d_index, d_hash, name, class_loader);
           if (check != NULL) {
@@ -970,6 +979,7 @@
                                                              host_klass,
                                                              cp_patches,
                                                              parsed_name,
+                                                             true,
                                                              THREAD);
 
 
@@ -1025,6 +1035,7 @@
                                                Handle class_loader,
                                                Handle protection_domain,
                                                ClassFileStream* st,
+                                               bool verify,
                                                TRAPS) {
 
   // Classloaders that support parallelism, e.g. bootstrap classloader,
@@ -1055,6 +1066,7 @@
                                                              class_loader,
                                                              protection_domain,
                                                              parsed_name,
+                                                             verify,
                                                              THREAD);
 
   const char* pkg = "java/";
@@ -1355,7 +1367,7 @@
 
     JavaValue result(T_OBJECT);
 
-    KlassHandle spec_klass (THREAD, SystemDictionary::classloader_klass());
+    KlassHandle spec_klass (THREAD, SystemDictionary::ClassLoader_klass());
 
     // Call public unsynchronized loadClass(String) directly for all class loaders
     // for parallelCapable class loaders. JDK >=7, loadClass(String, boolean) will
@@ -1480,14 +1492,17 @@
 }
 
 // Support parallel classloading
-// Initial implementation for bootstrap classloader
-// For custom class loaders that support parallel classloading,
+// All parallel class loaders, including bootstrap classloader
+// lock a placeholder entry for this class/class_loader pair
+// to allow parallel defines of different classes for this class loader
 // With AllowParallelDefine flag==true, in case they do not synchronize around
 // FindLoadedClass/DefineClass, calls, we check for parallel
 // loading for them, wait if a defineClass is in progress
 // and return the initial requestor's results
+// This flag does not apply to the bootstrap classloader.
 // With AllowParallelDefine flag==false, call through to define_instance_class
 // which will throw LinkageError: duplicate class definition.
+// False is the requested default.
 // For better performance, the class loaders should synchronize
 // findClass(), i.e. FindLoadedClass/DefineClassIfAbsent or they
 // potentially waste time reading and parsing the bytestream.
@@ -1508,9 +1523,11 @@
   {
     MutexLocker mu(SystemDictionary_lock, THREAD);
     // First check if class already defined
-    klassOop check = find_class(d_index, d_hash, name_h, class_loader);
-    if (check != NULL) {
-      return(instanceKlassHandle(THREAD, check));
+    if (UnsyncloadClass || (is_parallelDefine(class_loader))) {
+      klassOop check = find_class(d_index, d_hash, name_h, class_loader);
+      if (check != NULL) {
+        return(instanceKlassHandle(THREAD, check));
+      }
     }
 
     // Acquire define token for this class/classloader
@@ -1526,7 +1543,7 @@
     // Only special cases allow parallel defines and can use other thread's results
     // Other cases fall through, and may run into duplicate defines
     // caught by finding an entry in the SystemDictionary
-    if ((UnsyncloadClass || AllowParallelDefineClass) && (probe->instanceKlass() != NULL)) {
+    if ((UnsyncloadClass || is_parallelDefine(class_loader)) && (probe->instanceKlass() != NULL)) {
         probe->remove_seen_thread(THREAD, PlaceholderTable::DEFINE_CLASS);
         placeholders()->find_and_remove(p_index, p_hash, name_h, class_loader, THREAD);
         SystemDictionary_lock->notify_all();
@@ -1927,13 +1944,13 @@
 
 
 void SystemDictionary::initialize_preloaded_classes(TRAPS) {
-  assert(WK_KLASS(object_klass) == NULL, "preloaded classes should only be initialized once");
+  assert(WK_KLASS(Object_klass) == NULL, "preloaded classes should only be initialized once");
   // Preload commonly used klasses
   WKID scan = FIRST_WKID;
   // first do Object, String, Class
-  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(class_klass), scan, CHECK);
+  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
 
-  debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(class_klass)));
+  debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(Class_klass)));
 
   // Fixup mirrors for classes loaded before java.lang.Class.
   // These calls iterate over the objects currently in the perm gen
@@ -1944,33 +1961,33 @@
   Universe::fixup_mirrors(CHECK);
 
   // do a bunch more:
-  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(reference_klass), scan, CHECK);
+  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK);
 
   // Preload ref klasses and set reference types
-  instanceKlass::cast(WK_KLASS(reference_klass))->set_reference_type(REF_OTHER);
-  instanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(reference_klass));
+  instanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER);
+  instanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass));
 
-  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(phantom_reference_klass), scan, CHECK);
-  instanceKlass::cast(WK_KLASS(soft_reference_klass))->set_reference_type(REF_SOFT);
-  instanceKlass::cast(WK_KLASS(weak_reference_klass))->set_reference_type(REF_WEAK);
-  instanceKlass::cast(WK_KLASS(final_reference_klass))->set_reference_type(REF_FINAL);
-  instanceKlass::cast(WK_KLASS(phantom_reference_klass))->set_reference_type(REF_PHANTOM);
+  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK);
+  instanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT);
+  instanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK);
+  instanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL);
+  instanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM);
 
   WKID meth_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);
   WKID meth_group_end   = WK_KLASS_ENUM_NAME(WrongMethodTypeException_klass);
   initialize_wk_klasses_until(meth_group_start, scan, CHECK);
   if (EnableMethodHandles) {
-    initialize_wk_klasses_through(meth_group_start, scan, CHECK);
+    initialize_wk_klasses_through(meth_group_end, scan, CHECK);
   }
   if (_well_known_klasses[meth_group_start] == NULL) {
     // Skip the rest of the method handle classes, if MethodHandle is not loaded.
     scan = WKID(meth_group_end+1);
   }
   WKID indy_group_start = WK_KLASS_ENUM_NAME(Linkage_klass);
-  WKID indy_group_end   = WK_KLASS_ENUM_NAME(Dynamic_klass);
+  WKID indy_group_end   = WK_KLASS_ENUM_NAME(InvokeDynamic_klass);
   initialize_wk_klasses_until(indy_group_start, scan, CHECK);
   if (EnableInvokeDynamic) {
-    initialize_wk_klasses_through(indy_group_start, scan, CHECK);
+    initialize_wk_klasses_through(indy_group_end, scan, CHECK);
   }
   if (_well_known_klasses[indy_group_start] == NULL) {
     // Skip the rest of the dynamic typing classes, if Linkage is not loaded.
@@ -1979,14 +1996,14 @@
 
   initialize_wk_klasses_until(WKID_LIMIT, scan, CHECK);
 
-  _box_klasses[T_BOOLEAN] = WK_KLASS(boolean_klass);
-  _box_klasses[T_CHAR]    = WK_KLASS(char_klass);
-  _box_klasses[T_FLOAT]   = WK_KLASS(float_klass);
-  _box_klasses[T_DOUBLE]  = WK_KLASS(double_klass);
-  _box_klasses[T_BYTE]    = WK_KLASS(byte_klass);
-  _box_klasses[T_SHORT]   = WK_KLASS(short_klass);
-  _box_klasses[T_INT]     = WK_KLASS(int_klass);
-  _box_klasses[T_LONG]    = WK_KLASS(long_klass);
+  _box_klasses[T_BOOLEAN] = WK_KLASS(Boolean_klass);
+  _box_klasses[T_CHAR]    = WK_KLASS(Character_klass);
+  _box_klasses[T_FLOAT]   = WK_KLASS(Float_klass);
+  _box_klasses[T_DOUBLE]  = WK_KLASS(Double_klass);
+  _box_klasses[T_BYTE]    = WK_KLASS(Byte_klass);
+  _box_klasses[T_SHORT]   = WK_KLASS(Short_klass);
+  _box_klasses[T_INT]     = WK_KLASS(Integer_klass);
+  _box_klasses[T_LONG]    = WK_KLASS(Long_klass);
   //_box_klasses[T_OBJECT]  = WK_KLASS(object_klass);
   //_box_klasses[T_ARRAY]   = WK_KLASS(object_klass);
 
@@ -1997,11 +2014,11 @@
 #endif // KERNEL
 
   { // Compute whether we should use loadClass or loadClassInternal when loading classes.
-    methodOop method = instanceKlass::cast(classloader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature());
+    methodOop method = instanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature());
     _has_loadClassInternal = (method != NULL);
   }
   { // Compute whether we should use checkPackageAccess or NOT
-    methodOop method = instanceKlass::cast(classloader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature());
+    methodOop method = instanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature());
     _has_checkPackageAccess = (method != NULL);
   }
 }
@@ -2323,6 +2340,8 @@
   SymbolPropertyEntry* spe = invoke_method_table()->find_entry(index, hash, signature);
   if (spe == NULL || spe->property_oop() == NULL) {
     // Must create lots of stuff here, but outside of the SystemDictionary lock.
+    if (THREAD->is_Compiler_thread())
+      return NULL;              // do not attempt from within compiler
     Handle mt = compute_method_handle_type(signature(),
                                            class_loader, protection_domain,
                                            CHECK_NULL);
@@ -2355,7 +2374,7 @@
                                                     TRAPS) {
   Handle empty;
   int npts = ArgumentCount(signature()).size();
-  objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::class_klass(), npts, CHECK_(empty));
+  objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::Class_klass(), npts, CHECK_(empty));
   int arg = 0;
   Handle rt;                            // the return type from the signature
   for (SignatureStream ss(signature()); !ss.is_done(); ss.next()) {
@@ -2401,7 +2420,7 @@
                                                 methodHandle mh_invdyn,
                                                 TRAPS) {
   Handle empty;
-  // call sun.dyn.CallSiteImpl::makeSite(caller, name, mtype, cmid, cbci)
+  // call java.dyn.CallSite::makeSite(caller, name, mtype, cmid, cbci)
   oop name_str_oop = StringTable::intern(name(), CHECK_(empty)); // not a handle!
   JavaCallArguments args(Handle(THREAD, caller->java_mirror()));
   args.push_oop(name_str_oop);
@@ -2410,15 +2429,19 @@
   args.push_int(caller_bci);
   JavaValue result(T_OBJECT);
   JavaCalls::call_static(&result,
-                         SystemDictionary::CallSiteImpl_klass(),
+                         SystemDictionary::CallSite_klass(),
                          vmSymbols::makeSite_name(), vmSymbols::makeSite_signature(),
                          &args, CHECK_(empty));
   oop call_site_oop = (oop) result.get_jobject();
-  sun_dyn_CallSiteImpl::set_vmmethod(call_site_oop, mh_invdyn());
+  assert(call_site_oop->is_oop()
+         /*&& java_dyn_CallSite::is_instance(call_site_oop)*/, "must be sane");
+  java_dyn_CallSite::set_vmmethod(call_site_oop, mh_invdyn());
   if (TraceMethodHandles) {
+#ifndef PRODUCT
     tty->print_cr("Linked invokedynamic bci=%d site="INTPTR_FORMAT":", caller_bci, call_site_oop);
     call_site_oop->print();
     tty->cr();
+#endif //PRODUCT
   }
   return call_site_oop;
 }
@@ -2431,9 +2454,17 @@
 
   instanceKlassHandle ik(THREAD, caller());
 
-  if (ik->bootstrap_method() != NULL) {
-    return Handle(THREAD, ik->bootstrap_method());
+  oop boot_method_oop = ik->bootstrap_method();
+  if (boot_method_oop != NULL) {
+    if (TraceMethodHandles) {
+      tty->print_cr("bootstrap method for "PTR_FORMAT" cached as "PTR_FORMAT":", ik(), boot_method_oop);
+    }
+    NOT_PRODUCT(if (!boot_method_oop->is_oop()) { tty->print_cr("*** boot MH of "PTR_FORMAT" = "PTR_FORMAT, ik(), boot_method_oop); ik()->print(); });
+    assert(boot_method_oop->is_oop()
+           && java_dyn_MethodHandle::is_instance(boot_method_oop), "must be sane");
+    return Handle(THREAD, boot_method_oop);
   }
+  boot_method_oop = NULL;  // GC safety
 
   // call java.dyn.Linkage::findBootstrapMethod(caller, sbk)
   JavaCallArguments args(Handle(THREAD, ik->java_mirror()));
@@ -2447,15 +2478,34 @@
                          vmSymbols::findBootstrapMethod_name(),
                          vmSymbols::findBootstrapMethod_signature(),
                          &args, CHECK_(empty));
-  oop boot_method_oop = (oop) result.get_jobject();
+  boot_method_oop = (oop) result.get_jobject();
 
   if (boot_method_oop != NULL) {
+    if (TraceMethodHandles) {
+#ifndef PRODUCT
+      tty->print_cr("--------");
+      tty->print_cr("bootstrap method for "PTR_FORMAT" computed as "PTR_FORMAT":", ik(), boot_method_oop);
+      ik()->print();
+      boot_method_oop->print();
+      tty->print_cr("========");
+#endif //PRODUCT
+    }
+    assert(boot_method_oop->is_oop()
+           && java_dyn_MethodHandle::is_instance(boot_method_oop), "must be sane");
     // probably no race conditions, but let's be careful:
     if (Atomic::cmpxchg_ptr(boot_method_oop, ik->adr_bootstrap_method(), NULL) == NULL)
       ik->set_bootstrap_method(boot_method_oop);
     else
       boot_method_oop = ik->bootstrap_method();
   } else {
+    if (TraceMethodHandles) {
+#ifndef PRODUCT
+      tty->print_cr("--------");
+      tty->print_cr("bootstrap method for "PTR_FORMAT" computed as NULL:", ik());
+      ik()->print();
+      tty->print_cr("========");
+#endif //PRODUCT
+    }
     boot_method_oop = ik->bootstrap_method();
   }
 
@@ -2523,7 +2573,7 @@
 
   // Verify constraint table
   guarantee(constraints() != NULL, "Verify of loader constraints failed");
-  constraints()->verify(dictionary());
+  constraints()->verify(dictionary(), placeholders());
 }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/systemDictionary.hpp
--- a/src/share/vm/classfile/systemDictionary.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/systemDictionary.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -82,55 +82,55 @@
 
 #define WK_KLASSES_DO(template)                                               \
   /* well-known classes */                                                    \
-  template(object_klass,                 java_lang_Object,               Pre) \
-  template(string_klass,                 java_lang_String,               Pre) \
-  template(class_klass,                  java_lang_Class,                Pre) \
-  template(cloneable_klass,              java_lang_Cloneable,            Pre) \
-  template(classloader_klass,            java_lang_ClassLoader,          Pre) \
-  template(serializable_klass,           java_io_Serializable,           Pre) \
-  template(system_klass,                 java_lang_System,               Pre) \
-  template(throwable_klass,              java_lang_Throwable,            Pre) \
-  template(error_klass,                  java_lang_Error,                Pre) \
-  template(threaddeath_klass,            java_lang_ThreadDeath,          Pre) \
-  template(exception_klass,              java_lang_Exception,            Pre) \
-  template(runtime_exception_klass,      java_lang_RuntimeException,     Pre) \
-  template(protectionDomain_klass,       java_security_ProtectionDomain, Pre) \
+  template(Object_klass,                 java_lang_Object,               Pre) \
+  template(String_klass,                 java_lang_String,               Pre) \
+  template(Class_klass,                  java_lang_Class,                Pre) \
+  template(Cloneable_klass,              java_lang_Cloneable,            Pre) \
+  template(ClassLoader_klass,            java_lang_ClassLoader,          Pre) \
+  template(Serializable_klass,           java_io_Serializable,           Pre) \
+  template(System_klass,                 java_lang_System,               Pre) \
+  template(Throwable_klass,              java_lang_Throwable,            Pre) \
+  template(Error_klass,                  java_lang_Error,                Pre) \
+  template(ThreadDeath_klass,            java_lang_ThreadDeath,          Pre) \
+  template(Exception_klass,              java_lang_Exception,            Pre) \
+  template(RuntimeException_klass,       java_lang_RuntimeException,     Pre) \
+  template(ProtectionDomain_klass,       java_security_ProtectionDomain, Pre) \
   template(AccessControlContext_klass,   java_security_AccessControlContext, Pre) \
-  template(classNotFoundException_klass, java_lang_ClassNotFoundException, Pre) \
-  template(noClassDefFoundError_klass,   java_lang_NoClassDefFoundError, Pre) \
-  template(linkageError_klass,           java_lang_LinkageError,         Pre) \
+  template(ClassNotFoundException_klass, java_lang_ClassNotFoundException, Pre) \
+  template(NoClassDefFoundError_klass,   java_lang_NoClassDefFoundError, Pre) \
+  template(LinkageError_klass,           java_lang_LinkageError,         Pre) \
   template(ClassCastException_klass,     java_lang_ClassCastException,   Pre) \
   template(ArrayStoreException_klass,    java_lang_ArrayStoreException,  Pre) \
-  template(virtualMachineError_klass,    java_lang_VirtualMachineError,  Pre) \
+  template(VirtualMachineError_klass,    java_lang_VirtualMachineError,  Pre) \
   template(OutOfMemoryError_klass,       java_lang_OutOfMemoryError,     Pre) \
   template(StackOverflowError_klass,     java_lang_StackOverflowError,   Pre) \
   template(IllegalMonitorStateException_klass, java_lang_IllegalMonitorStateException, Pre) \
-  template(reference_klass,              java_lang_ref_Reference,        Pre) \
+  template(Reference_klass,              java_lang_ref_Reference,        Pre) \
                                                                               \
   /* Preload ref klasses and set reference types */                           \
-  template(soft_reference_klass,         java_lang_ref_SoftReference,    Pre) \
-  template(weak_reference_klass,         java_lang_ref_WeakReference,    Pre) \
-  template(final_reference_klass,        java_lang_ref_FinalReference,   Pre) \
-  template(phantom_reference_klass,      java_lang_ref_PhantomReference, Pre) \
-  template(finalizer_klass,              java_lang_ref_Finalizer,        Pre) \
+  template(SoftReference_klass,          java_lang_ref_SoftReference,    Pre) \
+  template(WeakReference_klass,          java_lang_ref_WeakReference,    Pre) \
+  template(FinalReference_klass,         java_lang_ref_FinalReference,   Pre) \
+  template(PhantomReference_klass,       java_lang_ref_PhantomReference, Pre) \
+  template(Finalizer_klass,              java_lang_ref_Finalizer,        Pre) \
                                                                               \
-  template(thread_klass,                 java_lang_Thread,               Pre) \
-  template(threadGroup_klass,            java_lang_ThreadGroup,          Pre) \
-  template(properties_klass,             java_util_Properties,           Pre) \
-  template(reflect_accessible_object_klass, java_lang_reflect_AccessibleObject, Pre) \
-  template(reflect_field_klass,          java_lang_reflect_Field,        Pre) \
-  template(reflect_method_klass,         java_lang_reflect_Method,       Pre) \
-  template(reflect_constructor_klass,    java_lang_reflect_Constructor,  Pre) \
+  template(Thread_klass,                 java_lang_Thread,               Pre) \
+  template(ThreadGroup_klass,            java_lang_ThreadGroup,          Pre) \
+  template(Properties_klass,             java_util_Properties,           Pre) \
+  template(reflect_AccessibleObject_klass, java_lang_reflect_AccessibleObject, Pre) \
+  template(reflect_Field_klass,          java_lang_reflect_Field,        Pre) \
+  template(reflect_Method_klass,         java_lang_reflect_Method,       Pre) \
+  template(reflect_Constructor_klass,    java_lang_reflect_Constructor,  Pre) \
                                                                               \
   /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \
   /* Universe::is_gte_jdk14x_version() is not set up by this point. */        \
   /* It's okay if this turns out to be NULL in non-1.4 JDKs. */               \
-  template(reflect_magic_klass,          sun_reflect_MagicAccessorImpl,  Opt) \
-  template(reflect_method_accessor_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \
-  template(reflect_constructor_accessor_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \
-  template(reflect_delegating_classloader_klass, sun_reflect_DelegatingClassLoader, Opt) \
-  template(reflect_constant_pool_klass,  sun_reflect_ConstantPool,       Opt_Only_JDK15) \
-  template(reflect_unsafe_static_field_accessor_impl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \
+  template(reflect_MagicAccessorImpl_klass,          sun_reflect_MagicAccessorImpl,  Opt) \
+  template(reflect_MethodAccessorImpl_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \
+  template(reflect_ConstructorAccessorImpl_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \
+  template(reflect_DelegatingClassLoader_klass, sun_reflect_DelegatingClassLoader, Opt) \
+  template(reflect_ConstantPool_klass,  sun_reflect_ConstantPool,       Opt_Only_JDK15) \
+  template(reflect_UnsafeStaticFieldAccessorImpl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \
                                                                               \
   /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \
   template(MethodHandle_klass,           java_dyn_MethodHandle,          Opt) \
@@ -144,16 +144,14 @@
   template(WrongMethodTypeException_klass, java_dyn_WrongMethodTypeException, Opt) \
   template(Linkage_klass,                java_dyn_Linkage,               Opt) \
   template(CallSite_klass,               java_dyn_CallSite,              Opt) \
-  template(CallSiteImpl_klass,           sun_dyn_CallSiteImpl,     Opt) \
-  template(Dynamic_klass,                java_dyn_Dynamic,               Opt) \
-  /* Note: MethodHandle must be first, and Dynamic last in group */           \
+  template(InvokeDynamic_klass,          java_dyn_InvokeDynamic,         Opt) \
+  /* Note: MethodHandle must be first, and InvokeDynamic last in group */     \
                                                                               \
-  template(vector_klass,                 java_util_Vector,               Pre) \
-  template(hashtable_klass,              java_util_Hashtable,            Pre) \
-  template(stringBuffer_klass,           java_lang_StringBuffer,         Pre) \
+  template(StringBuffer_klass,           java_lang_StringBuffer,         Pre) \
+  template(StringBuilder_klass,          java_lang_StringBuilder,        Pre) \
                                                                               \
   /* It's NULL in non-1.4 JDKs. */                                            \
-  template(stackTraceElement_klass,      java_lang_StackTraceElement,    Opt) \
+  template(StackTraceElement_klass,      java_lang_StackTraceElement,    Opt) \
   /* Universe::is_gte_jdk14x_version() is not set up by this point. */        \
   /* It's okay if this turns out to be NULL in non-1.4 JDKs. */               \
   template(java_nio_Buffer_klass,        java_nio_Buffer,                Opt) \
@@ -164,14 +162,14 @@
   template(sun_jkernel_DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \
                                                                               \
   /* Preload boxing klasses */                                                \
-  template(boolean_klass,                java_lang_Boolean,              Pre) \
-  template(char_klass,                   java_lang_Character,            Pre) \
-  template(float_klass,                  java_lang_Float,                Pre) \
-  template(double_klass,                 java_lang_Double,               Pre) \
-  template(byte_klass,                   java_lang_Byte,                 Pre) \
-  template(short_klass,                  java_lang_Short,                Pre) \
-  template(int_klass,                    java_lang_Integer,              Pre) \
-  template(long_klass,                   java_lang_Long,                 Pre) \
+  template(Boolean_klass,                java_lang_Boolean,              Pre) \
+  template(Character_klass,              java_lang_Character,            Pre) \
+  template(Float_klass,                  java_lang_Float,                Pre) \
+  template(Double_klass,                 java_lang_Double,               Pre) \
+  template(Byte_klass,                   java_lang_Byte,                 Pre) \
+  template(Short_klass,                  java_lang_Short,                Pre) \
+  template(Integer_klass,                java_lang_Integer,              Pre) \
+  template(Long_klass,                   java_lang_Long,                 Pre) \
   /*end*/
 
 
@@ -259,7 +257,9 @@
                                TRAPS);
 
   // Resolve from stream (called by jni_DefineClass and JVM_DefineClass)
-  static klassOop resolve_from_stream(symbolHandle class_name, Handle class_loader, Handle protection_domain, ClassFileStream* st, TRAPS);
+  static klassOop resolve_from_stream(symbolHandle class_name, Handle class_loader,
+                                      Handle protection_domain,
+                                      ClassFileStream* st, bool verify, TRAPS);
 
   // Lookup an already loaded class. If not found NULL is returned.
   static klassOop find(symbolHandle class_name, Handle class_loader, Handle protection_domain, TRAPS);
@@ -436,8 +436,8 @@
   // Tells whether ClassLoader.checkPackageAccess is present
   static bool has_checkPackageAccess()      { return _has_checkPackageAccess; }
 
-  static bool class_klass_loaded()          { return WK_KLASS(class_klass) != NULL; }
-  static bool cloneable_klass_loaded()      { return WK_KLASS(cloneable_klass) != NULL; }
+  static bool Class_klass_loaded()          { return WK_KLASS(Class_klass) != NULL; }
+  static bool Cloneable_klass_loaded()      { return WK_KLASS(Cloneable_klass) != NULL; }
 
   // Returns default system loader
   static oop java_system_loader();
@@ -576,6 +576,7 @@
   static Handle compute_loader_lock_object(Handle class_loader, TRAPS);
   static void check_loader_lock_contention(Handle loader_lock, TRAPS);
   static bool is_parallelCapable(Handle class_loader);
+  static bool is_parallelDefine(Handle class_loader);
 
   static klassOop find_shared_class(symbolHandle class_name);
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/verifier.cpp
--- a/src/share/vm/classfile/verifier.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/verifier.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -53,8 +53,8 @@
 
 // Methods in Verifier
 
-bool Verifier::should_verify_for(oop class_loader) {
-  return class_loader == NULL ?
+bool Verifier::should_verify_for(oop class_loader, bool should_verify_class) {
+  return (class_loader == NULL || !should_verify_class) ?
     BytecodeVerificationLocal : BytecodeVerificationRemote;
 }
 
@@ -68,7 +68,7 @@
   return !need_verify;
 }
 
-bool Verifier::verify(instanceKlassHandle klass, Verifier::Mode mode, TRAPS) {
+bool Verifier::verify(instanceKlassHandle klass, Verifier::Mode mode, bool should_verify_class, TRAPS) {
   ResourceMark rm(THREAD);
   HandleMark hm;
 
@@ -81,7 +81,7 @@
   // If the class should be verified, first see if we can use the split
   // verifier.  If not, or if verification fails and FailOverToOldVerifier
   // is set, then call the inference verifier.
-  if (is_eligible_for_verification(klass)) {
+  if (is_eligible_for_verification(klass, should_verify_class)) {
     if (TraceClassInitialization) {
       tty->print_cr("Start class verification for: %s", klassName);
     }
@@ -141,12 +141,13 @@
   }
 }
 
-bool Verifier::is_eligible_for_verification(instanceKlassHandle klass) {
+bool Verifier::is_eligible_for_verification(instanceKlassHandle klass, bool should_verify_class) {
   symbolOop name = klass->name();
-  klassOop refl_magic_klass = SystemDictionary::reflect_magic_klass();
+  klassOop refl_magic_klass = SystemDictionary::reflect_MagicAccessorImpl_klass();
 
-  return (should_verify_for(klass->class_loader()) &&
+  return (should_verify_for(klass->class_loader(), should_verify_class) &&
     // return if the class is a bootstrapping class
+    // or defineClass specified not to verify by default (flags override passed arg)
     // We need to skip the following four for bootstraping
     name != vmSymbols::java_lang_Object() &&
     name != vmSymbols::java_lang_Class() &&
@@ -1902,17 +1903,8 @@
   verify_cp_type(index, cp, types, CHECK_VERIFY(this));
 
   // Get method name and signature
-  symbolHandle method_name;
-  symbolHandle method_sig;
-  if (opcode == Bytecodes::_invokedynamic) {
-    int name_index = cp->name_ref_index_at(index);
-    int sig_index  = cp->signature_ref_index_at(index);
-    method_name = symbolHandle(THREAD, cp->symbol_at(name_index));
-    method_sig  = symbolHandle(THREAD, cp->symbol_at(sig_index));
-  } else {
-    method_name = symbolHandle(THREAD, cp->name_ref_at(index));
-    method_sig  = symbolHandle(THREAD, cp->signature_ref_at(index));
-  }
+  symbolHandle method_name(THREAD, cp->name_ref_at(index));
+  symbolHandle method_sig(THREAD, cp->signature_ref_at(index));
 
   if (!SignatureVerifier::is_valid_method_signature(method_sig)) {
     class_format_error(
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/verifier.hpp
--- a/src/share/vm/classfile/verifier.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/verifier.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -34,16 +34,18 @@
    * Otherwise, no exception is thrown and the return indicates the
    * error.
    */
-  static bool verify(instanceKlassHandle klass, Mode mode, TRAPS);
+  static bool verify(instanceKlassHandle klass, Mode mode, bool should_verify_class, TRAPS);
 
-  // Return false if the class is loaded by the bootstrap loader.
-  static bool should_verify_for(oop class_loader);
+  // Return false if the class is loaded by the bootstrap loader,
+  // or if defineClass was called requesting skipping verification
+  // -Xverify:all/none override this value
+  static bool should_verify_for(oop class_loader, bool should_verify_class);
 
   // Relax certain verifier checks to enable some broken 1.1 apps to run on 1.2.
   static bool relax_verify_for(oop class_loader);
 
  private:
-  static bool is_eligible_for_verification(instanceKlassHandle klass);
+  static bool is_eligible_for_verification(instanceKlassHandle klass, bool should_verify_class);
   static symbolHandle inference_verify(
     instanceKlassHandle klass, char* msg, size_t msg_len, TRAPS);
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/vmSymbols.cpp
--- a/src/share/vm/classfile/vmSymbols.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/vmSymbols.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -70,6 +70,7 @@
 void vmSymbols::initialize(TRAPS) {
   assert((int)SID_LIMIT <= (1<<log2_SID_LIMIT), "must fit in this bitfield");
   assert((int)SID_LIMIT*5 > (1<<log2_SID_LIMIT), "make the bitfield smaller, please");
+  assert(vmIntrinsics::FLAG_LIMIT <= (1 << vmIntrinsics::log2_FLAG_LIMIT), "must fit in this bitfield");
 
   if (!UseSharedSpaces) {
     const char* string = &vm_symbol_bodies[0];
@@ -271,6 +272,58 @@
   return sid;
 }
 
+static vmIntrinsics::ID wrapper_intrinsic(BasicType type, bool unboxing) {
+#define TYPE2(type, unboxing) ((int)(type)*2 + ((unboxing) ? 1 : 0))
+  switch (TYPE2(type, unboxing)) {
+#define BASIC_TYPE_CASE(type, box, unbox) \
+    case TYPE2(type, false):  return vmIntrinsics::box; \
+    case TYPE2(type, true):   return vmIntrinsics::unbox
+    BASIC_TYPE_CASE(T_BOOLEAN, _Boolean_valueOf,   _booleanValue);
+    BASIC_TYPE_CASE(T_BYTE,    _Byte_valueOf,      _byteValue);
+    BASIC_TYPE_CASE(T_CHAR,    _Character_valueOf, _charValue);
+    BASIC_TYPE_CASE(T_SHORT,   _Short_valueOf,     _shortValue);
+    BASIC_TYPE_CASE(T_INT,     _Integer_valueOf,   _intValue);
+    BASIC_TYPE_CASE(T_LONG,    _Long_valueOf,      _longValue);
+    BASIC_TYPE_CASE(T_FLOAT,   _Float_valueOf,     _floatValue);
+    BASIC_TYPE_CASE(T_DOUBLE,  _Double_valueOf,    _doubleValue);
+#undef BASIC_TYPE_CASE
+  }
+#undef TYPE2
+  return vmIntrinsics::_none;
+}
+
+vmIntrinsics::ID vmIntrinsics::for_boxing(BasicType type) {
+  return wrapper_intrinsic(type, false);
+}
+vmIntrinsics::ID vmIntrinsics::for_unboxing(BasicType type) {
+  return wrapper_intrinsic(type, true);
+}
+
+vmIntrinsics::ID vmIntrinsics::for_raw_conversion(BasicType src, BasicType dest) {
+#define SRC_DEST(s,d) (((int)(s) << 4) + (int)(d))
+  switch (SRC_DEST(src, dest)) {
+  case SRC_DEST(T_INT, T_FLOAT):   return vmIntrinsics::_intBitsToFloat;
+  case SRC_DEST(T_FLOAT, T_INT):   return vmIntrinsics::_floatToRawIntBits;
+
+  case SRC_DEST(T_LONG, T_DOUBLE): return vmIntrinsics::_longBitsToDouble;
+  case SRC_DEST(T_DOUBLE, T_LONG): return vmIntrinsics::_doubleToRawLongBits;
+  }
+#undef SRC_DEST
+
+  return vmIntrinsics::_none;
+}
+
+methodOop vmIntrinsics::method_for(vmIntrinsics::ID id) {
+  if (id == _none)  return NULL;
+  symbolOop cname = vmSymbols::symbol_at(class_for(id));
+  symbolOop mname = vmSymbols::symbol_at(name_for(id));
+  symbolOop msig  = vmSymbols::symbol_at(signature_for(id));
+  if (cname == NULL || mname == NULL || msig == NULL)  return NULL;
+  klassOop k = SystemDictionary::find_well_known_klass(cname);
+  if (k == NULL)  return NULL;
+  return instanceKlass::cast(k)->find_method(mname, msig);
+}
+
 
 #define VM_INTRINSIC_INITIALIZE(id, klass, name, sig, flags) #id "\0"
 static const char* vm_intrinsic_name_bodies =
@@ -303,6 +356,11 @@
   const int neg = JVM_ACC_STATIC | JVM_ACC_SYNCHRONIZED;
   return (flags & (req | neg)) == req;
 }
+inline bool match_F_Y(jshort flags) {
+  const int req = JVM_ACC_SYNCHRONIZED;
+  const int neg = JVM_ACC_STATIC;
+  return (flags & (req | neg)) == req;
+}
 inline bool match_F_RN(jshort flags) {
   const int req = JVM_ACC_NATIVE;
   const int neg = JVM_ACC_STATIC | JVM_ACC_SYNCHRONIZED;
@@ -325,15 +383,15 @@
 }
 
 // These are for forming case labels:
-#define ID3(x, y, z) (( jint)(z) +                                  \
-                      ((jint)(y) <<    vmSymbols::log2_SID_LIMIT) + \
-                      ((jint)(x) << (2*vmSymbols::log2_SID_LIMIT))  )
+#define ID3(x, y, z) (( jlong)(z) +                                  \
+                      ((jlong)(y) <<    vmSymbols::log2_SID_LIMIT) + \
+                      ((jlong)(x) << (2*vmSymbols::log2_SID_LIMIT))  )
 #define SID_ENUM(n) vmSymbols::VM_SYMBOL_ENUM_NAME(n)
 
-vmIntrinsics::ID vmIntrinsics::find_id(vmSymbols::SID holder,
-                                       vmSymbols::SID name,
-                                       vmSymbols::SID sig,
-                                       jshort flags) {
+vmIntrinsics::ID vmIntrinsics::find_id_impl(vmSymbols::SID holder,
+                                            vmSymbols::SID name,
+                                            vmSymbols::SID sig,
+                                            jshort flags) {
   assert((int)vmSymbols::SID_LIMIT <= (1<<vmSymbols::log2_SID_LIMIT), "must fit");
 
   // Let the C compiler build the decision tree.
@@ -361,6 +419,7 @@
   const char* sname = vmSymbols::name_for(signature_for(id));
   const char* fname = "";
   switch (flags_for(id)) {
+  case F_Y:  fname = "synchronized ";  break;
   case F_RN: fname = "native ";        break;
   case F_SN: fname = "native static "; break;
   case F_S:  fname = "static ";        break;
@@ -377,62 +436,50 @@
 }
 
 
-// These are for friendly printouts of intrinsics:
+// These are to get information about intrinsics.
+
+#define ID4(x, y, z, f) ((ID3(x, y, z) << vmIntrinsics::log2_FLAG_LIMIT) | (jlong) (f))
+
+static const jlong intrinsic_info_array[vmIntrinsics::ID_LIMIT+1] = {
+#define VM_INTRINSIC_INFO(ignore_id, klass, name, sig, fcode) \
+  ID4(SID_ENUM(klass), SID_ENUM(name), SID_ENUM(sig), vmIntrinsics::fcode),
+
+  0, VM_INTRINSICS_DO(VM_INTRINSIC_INFO,
+                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE)
+    0
+#undef VM_INTRINSIC_INFO
+};
+
+inline jlong intrinsic_info(vmIntrinsics::ID id) {
+  return intrinsic_info_array[vmIntrinsics::ID_from((int)id)];
+}
 
 vmSymbols::SID vmIntrinsics::class_for(vmIntrinsics::ID id) {
-#ifndef PRODUCT
-#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
-  case id: return SID_ENUM(klass);
-
-  switch (id) {
-    VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
-                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
-  }
-#undef VM_INTRINSIC_CASE
-#endif //PRODUCT
-  return vmSymbols::NO_SID;
+  jlong info = intrinsic_info(id);
+  int shift = 2*vmSymbols::log2_SID_LIMIT + log2_FLAG_LIMIT, mask = right_n_bits(vmSymbols::log2_SID_LIMIT);
+  assert(((ID4(1021,1022,1023,15) >> shift) & mask) == 1021, "");
+  return vmSymbols::SID( (info >> shift) & mask );
 }
 
 vmSymbols::SID vmIntrinsics::name_for(vmIntrinsics::ID id) {
-#ifndef PRODUCT
-#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
-  case id: return SID_ENUM(name);
-
-  switch (id) {
-    VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
-                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
-  }
-#undef VM_INTRINSIC_CASE
-#endif //PRODUCT
-  return vmSymbols::NO_SID;
+  jlong info = intrinsic_info(id);
+  int shift = vmSymbols::log2_SID_LIMIT + log2_FLAG_LIMIT, mask = right_n_bits(vmSymbols::log2_SID_LIMIT);
+  assert(((ID4(1021,1022,1023,15) >> shift) & mask) == 1022, "");
+  return vmSymbols::SID( (info >> shift) & mask );
 }
 
 vmSymbols::SID vmIntrinsics::signature_for(vmIntrinsics::ID id) {
-#ifndef PRODUCT
-#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
-  case id: return SID_ENUM(sig);
-
-  switch (id) {
-    VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
-                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
-  }
-#undef VM_INTRINSIC_CASE
-#endif //PRODUCT
-  return vmSymbols::NO_SID;
+  jlong info = intrinsic_info(id);
+  int shift = log2_FLAG_LIMIT, mask = right_n_bits(vmSymbols::log2_SID_LIMIT);
+  assert(((ID4(1021,1022,1023,15) >> shift) & mask) == 1023, "");
+  return vmSymbols::SID( (info >> shift) & mask );
 }
 
 vmIntrinsics::Flags vmIntrinsics::flags_for(vmIntrinsics::ID id) {
-#ifndef PRODUCT
-#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
-  case id: return fcode;
-
-  switch (id) {
-    VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
-                     VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
-  }
-#undef VM_INTRINSIC_CASE
-#endif //PRODUCT
-  return F_none;
+  jlong info = intrinsic_info(id);
+  int shift = 0, mask = right_n_bits(log2_FLAG_LIMIT);
+  assert(((ID4(1021,1022,1023,15) >> shift) & mask) == 15, "");
+  return Flags( (info >> shift) & mask );
 }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/classfile/vmSymbols.hpp
--- a/src/share/vm/classfile/vmSymbols.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/classfile/vmSymbols.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -84,6 +84,7 @@
   template(java_lang_reflect_Field,                   "java/lang/reflect/Field")                  \
   template(java_lang_reflect_Array,                   "java/lang/reflect/Array")                  \
   template(java_lang_StringBuffer,                    "java/lang/StringBuffer")                   \
+  template(java_lang_StringBuilder,                   "java/lang/StringBuilder")                  \
   template(java_lang_CharSequence,                    "java/lang/CharSequence")                   \
   template(java_security_AccessControlContext,        "java/security/AccessControlContext")       \
   template(java_security_ProtectionDomain,            "java/security/ProtectionDomain")           \
@@ -104,6 +105,7 @@
   template(java_lang_AssertionStatusDirectives,       "java/lang/AssertionStatusDirectives")      \
   template(sun_jkernel_DownloadManager,               "sun/jkernel/DownloadManager")              \
   template(getBootClassPathEntryForClass_name,        "getBootClassPathEntryForClass")            \
+  template(setBootClassLoaderHook_name,               "setBootClassLoaderHook")                   \
                                                                                                   \
   /* class file format tags */                                                                    \
   template(tag_source_file,                           "SourceFile")                               \
@@ -217,7 +219,7 @@
   template(base_name,                                 "base")                                     \
                                                                                                   \
   /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */                                   \
-  template(java_dyn_Dynamic,                          "java/dyn/Dynamic")                         \
+  template(java_dyn_InvokeDynamic,                    "java/dyn/InvokeDynamic")                   \
   template(java_dyn_Linkage,                          "java/dyn/Linkage")                         \
   template(java_dyn_CallSite,                         "java/dyn/CallSite")                        \
   template(java_dyn_MethodHandle,                     "java/dyn/MethodHandle")                    \
@@ -233,10 +235,9 @@
   template(sun_dyn_AdapterMethodHandle,               "sun/dyn/AdapterMethodHandle")              \
   template(sun_dyn_BoundMethodHandle,                 "sun/dyn/BoundMethodHandle")                \
   template(sun_dyn_DirectMethodHandle,                "sun/dyn/DirectMethodHandle")               \
-  template(sun_dyn_CallSiteImpl,                      "sun/dyn/CallSiteImpl")                     \
   template(makeImpl_name,                             "makeImpl") /*MethodType::makeImpl*/        \
   template(makeImpl_signature,    "(Ljava/lang/Class;[Ljava/lang/Class;ZZ)Ljava/dyn/MethodType;") \
-  template(makeSite_name,                             "makeSite") /*CallSiteImpl::makeImpl*/       \
+  template(makeSite_name,                             "makeSite") /*CallSite::makeSite*/          \
   template(makeSite_signature,    "(Ljava/lang/Class;Ljava/lang/String;Ljava/dyn/MethodType;II)Ljava/dyn/CallSite;") \
   template(findBootstrapMethod_name,                  "findBootstrapMethod")                      \
   template(findBootstrapMethod_signature, "(Ljava/lang/Class;Ljava/lang/Class;)Ljava/dyn/MethodHandle;") \
@@ -335,6 +336,7 @@
   template(ptypes_name,                               "ptypes")                                   \
   template(form_name,                                 "form")                                     \
   template(erasedType_name,                           "erasedType")                               \
+  template(append_name,                               "append")                                   \
                                                                                                   \
   /* non-intrinsic name/signature pairs: */                                                       \
   template(register_method_name,                      "register")                                 \
@@ -345,9 +347,14 @@
                                                                                                   \
   /* common signatures names */                                                                   \
   template(void_method_signature,                     "()V")                                      \
+  template(void_boolean_signature,                    "()Z")                                      \
+  template(void_byte_signature,                       "()B")                                      \
+  template(void_char_signature,                       "()C")                                      \
+  template(void_short_signature,                      "()S")                                      \
   template(void_int_signature,                        "()I")                                      \
   template(void_long_signature,                       "()J")                                      \
-  template(void_boolean_signature,                    "()Z")                                      \
+  template(void_float_signature,                      "()F")                                      \
+  template(void_double_signature,                     "()D")                                      \
   template(int_void_signature,                        "(I)V")                                     \
   template(int_int_signature,                         "(I)I")                                     \
   template(int_bool_signature,                        "(I)Z")                                     \
@@ -416,6 +423,13 @@
   template(string_signature,                          "Ljava/lang/String;")                                       \
   template(reference_signature,                       "Ljava/lang/ref/Reference;")                                \
   template(concurrenthashmap_signature,               "Ljava/util/concurrent/ConcurrentHashMap;")                 \
+  template(String_StringBuilder_signature,            "(Ljava/lang/String;)Ljava/lang/StringBuilder;")            \
+  template(int_StringBuilder_signature,               "(I)Ljava/lang/StringBuilder;")                             \
+  template(char_StringBuilder_signature,              "(C)Ljava/lang/StringBuilder;")                             \
+  template(String_StringBuffer_signature,             "(Ljava/lang/String;)Ljava/lang/StringBuffer;")             \
+  template(int_StringBuffer_signature,                "(I)Ljava/lang/StringBuffer;")                              \
+  template(char_StringBuffer_signature,               "(C)Ljava/lang/StringBuffer;")                              \
+  template(int_String_signature,                      "(I)Ljava/lang/String;")                                    \
   /* signature symbols needed by intrinsics */                                                                    \
   VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, template, VM_ALIAS_IGNORE)            \
                                                                                                                   \
@@ -815,12 +829,76 @@
     /*the compiler does have special inlining code for these; bytecode inline is just fine */                           \
                                                                                                                         \
   do_intrinsic(_fillInStackTrace,         java_lang_Throwable, fillInStackTrace_name, void_throwable_signature,  F_RNY) \
-                                                                                                                        \
-  do_intrinsic(_Object_init,              java_lang_Object, object_initializer_name, void_method_signature,      F_R)   \
-  /*    (symbol object_initializer_name defined above) */                                                               \
-                                                                                                                        \
+                                                                                                                          \
+  do_intrinsic(_StringBuilder_void,   java_lang_StringBuilder, object_initializer_name, void_method_signature,     F_R)   \
+  do_intrinsic(_StringBuilder_int,    java_lang_StringBuilder, object_initializer_name, int_void_signature,        F_R)   \
+  do_intrinsic(_StringBuilder_String, java_lang_StringBuilder, object_initializer_name, string_void_signature,     F_R)   \
+                                                                                                                          \
+  do_intrinsic(_StringBuilder_append_char,   java_lang_StringBuilder, append_name, char_StringBuilder_signature,   F_R)   \
+  do_intrinsic(_StringBuilder_append_int,    java_lang_StringBuilder, append_name, int_StringBuilder_signature,    F_R)   \
+  do_intrinsic(_StringBuilder_append_String, java_lang_StringBuilder, append_name, String_StringBuilder_signature, F_R)   \
+                                                                                                                          \
+  do_intrinsic(_StringBuilder_toString, java_lang_StringBuilder, toString_name, void_string_signature,             F_R)   \
+                                                                                                                          \
+  do_intrinsic(_StringBuffer_void,   java_lang_StringBuffer, object_initializer_name, void_method_signature,       F_R)   \
+  do_intrinsic(_StringBuffer_int,    java_lang_StringBuffer, object_initializer_name, int_void_signature,          F_R)   \
+  do_intrinsic(_StringBuffer_String, java_lang_StringBuffer, object_initializer_name, string_void_signature,       F_R)   \
+                                                                                                                          \
+  do_intrinsic(_StringBuffer_append_char,   java_lang_StringBuffer, append_name, char_StringBuffer_signature,      F_Y)   \
+  do_intrinsic(_StringBuffer_append_int,    java_lang_StringBuffer, append_name, int_StringBuffer_signature,       F_Y)   \
+  do_intrinsic(_StringBuffer_append_String, java_lang_StringBuffer, append_name, String_StringBuffer_signature,    F_Y)   \
+                                                                                                                          \
+  do_intrinsic(_StringBuffer_toString,  java_lang_StringBuffer, toString_name, void_string_signature,              F_Y)   \
+                                                                                                                          \
+  do_intrinsic(_Integer_toString,      java_lang_Integer, toString_name, int_String_signature,                     F_S)   \
+                                                                                                                          \
+  do_intrinsic(_String_String, java_lang_String, object_initializer_name, string_void_signature,                   F_R)   \
+                                                                                                                          \
+  do_intrinsic(_Object_init,              java_lang_Object, object_initializer_name, void_method_signature,        F_R)   \
+  /*    (symbol object_initializer_name defined above) */                                                                 \
+                                                                                                                          \
   do_intrinsic(_invoke,                   java_lang_reflect_Method, invoke_name, object_array_object_object_signature, F_R) \
   /*   (symbols invoke_name and invoke_signature defined above) */                                                      \
+  do_intrinsic(_checkSpreadArgument,      sun_dyn_MethodHandleImpl, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) \
+   do_name(    checkSpreadArgument_name,       "checkSpreadArgument")                                                   \
+   do_name(    checkSpreadArgument_signature,  "(Ljava/lang/Object;I)V")                                                \
+                                                                                                                        \
+  /* unboxing methods: */                                                                                               \
+  do_intrinsic(_booleanValue,             java_lang_Boolean,      booleanValue_name, void_boolean_signature, F_R)       \
+   do_name(     booleanValue_name,       "booleanValue")                                                                \
+  do_intrinsic(_byteValue,                java_lang_Byte,         byteValue_name, void_byte_signature, F_R)             \
+   do_name(     byteValue_name,          "byteValue")                                                                   \
+  do_intrinsic(_charValue,                java_lang_Character,    charValue_name, void_char_signature, F_R)             \
+   do_name(     charValue_name,          "charValue")                                                                   \
+  do_intrinsic(_shortValue,               java_lang_Short,        shortValue_name, void_short_signature, F_R)           \
+   do_name(     shortValue_name,         "shortValue")                                                                  \
+  do_intrinsic(_intValue,                 java_lang_Integer,      intValue_name, void_int_signature, F_R)               \
+   do_name(     intValue_name,           "intValue")                                                                    \
+  do_intrinsic(_longValue,                java_lang_Long,         longValue_name, void_long_signature, F_R)             \
+   do_name(     longValue_name,          "longValue")                                                                   \
+  do_intrinsic(_floatValue,               java_lang_Float,        floatValue_name, void_float_signature, F_R)           \
+   do_name(     floatValue_name,         "floatValue")                                                                  \
+  do_intrinsic(_doubleValue,              java_lang_Double,       doubleValue_name, void_double_signature, F_R)         \
+   do_name(     doubleValue_name,        "doubleValue")                                                                 \
+                                                                                                                        \
+  /* boxing methods: */                                                                                                 \
+   do_name(    valueOf_name,              "valueOf")                                                                    \
+  do_intrinsic(_Boolean_valueOf,          java_lang_Boolean,      valueOf_name, Boolean_valueOf_signature, F_S)         \
+   do_name(     Boolean_valueOf_signature,                       "(Z)Ljava/lang/Boolean;")                              \
+  do_intrinsic(_Byte_valueOf,             java_lang_Byte,         valueOf_name, Byte_valueOf_signature, F_S)            \
+   do_name(     Byte_valueOf_signature,                          "(B)Ljava/lang/Byte;")                                 \
+  do_intrinsic(_Character_valueOf,        java_lang_Character,    valueOf_name, Character_valueOf_signature, F_S)       \
+   do_name(     Character_valueOf_signature,                     "(C)Ljava/lang/Character;")                            \
+  do_intrinsic(_Short_valueOf,            java_lang_Short,        valueOf_name, Short_valueOf_signature, F_S)           \
+   do_name(     Short_valueOf_signature,                         "(S)Ljava/lang/Short;")                                \
+  do_intrinsic(_Integer_valueOf,          java_lang_Integer,      valueOf_name, Integer_valueOf_signature, F_S)         \
+   do_name(     Integer_valueOf_signature,                       "(I)Ljava/lang/Integer;")                              \
+  do_intrinsic(_Long_valueOf,             java_lang_Long,         valueOf_name, Long_valueOf_signature, F_S)            \
+   do_name(     Long_valueOf_signature,                          "(J)Ljava/lang/Long;")                                 \
+  do_intrinsic(_Float_valueOf,            java_lang_Float,        valueOf_name, Float_valueOf_signature, F_S)           \
+   do_name(     Float_valueOf_signature,                         "(F)Ljava/lang/Float;")                                \
+  do_intrinsic(_Double_valueOf,           java_lang_Double,       valueOf_name, Double_valueOf_signature, F_S)          \
+   do_name(     Double_valueOf_signature,                        "(D)Ljava/lang/Double;")                               \
                                                                                                                         \
     /*end*/
 
@@ -946,11 +1024,17 @@
   enum Flags {
     // AccessFlags syndromes relevant to intrinsics.
     F_none = 0,
-    F_R,                        // !static        !synchronized (R="regular")
-    F_S,                        //  static        !synchronized
-    F_RN,                       // !static native !synchronized
-    F_SN,                       //  static native !synchronized
-    F_RNY                       // !static native  synchronized
+    F_R,                        // !static ?native !synchronized (R="regular")
+    F_S,                        //  static ?native !synchronized
+    F_Y,                        // !static ?native  synchronized
+    F_RN,                       // !static  native !synchronized
+    F_SN,                       //  static  native !synchronized
+    F_RNY,                      // !static  native  synchronized
+
+    FLAG_LIMIT
+  };
+  enum {
+    log2_FLAG_LIMIT = 4         // checked by an assert at start-up
   };
 
 public:
@@ -962,15 +1046,32 @@
 
   static const char* name_at(ID id);
 
+private:
+  static ID find_id_impl(vmSymbols::SID holder,
+                         vmSymbols::SID name,
+                         vmSymbols::SID sig,
+                         jshort flags);
+
+public:
   // Given a method's class, name, signature, and access flags, report its ID.
   static ID find_id(vmSymbols::SID holder,
                     vmSymbols::SID name,
                     vmSymbols::SID sig,
-                    jshort flags);
+                    jshort flags) {
+    ID id = find_id_impl(holder, name, sig, flags);
+#ifdef ASSERT
+    // ID _none does not hold the following asserts.
+    if (id == _none)  return id;
+#endif
+    assert(    class_for(id) == holder, "correct id");
+    assert(     name_for(id) == name,   "correct id");
+    assert(signature_for(id) == sig,    "correct id");
+    return id;
+  }
 
   static void verify_method(ID actual_id, methodOop m) PRODUCT_RETURN;
 
-  // No need for these in the product:
+  // Find out the symbols behind an intrinsic:
   static vmSymbols::SID     class_for(ID id);
   static vmSymbols::SID      name_for(ID id);
   static vmSymbols::SID signature_for(ID id);
@@ -980,4 +1081,11 @@
 
   // Access to intrinsic methods:
   static methodOop method_for(ID id);
+
+  // Wrapper object methods:
+  static ID for_boxing(BasicType type);
+  static ID for_unboxing(BasicType type);
+
+  // Raw conversion:
+  static ID for_raw_conversion(BasicType src, BasicType dest);
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/codeBlob.hpp
--- a/src/share/vm/code/codeBlob.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/codeBlob.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 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
@@ -102,6 +102,9 @@
   virtual bool is_compiled_by_c2() const         { return false; }
   virtual bool is_compiled_by_c1() const         { return false; }
 
+  // Casting
+  nmethod* as_nmethod_or_null()                  { return is_nmethod() ? (nmethod*) this : NULL; }
+
   // Boundaries
   address    header_begin() const                { return (address)    this; }
   address    header_end() const                  { return ((address)   this) + _header_size; };
@@ -175,6 +178,8 @@
                             OopClosure* keep_alive,
                             bool unloading_occurred);
   virtual void oops_do(OopClosure* f) = 0;
+  // (All CodeBlob subtypes other than NMethod currently have
+  // an empty oops_do() method.
 
   // OopMap for frame
   OopMapSet* oop_maps() const                    { return _oop_maps; }
@@ -199,7 +204,8 @@
   virtual void print_value_on(outputStream* st) const PRODUCT_RETURN;
 
   // Print the comment associated with offset on stream, if there is one
-  void print_block_comment(outputStream* stream, intptr_t offset) {
+  virtual void print_block_comment(outputStream* stream, address block_begin) {
+    intptr_t offset = (intptr_t)(block_begin - instructions_begin());
     _comments.print_block_comment(stream, offset);
   }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/codeCache.cpp
--- a/src/share/vm/code/codeCache.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/codeCache.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -95,6 +95,8 @@
 int CodeCache::_number_of_blobs = 0;
 int CodeCache::_number_of_nmethods_with_dependencies = 0;
 bool CodeCache::_needs_cache_clean = false;
+nmethod* CodeCache::_scavenge_root_nmethods = NULL;
+nmethod* CodeCache::_saved_nmethods = NULL;
 
 
 CodeBlob* CodeCache::first() {
@@ -148,10 +150,7 @@
     }
   }
   verify_if_often();
-  if (PrintCodeCache2) {        // Need to add a new flag
-      ResourceMark rm;
-      tty->print_cr("CodeCache allocation:  addr: " INTPTR_FORMAT ", size: 0x%x\n", cb, size);
-  }
+  print_trace("allocation", cb, size);
   return cb;
 }
 
@@ -159,10 +158,7 @@
   assert_locked_or_safepoint(CodeCache_lock);
   verify_if_often();
 
-  if (PrintCodeCache2) {        // Need to add a new flag
-      ResourceMark rm;
-      tty->print_cr("CodeCache free:  addr: " INTPTR_FORMAT ", size: 0x%x\n", cb, cb->size());
-  }
+  print_trace("free", cb);
   if (cb->is_nmethod() && ((nmethod *)cb)->has_dependencies()) {
     _number_of_nmethods_with_dependencies--;
   }
@@ -260,14 +256,227 @@
   }
 }
 
-void CodeCache::oops_do(OopClosure* f) {
+void CodeCache::blobs_do(CodeBlobClosure* f) {
   assert_locked_or_safepoint(CodeCache_lock);
   FOR_ALL_ALIVE_BLOBS(cb) {
-    cb->oops_do(f);
+    f->do_code_blob(cb);
+
+#ifdef ASSERT
+    if (cb->is_nmethod())
+      ((nmethod*)cb)->verify_scavenge_root_oops();
+#endif //ASSERT
   }
 }
 
+// Walk the list of methods which might contain non-perm oops.
+void CodeCache::scavenge_root_nmethods_do(CodeBlobClosure* f) {
+  assert_locked_or_safepoint(CodeCache_lock);
+  debug_only(mark_scavenge_root_nmethods());
+
+  for (nmethod* cur = scavenge_root_nmethods(); cur != NULL; cur = cur->scavenge_root_link()) {
+    debug_only(cur->clear_scavenge_root_marked());
+    assert(cur->scavenge_root_not_marked(), "");
+    assert(cur->on_scavenge_root_list(), "else shouldn't be on this list");
+
+    bool is_live = (!cur->is_zombie() && !cur->is_unloaded());
+#ifndef PRODUCT
+    if (TraceScavenge) {
+      cur->print_on(tty, is_live ? "scavenge root" : "dead scavenge root"); tty->cr();
+    }
+#endif //PRODUCT
+    if (is_live)
+      // Perform cur->oops_do(f), maybe just once per nmethod.
+      f->do_code_blob(cur);
+  }
+
+  // Check for stray marks.
+  debug_only(verify_perm_nmethods(NULL));
+}
+
+void CodeCache::add_scavenge_root_nmethod(nmethod* nm) {
+  assert_locked_or_safepoint(CodeCache_lock);
+  nm->set_on_scavenge_root_list();
+  nm->set_scavenge_root_link(_scavenge_root_nmethods);
+  set_scavenge_root_nmethods(nm);
+  print_trace("add_scavenge_root", nm);
+}
+
+void CodeCache::drop_scavenge_root_nmethod(nmethod* nm) {
+  assert_locked_or_safepoint(CodeCache_lock);
+  print_trace("drop_scavenge_root", nm);
+  nmethod* last = NULL;
+  nmethod* cur = scavenge_root_nmethods();
+  while (cur != NULL) {
+    nmethod* next = cur->scavenge_root_link();
+    if (cur == nm) {
+      if (last != NULL)
+            last->set_scavenge_root_link(next);
+      else  set_scavenge_root_nmethods(next);
+      nm->set_scavenge_root_link(NULL);
+      nm->clear_on_scavenge_root_list();
+      return;
+    }
+    last = cur;
+    cur = next;
+  }
+  assert(false, "should have been on list");
+}
+
+void CodeCache::prune_scavenge_root_nmethods() {
+  assert_locked_or_safepoint(CodeCache_lock);
+  debug_only(mark_scavenge_root_nmethods());
+
+  nmethod* last = NULL;
+  nmethod* cur = scavenge_root_nmethods();
+  while (cur != NULL) {
+    nmethod* next = cur->scavenge_root_link();
+    debug_only(cur->clear_scavenge_root_marked());
+    assert(cur->scavenge_root_not_marked(), "");
+    assert(cur->on_scavenge_root_list(), "else shouldn't be on this list");
+
+    if (!cur->is_zombie() && !cur->is_unloaded()
+        && cur->detect_scavenge_root_oops()) {
+      // Keep it.  Advance 'last' to prevent deletion.
+      last = cur;
+    } else {
+      // Prune it from the list, so we don't have to look at it any more.
+      print_trace("prune_scavenge_root", cur);
+      cur->set_scavenge_root_link(NULL);
+      cur->clear_on_scavenge_root_list();
+      if (last != NULL)
+            last->set_scavenge_root_link(next);
+      else  set_scavenge_root_nmethods(next);
+    }
+    cur = next;
+  }
+
+  // Check for stray marks.
+  debug_only(verify_perm_nmethods(NULL));
+}
+
+#ifndef PRODUCT
+void CodeCache::asserted_non_scavengable_nmethods_do(CodeBlobClosure* f) {
+  // While we are here, verify the integrity of the list.
+  mark_scavenge_root_nmethods();
+  for (nmethod* cur = scavenge_root_nmethods(); cur != NULL; cur = cur->scavenge_root_link()) {
+    assert(cur->on_scavenge_root_list(), "else shouldn't be on this list");
+    cur->clear_scavenge_root_marked();
+  }
+  verify_perm_nmethods(f);
+}
+
+// Temporarily mark nmethods that are claimed to be on the non-perm list.
+void CodeCache::mark_scavenge_root_nmethods() {
+  FOR_ALL_ALIVE_BLOBS(cb) {
+    if (cb->is_nmethod()) {
+      nmethod *nm = (nmethod*)cb;
+      assert(nm->scavenge_root_not_marked(), "clean state");
+      if (nm->on_scavenge_root_list())
+        nm->set_scavenge_root_marked();
+    }
+  }
+}
+
+// If the closure is given, run it on the unlisted nmethods.
+// Also make sure that the effects of mark_scavenge_root_nmethods is gone.
+void CodeCache::verify_perm_nmethods(CodeBlobClosure* f_or_null) {
+  FOR_ALL_ALIVE_BLOBS(cb) {
+    bool call_f = (f_or_null != NULL);
+    if (cb->is_nmethod()) {
+      nmethod *nm = (nmethod*)cb;
+      assert(nm->scavenge_root_not_marked(), "must be already processed");
+      if (nm->on_scavenge_root_list())
+        call_f = false;  // don't show this one to the client
+      nm->verify_scavenge_root_oops();
+    } else {
+      call_f = false;   // not an nmethod
+    }
+    if (call_f)  f_or_null->do_code_blob(cb);
+  }
+}
+#endif //PRODUCT
+
+
+nmethod* CodeCache::find_and_remove_saved_code(methodOop m) {
+  MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+  nmethod* saved = _saved_nmethods;
+  nmethod* prev = NULL;
+  while (saved != NULL) {
+    if (saved->is_in_use() && saved->method() == m) {
+      if (prev != NULL) {
+        prev->set_saved_nmethod_link(saved->saved_nmethod_link());
+      } else {
+        _saved_nmethods = saved->saved_nmethod_link();
+      }
+      assert(saved->is_speculatively_disconnected(), "shouldn't call for other nmethods");
+      saved->set_speculatively_disconnected(false);
+      saved->set_saved_nmethod_link(NULL);
+      if (PrintMethodFlushing) {
+        saved->print_on(tty, " ### nmethod is reconnected");
+      }
+      if (LogCompilation && (xtty != NULL)) {
+        ttyLocker ttyl;
+        xtty->begin_elem("nmethod_reconnected compile_id='%3d'", saved->compile_id());
+        xtty->method(methodOop(m));
+        xtty->stamp();
+        xtty->end_elem();
+      }
+      return saved;
+    }
+    prev = saved;
+    saved = saved->saved_nmethod_link();
+  }
+  return NULL;
+}
+
+void CodeCache::remove_saved_code(nmethod* nm) {
+  MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+  assert(nm->is_speculatively_disconnected(), "shouldn't call for other nmethods");
+  nmethod* saved = _saved_nmethods;
+  nmethod* prev = NULL;
+  while (saved != NULL) {
+    if (saved == nm) {
+      if (prev != NULL) {
+        prev->set_saved_nmethod_link(saved->saved_nmethod_link());
+      } else {
+        _saved_nmethods = saved->saved_nmethod_link();
+      }
+      if (LogCompilation && (xtty != NULL)) {
+        ttyLocker ttyl;
+        xtty->begin_elem("nmethod_removed compile_id='%3d'", nm->compile_id());
+        xtty->stamp();
+        xtty->end_elem();
+      }
+      return;
+    }
+    prev = saved;
+    saved = saved->saved_nmethod_link();
+  }
+  ShouldNotReachHere();
+}
+
+void CodeCache::speculatively_disconnect(nmethod* nm) {
+  assert_locked_or_safepoint(CodeCache_lock);
+  assert(nm->is_in_use() && !nm->is_speculatively_disconnected(), "should only disconnect live nmethods");
+  nm->set_saved_nmethod_link(_saved_nmethods);
+  _saved_nmethods = nm;
+  if (PrintMethodFlushing) {
+    nm->print_on(tty, " ### nmethod is speculatively disconnected");
+  }
+  if (LogCompilation && (xtty != NULL)) {
+    ttyLocker ttyl;
+    xtty->begin_elem("nmethod_disconnected compile_id='%3d'", nm->compile_id());
+    xtty->method(methodOop(nm->method()));
+    xtty->stamp();
+    xtty->end_elem();
+  }
+  nm->method()->clear_code();
+  nm->set_speculatively_disconnected(true);
+}
+
+
 void CodeCache::gc_prologue() {
+  assert(!nmethod::oops_do_marking_is_active(), "oops_do_marking_epilogue must be called");
 }
 
 
@@ -285,6 +494,8 @@
     cb->fix_oop_relocations();
   }
   set_needs_cache_clean(false);
+  prune_scavenge_root_nmethods();
+  assert(!nmethod::oops_do_marking_is_active(), "oops_do_marking_prologue must be called");
 }
 
 
@@ -508,6 +719,14 @@
   }
 }
 
+void CodeCache::print_trace(const char* event, CodeBlob* cb, int size) {
+  if (PrintCodeCache2) {  // Need to add a new flag
+    ResourceMark rm;
+    if (size == 0)  size = cb->size();
+    tty->print_cr("CodeCache %s:  addr: " INTPTR_FORMAT ", size: 0x%x", event, cb, size);
+  }
+}
+
 void CodeCache::print_internals() {
   int nmethodCount = 0;
   int runtimeStubCount = 0;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/codeCache.hpp
--- a/src/share/vm/code/codeCache.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/codeCache.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -45,8 +45,14 @@
   static int _number_of_blobs;
   static int _number_of_nmethods_with_dependencies;
   static bool _needs_cache_clean;
+  static nmethod* _scavenge_root_nmethods;  // linked via nm->scavenge_root_link()
+  static nmethod* _saved_nmethods;          // linked via nm->saved_nmethod_look()
 
   static void verify_if_often() PRODUCT_RETURN;
+
+  static void mark_scavenge_root_nmethods() PRODUCT_RETURN;
+  static void verify_perm_nmethods(CodeBlobClosure* f_or_null) PRODUCT_RETURN;
+
  public:
 
   // Initialization
@@ -61,6 +67,7 @@
   static void flush();                              // flushes all CodeBlobs
   static bool contains(void *p);                    // returns whether p is included
   static void blobs_do(void f(CodeBlob* cb));       // iterates over all CodeBlobs
+  static void blobs_do(CodeBlobClosure* f);         // iterates over all CodeBlobs
   static void nmethods_do(void f(nmethod* nm));     // iterates over all nmethods
 
   // Lookup
@@ -106,12 +113,24 @@
   static void do_unloading(BoolObjectClosure* is_alive,
                            OopClosure* keep_alive,
                            bool unloading_occurred);
-  static void oops_do(OopClosure* f);
+  static void oops_do(OopClosure* f) {
+    CodeBlobToOopClosure oopc(f, /*do_marking=*/ false);
+    blobs_do(&oopc);
+  }
+  static void asserted_non_scavengable_nmethods_do(CodeBlobClosure* f = NULL) PRODUCT_RETURN;
+  static void scavenge_root_nmethods_do(CodeBlobClosure* f);
+
+  static nmethod* scavenge_root_nmethods()          { return _scavenge_root_nmethods; }
+  static void set_scavenge_root_nmethods(nmethod* nm) { _scavenge_root_nmethods = nm; }
+  static void add_scavenge_root_nmethod(nmethod* nm);
+  static void drop_scavenge_root_nmethod(nmethod* nm);
+  static void prune_scavenge_root_nmethods();
 
   // Printing/debugging
   static void print()   PRODUCT_RETURN;          // prints summary
   static void print_internals();
   static void verify();                          // verifies the code cache
+  static void print_trace(const char* event, CodeBlob* cb, int size = 0) PRODUCT_RETURN;
 
   // The full limits of the codeCache
   static address  low_bound()                    { return (address) _heap->low_boundary(); }
@@ -123,11 +142,16 @@
   static size_t  capacity()                      { return _heap->capacity(); }
   static size_t  max_capacity()                  { return _heap->max_capacity(); }
   static size_t  unallocated_capacity()          { return _heap->unallocated_capacity(); }
+  static bool    needs_flushing()                { return unallocated_capacity() < CodeCacheFlushingMinimumFreeSpace; }
 
   static bool needs_cache_clean()                { return _needs_cache_clean; }
   static void set_needs_cache_clean(bool v)      { _needs_cache_clean = v;    }
   static void clear_inline_caches();             // clear all inline caches
 
+  static nmethod* find_and_remove_saved_code(methodOop m);
+  static void remove_saved_code(nmethod* nm);
+  static void speculatively_disconnect(nmethod* nm);
+
   // Deoptimization
   static int  mark_for_deoptimization(DepChange& changes);
 #ifdef HOTSWAP
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/debugInfo.hpp
--- a/src/share/vm/code/debugInfo.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/debugInfo.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -255,8 +255,7 @@
   ScopeValue* read_object_value();
   ScopeValue* get_cached_object();
   // BCI encoding is mostly unsigned, but -1 is a distinguished value
-  // Decoding based on encoding: bci = InvocationEntryBci + read_int()/2; reexecute = read_int()%2 == 1 ? true : false;
-  int read_bci_and_reexecute(bool& reexecute) { int i = read_int(); reexecute = (i & 1) ? true : false; return (i >> 1) + InvocationEntryBci; }
+  int read_bci() { return read_int() + InvocationEntryBci; }
 };
 
 // DebugInfoWriteStream specializes CompressedWriteStream for
@@ -269,6 +268,5 @@
  public:
   DebugInfoWriteStream(DebugInformationRecorder* recorder, int initial_size);
   void write_handle(jobject h);
-  //Encoding bci and reexecute into one word as (bci - InvocationEntryBci)*2 + reexecute
-  void write_bci_and_reexecute(int bci, bool reexecute) { write_int(((bci - InvocationEntryBci) << 1) + (reexecute ? 1 : 0)); }
+  void write_bci(int bci) { write_int(bci - InvocationEntryBci); }
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/debugInfoRec.cpp
--- a/src/share/vm/code/debugInfoRec.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/debugInfoRec.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 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
@@ -281,6 +281,8 @@
                                               ciMethod*   method,
                                               int         bci,
                                               bool        reexecute,
+                                              bool        is_method_handle_invoke,
+                                              bool        return_oop,
                                               DebugToken* locals,
                                               DebugToken* expressions,
                                               DebugToken* monitors) {
@@ -292,13 +294,18 @@
   int stream_offset = stream()->position();
   last_pd->set_scope_decode_offset(stream_offset);
 
+  // Record flags into pcDesc.
+  last_pd->set_should_reexecute(reexecute);
+  last_pd->set_is_method_handle_invoke(is_method_handle_invoke);
+  last_pd->set_return_oop(return_oop);
+
   // serialize sender stream offest
   stream()->write_int(sender_stream_offset);
 
   // serialize scope
-  jobject method_enc = (method == NULL)? NULL: method->encoding();
+  jobject method_enc = (method == NULL)? NULL: method->constant_encoding();
   stream()->write_int(oop_recorder()->find_index(method_enc));
-  stream()->write_bci_and_reexecute(bci, reexecute);
+  stream()->write_bci(bci);
   assert(method == NULL ||
          (method->is_native() && bci == 0) ||
          (!method->is_native() && 0 <= bci && bci < method->code_size()) ||
@@ -353,8 +360,7 @@
     // search forward until it finds last.
     // In addition, it does not matter if the last PcDesc
     // is for a safepoint or not.
-    if (_prev_safepoint_pc < prev->pc_offset() &&
-        prev->scope_decode_offset() == last->scope_decode_offset()) {
+    if (_prev_safepoint_pc < prev->pc_offset() && prev->is_same_info(last)) {
       assert(prev == last-1, "sane");
       prev->set_pc_offset(pc_offset);
       _pcs_length -= 1;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/debugInfoRec.hpp
--- a/src/share/vm/code/debugInfoRec.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/debugInfoRec.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 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
@@ -88,6 +88,8 @@
                       ciMethod*   method,
                       int         bci,
                       bool        reexecute,
+                      bool        is_method_handle_invoke = false,
+                      bool        return_oop = false,
                       DebugToken* locals      = NULL,
                       DebugToken* expressions = NULL,
                       DebugToken* monitors    = NULL);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/dependencies.cpp
--- a/src/share/vm/code/dependencies.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/dependencies.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -302,7 +302,7 @@
       bytes.write_byte(code_byte);
       for (int j = 0; j < stride; j++) {
         if (j == skipj)  continue;
-        bytes.write_int(_oop_recorder->find_index(deps->at(i+j)->encoding()));
+        bytes.write_int(_oop_recorder->find_index(deps->at(i+j)->constant_encoding()));
       }
     }
   }
@@ -843,13 +843,15 @@
     if (occasional_print || final_stats) {
       // Every now and then dump a little info about dependency searching.
       if (xtty != NULL) {
-        xtty->elem("deps_find_witness calls='%d' steps='%d' recursions='%d' singles='%d'",
+       ttyLocker ttyl;
+       xtty->elem("deps_find_witness calls='%d' steps='%d' recursions='%d' singles='%d'",
                    deps_find_witness_calls,
                    deps_find_witness_steps,
                    deps_find_witness_recursions,
                    deps_find_witness_singles);
       }
       if (final_stats || (TraceDependencies && WizardMode)) {
+        ttyLocker ttyl;
         tty->print_cr("Dependency check (find_witness) "
                       "calls=%d, steps=%d (avg=%.1f), recursions=%d, singles=%d",
                       deps_find_witness_calls,
@@ -1528,19 +1530,23 @@
   int nsup = 0, nint = 0;
   for (ContextStream str(*this); str.next(); ) {
     klassOop k = str.klass();
-    switch (str._change_type) {
+    switch (str.change_type()) {
     case Change_new_type:
       tty->print_cr("  dependee = %s", instanceKlass::cast(k)->external_name());
       break;
     case Change_new_sub:
-      if (!WizardMode)
-           ++nsup;
-      else tty->print_cr("  context super = %s", instanceKlass::cast(k)->external_name());
+      if (!WizardMode) {
+        ++nsup;
+      } else {
+        tty->print_cr("  context super = %s", instanceKlass::cast(k)->external_name());
+      }
       break;
     case Change_new_impl:
-      if (!WizardMode)
-           ++nint;
-      else tty->print_cr("  context interface = %s", instanceKlass::cast(k)->external_name());
+      if (!WizardMode) {
+        ++nint;
+      } else {
+        tty->print_cr("  context interface = %s", instanceKlass::cast(k)->external_name());
+      }
       break;
     }
   }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/dependencies.hpp
--- a/src/share/vm/code/dependencies.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/dependencies.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -470,7 +470,7 @@
 // super types can be context types for a relevant dependency, which the
 // new type could invalidate.
 class DepChange : public StackObj {
- private:
+ public:
   enum ChangeType {
     NO_CHANGE = 0,              // an uninvolved klass
     Change_new_type,            // a newly loaded type
@@ -480,6 +480,7 @@
     Start_Klass = CHANGE_LIMIT  // internal indicator for ContextStream
   };
 
+ private:
   // each change set is rooted in exactly one new type (at present):
   KlassHandle _new_type;
 
@@ -510,15 +511,15 @@
   // }
   class ContextStream : public StackObj {
    private:
-    DepChange&       _changes;
+    DepChange&  _changes;
     friend class DepChange;
 
     // iteration variables:
-    ChangeType            _change_type;
-    klassOop              _klass;
-    objArrayOop           _ti_base;    // i.e., transitive_interfaces
-    int                   _ti_index;
-    int                   _ti_limit;
+    ChangeType  _change_type;
+    klassOop    _klass;
+    objArrayOop _ti_base;    // i.e., transitive_interfaces
+    int         _ti_index;
+    int         _ti_limit;
 
     // start at the beginning:
     void start() {
@@ -530,11 +531,11 @@
       _ti_limit = 0;
     }
 
+   public:
     ContextStream(DepChange& changes)
       : _changes(changes)
     { start(); }
 
-   public:
     ContextStream(DepChange& changes, No_Safepoint_Verifier& nsv)
       : _changes(changes)
       // the nsv argument makes it safe to hold oops like _klass
@@ -542,6 +543,7 @@
 
     bool next();
 
+    ChangeType change_type()     { return _change_type; }
     klassOop   klass()           { return _klass; }
   };
   friend class DepChange::ContextStream;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/jvmticmlr.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/code/jvmticmlr.h	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * This header file defines the data structures sent by the VM
+ * through the JVMTI CompiledMethodLoad callback function via the
+ * "void * compile_info" parameter. The memory pointed to by the
+ * compile_info parameter may not be referenced after returning from
+ * the CompiledMethodLoad callback. These are VM implementation
+ * specific data structures that may evolve in future releases. A
+ * JVMTI agent should interpret a non-NULL compile_info as a pointer
+ * to a region of memory containing a list of records. In a typical
+ * usage scenario, a JVMTI agent would cast each record to a
+ * jvmtiCompiledMethodLoadRecordHeader, a struct that represents
+ * arbitrary information. This struct contains a kind field to indicate
+ * the kind of information being passed, and a pointer to the next
+ * record. If the kind field indicates inlining information, then the
+ * agent would cast the record to a jvmtiCompiledMethodLoadInlineRecord.
+ * This record contains an array of PCStackInfo structs, which indicate
+ * for every pc address what are the methods on the invocation stack.
+ * The "methods" and "bcis" fields in each PCStackInfo struct specify a
+ * 1-1 mapping between these inlined methods and their bytecode indices.
+ * This can be used to derive the proper source lines of the inlined
+ * methods.
+ */
+
+#ifndef _JVMTI_CMLR_H_
+#define _JVMTI_CMLR_H_
+
+enum {
+    JVMTI_CMLR_MAJOR_VERSION_1 = 0x00000001,
+    JVMTI_CMLR_MINOR_VERSION_0 = 0x00000000,
+
+    JVMTI_CMLR_MAJOR_VERSION   = 0x00000001,
+    JVMTI_CMLR_MINOR_VERSION   = 0x00000000
+
+    /*
+     * This comment is for the "JDK import from HotSpot" sanity check:
+     * version: 1.0.0
+     */
+};
+
+typedef enum {
+    JVMTI_CMLR_DUMMY       = 1,
+    JVMTI_CMLR_INLINE_INFO = 2
+} jvmtiCMLRKind;
+
+/*
+ * Record that represents arbitrary information passed through JVMTI
+ * CompiledMethodLoadEvent void pointer.
+ */
+typedef struct _jvmtiCompiledMethodLoadRecordHeader {
+  jvmtiCMLRKind kind;     /* id for the kind of info passed in the record */
+  jint majorinfoversion;  /* major and minor info version values. Init'ed */
+  jint minorinfoversion;  /* to current version value in jvmtiExport.cpp. */
+
+  struct _jvmtiCompiledMethodLoadRecordHeader* next;
+} jvmtiCompiledMethodLoadRecordHeader;
+
+/*
+ * Record that gives information about the methods on the compile-time
+ * stack at a specific pc address of a compiled method. Each element in
+ * the methods array maps to same element in the bcis array.
+ */
+typedef struct _PCStackInfo {
+  void* pc;             /* the pc address for this compiled method */
+  jint numstackframes;  /* number of methods on the stack */
+  jmethodID* methods;   /* array of numstackframes method ids */
+  jint* bcis;           /* array of numstackframes bytecode indices */
+} PCStackInfo;
+
+/*
+ * Record that contains inlining information for each pc address of
+ * an nmethod.
+ */
+typedef struct _jvmtiCompiledMethodLoadInlineRecord {
+  jvmtiCompiledMethodLoadRecordHeader header;  /* common header for casting */
+  jint numpcs;          /* number of pc descriptors in this nmethod */
+  PCStackInfo* pcinfo;  /* array of numpcs pc descriptors */
+} jvmtiCompiledMethodLoadInlineRecord;
+
+/*
+ * Dummy record used to test that we can pass records with different
+ * information through the void pointer provided that they can be cast
+ * to a jvmtiCompiledMethodLoadRecordHeader.
+ */
+
+typedef struct _jvmtiCompiledMethodLoadDummyRecord {
+  jvmtiCompiledMethodLoadRecordHeader header;  /* common header for casting */
+  char message[50];
+} jvmtiCompiledMethodLoadDummyRecord;
+
+#endif
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/nmethod.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -56,13 +56,13 @@
 #endif
 
 bool nmethod::is_compiled_by_c1() const {
+  if (compiler() == NULL || method() == NULL)  return false;  // can happen during debug printing
   if (is_native_method()) return false;
-  assert(compiler() != NULL, "must be");
   return compiler()->is_c1();
 }
 bool nmethod::is_compiled_by_c2() const {
+  if (compiler() == NULL || method() == NULL)  return false;  // can happen during debug printing
   if (is_native_method()) return false;
-  assert(compiler() != NULL, "must be");
   return compiler()->is_c2();
 }
 
@@ -414,9 +414,8 @@
 }
 
 const char* nmethod::compile_kind() const {
-  if (method() == NULL)    return "unloaded";
-  if (is_native_method())  return "c2n";
   if (is_osr_method())     return "osr";
+  if (method() != NULL && is_native_method())  return "c2n";
   return NULL;
 }
 
@@ -581,15 +580,20 @@
     debug_only(No_Safepoint_Verifier nsv;)
     assert_locked_or_safepoint(CodeCache_lock);
 
-    NOT_PRODUCT(_has_debug_info = false; )
+    NOT_PRODUCT(_has_debug_info = false);
+    _oops_do_mark_link       = NULL;
     _method                  = method;
     _entry_bci               = InvocationEntryBci;
-    _link                    = NULL;
+    _osr_link                = NULL;
+    _scavenge_root_link      = NULL;
+    _scavenge_root_state     = 0;
+    _saved_nmethod_link      = NULL;
     _compiler                = NULL;
     // We have no exception handler or deopt handler make the
     // values something that will never match a pc like the nmethod vtable entry
     _exception_offset        = 0;
     _deoptimize_offset       = 0;
+    _deoptimize_mh_offset    = 0;
     _orig_pc_offset          = 0;
 #ifdef HAVE_DTRACE_H
     _trap_offset             = 0;
@@ -618,7 +622,7 @@
     _stack_traversal_mark    = 0;
 
     code_buffer->copy_oops_to(this);
-    debug_only(check_store();)
+    debug_only(verify_scavenge_root_oops());
     CodeCache::commit(this);
     VTune::create_nmethod(this);
   }
@@ -668,15 +672,19 @@
     debug_only(No_Safepoint_Verifier nsv;)
     assert_locked_or_safepoint(CodeCache_lock);
 
-    NOT_PRODUCT(_has_debug_info = false; )
+    NOT_PRODUCT(_has_debug_info = false);
+    _oops_do_mark_link       = NULL;
     _method                  = method;
     _entry_bci               = InvocationEntryBci;
-    _link                    = NULL;
+    _osr_link                = NULL;
+    _scavenge_root_link      = NULL;
+    _scavenge_root_state     = 0;
     _compiler                = NULL;
     // We have no exception handler or deopt handler make the
     // values something that will never match a pc like the nmethod vtable entry
     _exception_offset        = 0;
     _deoptimize_offset       = 0;
+    _deoptimize_mh_offset    = 0;
     _trap_offset             = offsets->value(CodeOffsets::Dtrace_trap);
     _orig_pc_offset          = 0;
     _stub_offset             = data_offset();
@@ -703,7 +711,7 @@
     _stack_traversal_mark    = 0;
 
     code_buffer->copy_oops_to(this);
-    debug_only(check_store();)
+    debug_only(verify_scavenge_root_oops());
     CodeCache::commit(this);
     VTune::create_nmethod(this);
   }
@@ -770,12 +778,15 @@
     debug_only(No_Safepoint_Verifier nsv;)
     assert_locked_or_safepoint(CodeCache_lock);
 
-    NOT_PRODUCT(_has_debug_info = false; )
+    NOT_PRODUCT(_has_debug_info = false);
+    _oops_do_mark_link       = NULL;
     _method                  = method;
     _compile_id              = compile_id;
     _comp_level              = comp_level;
     _entry_bci               = entry_bci;
-    _link                    = NULL;
+    _osr_link                = NULL;
+    _scavenge_root_link      = NULL;
+    _scavenge_root_state     = 0;
     _compiler                = compiler;
     _orig_pc_offset          = orig_pc_offset;
 #ifdef HAVE_DTRACE_H
@@ -786,6 +797,7 @@
     // Exception handler and deopt handler are in the stub section
     _exception_offset        = _stub_offset + offsets->value(CodeOffsets::Exceptions);
     _deoptimize_offset       = _stub_offset + offsets->value(CodeOffsets::Deopt);
+    _deoptimize_mh_offset    = _stub_offset + offsets->value(CodeOffsets::DeoptMH);
     _consts_offset           = instructions_offset() + code_buffer->total_offset_of(code_buffer->consts()->start());
     _scopes_data_offset      = data_offset();
     _scopes_pcs_offset       = _scopes_data_offset   + round_to(debug_info->data_size         (), oopSize);
@@ -813,7 +825,10 @@
     code_buffer->copy_oops_to(this);
     debug_info->copy_to(this);
     dependencies->copy_to(this);
-    debug_only(check_store();)
+    if (ScavengeRootsInCode && detect_scavenge_root_oops()) {
+      CodeCache::add_scavenge_root_nmethod(this);
+    }
+    debug_only(verify_scavenge_root_oops());
 
     CodeCache::commit(this);
 
@@ -902,23 +917,30 @@
   if (st != NULL) {
     ttyLocker ttyl;
     // Print a little tag line that looks like +PrintCompilation output:
-    st->print("%3d%c  %s",
+    int tlen = (int) strlen(title);
+    bool do_nl = false;
+    if (tlen > 0 && title[tlen-1] == '\n') { tlen--; do_nl = true; }
+    st->print("%3d%c  %.*s",
               compile_id(),
               is_osr_method() ? '%' :
               method() != NULL &&
               is_native_method() ? 'n' : ' ',
-              title);
+              tlen, title);
 #ifdef TIERED
     st->print(" (%d) ", comp_level());
 #endif // TIERED
     if (WizardMode) st->print(" (" INTPTR_FORMAT ")", this);
-    if (method() != NULL) {
-      method()->print_short_name(st);
+    if (Universe::heap()->is_gc_active() && method() != NULL) {
+      st->print("(method)");
+    } else if (method() != NULL) {
+        method()->print_short_name(st);
       if (is_osr_method())
         st->print(" @ %d", osr_entry_bci());
       if (method()->code_size() > 0)
         st->print(" (%d bytes)", method()->code_size());
     }
+
+    if (do_nl)  st->cr();
   }
 }
 
@@ -966,7 +988,8 @@
   PcDesc* pd = pc_desc_at(pc);
   guarantee(pd != NULL, "scope must be present");
   return new ScopeDesc(this, pd->scope_decode_offset(),
-                       pd->obj_decode_offset());
+                       pd->obj_decode_offset(), pd->should_reexecute(),
+                       pd->return_oop());
 }
 
 
@@ -1015,7 +1038,7 @@
         if( cb != NULL && cb->is_nmethod() ) {
           nmethod* nm = (nmethod*)cb;
           // Clean inline caches pointing to both zombie and not_entrant methods
-          if (!nm->is_in_use()) ic->set_to_clean();
+          if (!nm->is_in_use() || (nm->method()->code() != nm)) ic->set_to_clean();
         }
         break;
       }
@@ -1025,7 +1048,7 @@
         if( cb != NULL && cb->is_nmethod() ) {
           nmethod* nm = (nmethod*)cb;
           // Clean inline caches pointing to both zombie and not_entrant methods
-          if (!nm->is_in_use()) csc->set_to_clean();
+          if (!nm->is_in_use() || (nm->method()->code() != nm)) csc->set_to_clean();
         }
         break;
       }
@@ -1033,6 +1056,7 @@
   }
 }
 
+// This is a private interface with the sweeper.
 void nmethod::mark_as_seen_on_stack() {
   assert(is_not_entrant(), "must be a non-entrant method");
   set_stack_traversal_mark(NMethodSweeper::traversal_count());
@@ -1077,7 +1101,12 @@
                   " unloadable], methodOop(" INTPTR_FORMAT
                   "), cause(" INTPTR_FORMAT ")",
                   this, (address)_method, (address)cause);
-    cause->klass()->print();
+    if (!Universe::heap()->is_gc_active())
+      cause->klass()->print();
+  }
+  // Unlink the osr method, so we do not look this up again
+  if (is_osr_method()) {
+    invalidate_osr_method();
   }
   // If _method is already NULL the methodOop is about to be unloaded,
   // so we don't have to break the cycle. Note that it is possible to
@@ -1089,7 +1118,6 @@
     if (_method->code() == this) {
       _method->clear_code(); // Break a cycle
     }
-    inc_decompile_count();     // Last chance to make a mark on the MDO
     _method = NULL;            // Clear the method of this dead nmethod
   }
   // Make the class unloaded - i.e., change state and notify sweeper
@@ -1102,17 +1130,19 @@
   }
   flags.state = unloaded;
 
+  // Log the unloading.
+  log_state_change();
+
   // The methodOop is gone at this point
   assert(_method == NULL, "Tautology");
 
-  set_link(NULL);
+  set_osr_link(NULL);
+  //set_scavenge_root_link(NULL); // done by prune_scavenge_root_nmethods
   NMethodSweeper::notify(this);
 }
 
 void nmethod::invalidate_osr_method() {
   assert(_entry_bci != InvocationEntryBci, "wrong kind of nmethod");
-  if (_entry_bci != InvalidOSREntryBci)
-    inc_decompile_count();
   // Remove from list of active nmethods
   if (method() != NULL)
     instanceKlass::cast(method()->method_holder())->remove_osr_nmethod(this);
@@ -1120,59 +1150,65 @@
   _entry_bci = InvalidOSREntryBci;
 }
 
-void nmethod::log_state_change(int state) const {
+void nmethod::log_state_change() const {
   if (LogCompilation) {
     if (xtty != NULL) {
       ttyLocker ttyl;  // keep the following output all in one block
-      xtty->begin_elem("make_not_entrant %sthread='" UINTX_FORMAT "'",
-                       (state == zombie ? "zombie='1' " : ""),
-                       os::current_thread_id());
+      if (flags.state == unloaded) {
+        xtty->begin_elem("make_unloaded thread='" UINTX_FORMAT "'",
+                         os::current_thread_id());
+      } else {
+        xtty->begin_elem("make_not_entrant thread='" UINTX_FORMAT "'%s",
+                         os::current_thread_id(),
+                         (flags.state == zombie ? " zombie='1'" : ""));
+      }
       log_identity(xtty);
       xtty->stamp();
       xtty->end_elem();
     }
   }
-  if (PrintCompilation) {
-    print_on(tty, state == zombie ? "made zombie " : "made not entrant ");
+  if (PrintCompilation && flags.state != unloaded) {
+    print_on(tty, flags.state == zombie ? "made zombie " : "made not entrant ");
     tty->cr();
   }
 }
 
 // Common functionality for both make_not_entrant and make_zombie
-void nmethod::make_not_entrant_or_zombie(int state) {
+bool nmethod::make_not_entrant_or_zombie(unsigned int state) {
   assert(state == zombie || state == not_entrant, "must be zombie or not_entrant");
 
-  // Code for an on-stack-replacement nmethod is removed when a class gets unloaded.
-  // They never become zombie/non-entrant, so the nmethod sweeper will never remove
-  // them. Instead the entry_bci is set to InvalidOSREntryBci, so the osr nmethod
-  // will never be used anymore. That the nmethods only gets removed when class unloading
-  // happens, make life much simpler, since the nmethods are not just going to disappear
-  // out of the blue.
-  if (is_osr_only_method()) {
-    if (osr_entry_bci() != InvalidOSREntryBci) {
-      // only log this once
-      log_state_change(state);
-    }
-    invalidate_osr_method();
-    return;
-  }
-
-  // If the method is already zombie or set to the state we want, nothing to do
-  if (is_zombie() || (state == not_entrant && is_not_entrant())) {
-    return;
-  }
-
-  log_state_change(state);
+  bool was_alive = false;
 
   // Make sure the nmethod is not flushed in case of a safepoint in code below.
   nmethodLocker nml(this);
 
   {
+    // If the method is already zombie there is nothing to do
+    if (is_zombie()) {
+      return false;
+    }
+
+    // invalidate osr nmethod before acquiring the patching lock since
+    // they both acquire leaf locks and we don't want a deadlock.
+    // This logic is equivalent to the logic below for patching the
+    // verified entry point of regular methods.
+    if (is_osr_method()) {
+      // this effectively makes the osr nmethod not entrant
+      invalidate_osr_method();
+    }
+
     // Enter critical section.  Does not block for safepoint.
     MutexLockerEx pl(Patching_lock, Mutex::_no_safepoint_check_flag);
+
+    if (flags.state == state) {
+      // another thread already performed this transition so nothing
+      // to do, but return false to indicate this.
+      return false;
+    }
+
     // The caller can be calling the method statically or through an inline
     // cache call.
-    if (!is_not_entrant()) {
+    if (!is_osr_method() && !is_not_entrant()) {
       NativeJump::patch_verified_entry(entry_point(), verified_entry_point(),
                   SharedRuntime::get_handle_wrong_method_stub());
       assert (NativeJump::instruction_size == nmethod::_zombie_instruction_size, "");
@@ -1189,8 +1225,14 @@
       assert(state == not_entrant, "other cases may need to be handled differently");
     }
 
+    was_alive = is_in_use(); // Read state under lock
+
     // Change state
     flags.state = state;
+
+    // Log the transition once
+    log_state_change();
+
   } // leave critical region under Patching_lock
 
   if (state == not_entrant) {
@@ -1211,9 +1253,11 @@
     mark_as_seen_on_stack();
   }
 
-  // It's a true state change, so mark the method as decompiled.
-  inc_decompile_count();
-
+  if (was_alive) {
+    // It's a true state change, so mark the method as decompiled.
+    // Do it only for transition from alive.
+    inc_decompile_count();
+  }
 
   // zombie only - if a JVMTI agent has enabled the CompiledMethodUnload event
   // and it hasn't already been reported for this nmethod then report it now.
@@ -1242,7 +1286,7 @@
 
   // Check whether method got unloaded at a safepoint before this,
   // if so we can skip the flushing steps below
-  if (method() == NULL) return;
+  if (method() == NULL) return true;
 
   // Remove nmethod from method.
   // We need to check if both the _code and _from_compiled_code_entry_point
@@ -1256,6 +1300,8 @@
     HandleMark hm;
     method()->clear_code();
   }
+
+  return true;
 }
 
 
@@ -1277,7 +1323,8 @@
   // completely deallocate this method
   EventMark m("flushing nmethod " INTPTR_FORMAT " %s", this, "");
   if (PrintMethodFlushing) {
-    tty->print_cr("*flushing nmethod " INTPTR_FORMAT ". Live blobs: %d", this, CodeCache::nof_blobs());
+    tty->print_cr("*flushing nmethod %3d/" INTPTR_FORMAT ". Live blobs:" UINT32_FORMAT "/Free CodeCache:" SIZE_FORMAT "Kb",
+        _compile_id, this, CodeCache::nof_blobs(), CodeCache::unallocated_capacity()/1024);
   }
 
   // We need to deallocate any ExceptionCache data.
@@ -1291,6 +1338,14 @@
     ec = next;
   }
 
+  if (on_scavenge_root_list()) {
+    CodeCache::drop_scavenge_root_nmethod(this);
+  }
+
+  if (is_speculatively_disconnected()) {
+    CodeCache::remove_saved_code(this);
+  }
+
   ((CodeBlob*)(this))->flush();
 
   CodeCache::free(this);
@@ -1350,7 +1405,10 @@
       return false;
     }
   }
-  assert(unloading_occurred, "Inconsistency in unloading");
+  // If ScavengeRootsInCode is true, an nmethod might be unloaded
+  // simply because one of its constant oops has gone dead.
+  // No actual classes need to be unloaded in order for this to occur.
+  assert(unloading_occurred || ScavengeRootsInCode, "Inconsistency in unloading");
   make_unloaded(is_alive, obj);
   return true;
 }
@@ -1520,7 +1578,17 @@
 #endif // !PRODUCT
 }
 
-void nmethod::oops_do(OopClosure* f) {
+// This method is called twice during GC -- once while
+// tracing the "active" nmethods on thread stacks during
+// the (strong) marking phase, and then again when walking
+// the code cache contents during the weak roots processing
+// phase. The two uses are distinguished by means of the
+// 'do_strong_roots_only' flag, which is true in the first
+// case. We want to walk the weak roots in the nmethod
+// only in the second case. The weak roots in the nmethod
+// are the oops in the ExceptionCache and the InlineCache
+// oops.
+void nmethod::oops_do(OopClosure* f, bool do_strong_roots_only) {
   // make sure the oops ready to receive visitors
   assert(!is_zombie() && !is_unloaded(),
          "should not call follow on zombie or unloaded nmethod");
@@ -1538,19 +1606,25 @@
 
   // Compiled code
   f->do_oop((oop*) &_method);
-  ExceptionCache* ec = exception_cache();
-  while(ec != NULL) {
-    f->do_oop((oop*)ec->exception_type_addr());
-    ec = ec->next();
-  }
+  if (!do_strong_roots_only) {
+    // weak roots processing phase -- update ExceptionCache oops
+    ExceptionCache* ec = exception_cache();
+    while(ec != NULL) {
+      f->do_oop((oop*)ec->exception_type_addr());
+      ec = ec->next();
+    }
+  } // Else strong roots phase -- skip oops in ExceptionCache
 
   RelocIterator iter(this, low_boundary);
+
   while (iter.next()) {
     if (iter.type() == relocInfo::oop_type ) {
       oop_Relocation* r = iter.oop_reloc();
       // In this loop, we must only follow those oops directly embedded in
       // the code.  Other oops (oop_index>0) are seen as part of scopes_oops.
-      assert(1 == (r->oop_is_immediate()) + (r->oop_addr() >= oops_begin() && r->oop_addr() < oops_end()), "oop must be found in exactly one place");
+      assert(1 == (r->oop_is_immediate()) +
+                   (r->oop_addr() >= oops_begin() && r->oop_addr() < oops_end()),
+             "oop must be found in exactly one place");
       if (r->oop_is_immediate() && r->oop_value() != NULL) {
         f->do_oop(r->oop_addr());
       }
@@ -1558,21 +1632,117 @@
   }
 
   // Scopes
+  // This includes oop constants not inlined in the code stream.
   for (oop* p = oops_begin(); p < oops_end(); p++) {
     if (*p == Universe::non_oop_word())  continue;  // skip non-oops
     f->do_oop(p);
   }
 }
 
+#define NMETHOD_SENTINEL ((nmethod*)badAddress)
+
+nmethod* volatile nmethod::_oops_do_mark_nmethods;
+
+// An nmethod is "marked" if its _mark_link is set non-null.
+// Even if it is the end of the linked list, it will have a non-null link value,
+// as long as it is on the list.
+// This code must be MP safe, because it is used from parallel GC passes.
+bool nmethod::test_set_oops_do_mark() {
+  assert(nmethod::oops_do_marking_is_active(), "oops_do_marking_prologue must be called");
+  nmethod* observed_mark_link = _oops_do_mark_link;
+  if (observed_mark_link == NULL) {
+    // Claim this nmethod for this thread to mark.
+    observed_mark_link = (nmethod*)
+      Atomic::cmpxchg_ptr(NMETHOD_SENTINEL, &_oops_do_mark_link, NULL);
+    if (observed_mark_link == NULL) {
+
+      // Atomically append this nmethod (now claimed) to the head of the list:
+      nmethod* observed_mark_nmethods = _oops_do_mark_nmethods;
+      for (;;) {
+        nmethod* required_mark_nmethods = observed_mark_nmethods;
+        _oops_do_mark_link = required_mark_nmethods;
+        observed_mark_nmethods = (nmethod*)
+          Atomic::cmpxchg_ptr(this, &_oops_do_mark_nmethods, required_mark_nmethods);
+        if (observed_mark_nmethods == required_mark_nmethods)
+          break;
+      }
+      // Mark was clear when we first saw this guy.
+      NOT_PRODUCT(if (TraceScavenge)  print_on(tty, "oops_do, mark\n"));
+      return false;
+    }
+  }
+  // On fall through, another racing thread marked this nmethod before we did.
+  return true;
+}
+
+void nmethod::oops_do_marking_prologue() {
+  NOT_PRODUCT(if (TraceScavenge)  tty->print_cr("[oops_do_marking_prologue"));
+  assert(_oops_do_mark_nmethods == NULL, "must not call oops_do_marking_prologue twice in a row");
+  // We use cmpxchg_ptr instead of regular assignment here because the user
+  // may fork a bunch of threads, and we need them all to see the same state.
+  void* observed = Atomic::cmpxchg_ptr(NMETHOD_SENTINEL, &_oops_do_mark_nmethods, NULL);
+  guarantee(observed == NULL, "no races in this sequential code");
+}
+
+void nmethod::oops_do_marking_epilogue() {
+  assert(_oops_do_mark_nmethods != NULL, "must not call oops_do_marking_epilogue twice in a row");
+  nmethod* cur = _oops_do_mark_nmethods;
+  while (cur != NMETHOD_SENTINEL) {
+    assert(cur != NULL, "not NULL-terminated");
+    nmethod* next = cur->_oops_do_mark_link;
+    cur->_oops_do_mark_link = NULL;
+    NOT_PRODUCT(if (TraceScavenge)  cur->print_on(tty, "oops_do, unmark\n"));
+    cur = next;
+  }
+  void* required = _oops_do_mark_nmethods;
+  void* observed = Atomic::cmpxchg_ptr(NULL, &_oops_do_mark_nmethods, required);
+  guarantee(observed == required, "no races in this sequential code");
+  NOT_PRODUCT(if (TraceScavenge)  tty->print_cr("oops_do_marking_epilogue]"));
+}
+
+class DetectScavengeRoot: public OopClosure {
+  bool     _detected_scavenge_root;
+public:
+  DetectScavengeRoot() : _detected_scavenge_root(false)
+  { NOT_PRODUCT(_print_nm = NULL); }
+  bool detected_scavenge_root() { return _detected_scavenge_root; }
+  virtual void do_oop(oop* p) {
+    if ((*p) != NULL && (*p)->is_scavengable()) {
+      NOT_PRODUCT(maybe_print(p));
+      _detected_scavenge_root = true;
+    }
+  }
+  virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+
+#ifndef PRODUCT
+  nmethod* _print_nm;
+  void maybe_print(oop* p) {
+    if (_print_nm == NULL)  return;
+    if (!_detected_scavenge_root)  _print_nm->print_on(tty, "new scavenge root");
+    tty->print_cr(""PTR_FORMAT"[offset=%d] detected non-perm oop "PTR_FORMAT" (found at "PTR_FORMAT")",
+                  _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm),
+                  (intptr_t)(*p), (intptr_t)p);
+    (*p)->print();
+  }
+#endif //PRODUCT
+};
+
+bool nmethod::detect_scavenge_root_oops() {
+  DetectScavengeRoot detect_scavenge_root;
+  NOT_PRODUCT(if (TraceScavenge)  detect_scavenge_root._print_nm = this);
+  oops_do(&detect_scavenge_root);
+  return detect_scavenge_root.detected_scavenge_root();
+}
+
 // Method that knows how to preserve outgoing arguments at call. This method must be
 // called with a frame corresponding to a Java invoke
 void nmethod::preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) {
   if (!method()->is_native()) {
     SimpleScopeDesc ssd(this, fr.pc());
     Bytecode_invoke* call = Bytecode_invoke_at(ssd.method(), ssd.bci());
-    bool is_static = call->is_invokestatic();
+    bool has_receiver = call->has_receiver();
     symbolOop signature = call->signature();
-    fr.oops_compiled_arguments_do(signature, is_static, reg_map, f);
+    fr.oops_compiled_arguments_do(signature, has_receiver, reg_map, f);
   }
 }
 
@@ -1609,6 +1779,14 @@
          "must end with a sentinel");
 #endif //ASSERT
 
+  // Search for MethodHandle invokes and tag the nmethod.
+  for (int i = 0; i < count; i++) {
+    if (pcs[i].is_method_handle_invoke()) {
+      set_has_method_handle_invokes(true);
+      break;
+    }
+  }
+
   int size = count * sizeof(PcDesc);
   assert(scopes_pcs_size() >= size, "oob");
   memcpy(scopes_pcs_begin(), pcs, size);
@@ -1833,7 +2011,10 @@
     print_pcs();
   }
 #endif
-  guarantee(cont_offset != 0, "unhandled implicit exception in compiled code");
+  if (cont_offset == 0) {
+    // Let the normal error handling report the exception
+    return NULL;
+  }
   return instructions_begin() + cont_offset;
 }
 
@@ -1869,15 +2050,57 @@
   guarantee(nm->_lock_count >= 0, "unmatched nmethod lock/unlock");
 }
 
-bool nmethod::is_deopt_pc(address pc) {
-  bool ret =  pc == deopt_handler_begin();
-  return ret;
+
+// -----------------------------------------------------------------------------
+// nmethod::get_deopt_original_pc
+//
+// Return the original PC for the given PC if:
+// (a) the given PC belongs to a nmethod and
+// (b) it is a deopt PC
+address nmethod::get_deopt_original_pc(const frame* fr) {
+  if (fr->cb() == NULL)  return NULL;
+
+  nmethod* nm = fr->cb()->as_nmethod_or_null();
+  if (nm != NULL && nm->is_deopt_pc(fr->pc()))
+    return nm->get_original_pc(fr);
+
+  return NULL;
+}
+
+
+// -----------------------------------------------------------------------------
+// MethodHandle
+
+bool nmethod::is_method_handle_return(address return_pc) {
+  if (!has_method_handle_invokes())  return false;
+  PcDesc* pd = pc_desc_at(return_pc);
+  if (pd == NULL)
+    return false;
+  return pd->is_method_handle_invoke();
 }
 
 
 // -----------------------------------------------------------------------------
 // Verification
 
+class VerifyOopsClosure: public OopClosure {
+  nmethod* _nm;
+  bool     _ok;
+public:
+  VerifyOopsClosure(nmethod* nm) : _nm(nm), _ok(true) { }
+  bool ok() { return _ok; }
+  virtual void do_oop(oop* p) {
+    if ((*p) == NULL || (*p)->is_oop())  return;
+    if (_ok) {
+      _nm->print_nmethod(true);
+      _ok = false;
+    }
+    tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
+                  (intptr_t)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
+  }
+  virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+};
+
 void nmethod::verify() {
 
   // Hmm. OSR methods can be deopted but not marked as zombie or not_entrant
@@ -1911,6 +2134,11 @@
     }
   }
 
+  VerifyOopsClosure voc(this);
+  oops_do(&voc);
+  assert(voc.ok(), "embedded oops must be OK");
+  verify_scavenge_root_oops();
+
   verify_scopes();
 }
 
@@ -1932,7 +2160,8 @@
   PcDesc* pd = pc_desc_at(ic->end_of_call());
   assert(pd != NULL, "PcDesc must exist");
   for (ScopeDesc* sd = new ScopeDesc(this, pd->scope_decode_offset(),
-                                     pd->obj_decode_offset());
+                                     pd->obj_decode_offset(), pd->should_reexecute(),
+                                     pd->return_oop());
        !sd->is_top(); sd = sd->sender()) {
     sd->verify();
   }
@@ -1974,19 +2203,34 @@
 // Non-product code
 #ifndef PRODUCT
 
-void nmethod::check_store() {
-  // Make sure all oops in the compiled code are tenured
+class DebugScavengeRoot: public OopClosure {
+  nmethod* _nm;
+  bool     _ok;
+public:
+  DebugScavengeRoot(nmethod* nm) : _nm(nm), _ok(true) { }
+  bool ok() { return _ok; }
+  virtual void do_oop(oop* p) {
+    if ((*p) == NULL || !(*p)->is_scavengable())  return;
+    if (_ok) {
+      _nm->print_nmethod(true);
+      _ok = false;
+    }
+    tty->print_cr("*** non-perm oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
+                  (intptr_t)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
+    (*p)->print();
+  }
+  virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+};
 
-  RelocIterator iter(this);
-  while (iter.next()) {
-    if (iter.type() == relocInfo::oop_type) {
-      oop_Relocation* reloc = iter.oop_reloc();
-      oop obj = reloc->oop_value();
-      if (obj != NULL && !obj->is_perm()) {
-        fatal("must be permanent oop in compiled code");
-      }
-    }
+void nmethod::verify_scavenge_root_oops() {
+  if (!on_scavenge_root_list()) {
+    // Actually look inside, to verify the claim that it's clean.
+    DebugScavengeRoot debug_scavenge_root(this);
+    oops_do(&debug_scavenge_root);
+    if (!debug_scavenge_root.ok())
+      fatal("found an unadvertised bad non-perm oop in the code cache");
   }
+  assert(scavenge_root_not_marked(), "");
 }
 
 #endif // PRODUCT
@@ -2019,6 +2263,7 @@
     if (is_not_entrant()) tty->print("not_entrant ");
     if (is_zombie())      tty->print("zombie ");
     if (is_unloaded())    tty->print("unloaded ");
+    if (on_scavenge_root_list())  tty->print("scavenge_root ");
     tty->print_cr("}:");
   }
   if (size              () > 0) tty->print_cr(" total in heap  [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
@@ -2181,11 +2426,115 @@
   PcDesc* p = pc_desc_near(begin+1);
   if (p != NULL && p->real_pc(this) <= end) {
     return new ScopeDesc(this, p->scope_decode_offset(),
-                         p->obj_decode_offset());
+                         p->obj_decode_offset(), p->should_reexecute(),
+                         p->return_oop());
   }
   return NULL;
 }
 
+void nmethod::print_nmethod_labels(outputStream* stream, address block_begin) {
+  if (block_begin == entry_point())             stream->print_cr("[Entry Point]");
+  if (block_begin == verified_entry_point())    stream->print_cr("[Verified Entry Point]");
+  if (block_begin == exception_begin())         stream->print_cr("[Exception Handler]");
+  if (block_begin == stub_begin())              stream->print_cr("[Stub Code]");
+  if (block_begin == deopt_handler_begin())     stream->print_cr("[Deopt Handler Code]");
+  if (block_begin == deopt_mh_handler_begin())  stream->print_cr("[Deopt MH Handler Code]");
+  if (block_begin == consts_begin())            stream->print_cr("[Constants]");
+  if (block_begin == entry_point()) {
+    methodHandle m = method();
+    if (m.not_null()) {
+      stream->print("  # ");
+      m->print_value_on(stream);
+      stream->cr();
+    }
+    if (m.not_null() && !is_osr_method()) {
+      ResourceMark rm;
+      int sizeargs = m->size_of_parameters();
+      BasicType* sig_bt = NEW_RESOURCE_ARRAY(BasicType, sizeargs);
+      VMRegPair* regs   = NEW_RESOURCE_ARRAY(VMRegPair, sizeargs);
+      {
+        int sig_index = 0;
+        if (!m->is_static())
+          sig_bt[sig_index++] = T_OBJECT; // 'this'
+        for (SignatureStream ss(m->signature()); !ss.at_return_type(); ss.next()) {
+          BasicType t = ss.type();
+          sig_bt[sig_index++] = t;
+          if (type2size[t] == 2) {
+            sig_bt[sig_index++] = T_VOID;
+          } else {
+            assert(type2size[t] == 1, "size is 1 or 2");
+          }
+        }
+        assert(sig_index == sizeargs, "");
+      }
+      const char* spname = "sp"; // make arch-specific?
+      intptr_t out_preserve = SharedRuntime::java_calling_convention(sig_bt, regs, sizeargs, false);
+      int stack_slot_offset = this->frame_size() * wordSize;
+      int tab1 = 14, tab2 = 24;
+      int sig_index = 0;
+      int arg_index = (m->is_static() ? 0 : -1);
+      bool did_old_sp = false;
+      for (SignatureStream ss(m->signature()); !ss.at_return_type(); ) {
+        bool at_this = (arg_index == -1);
+        bool at_old_sp = false;
+        BasicType t = (at_this ? T_OBJECT : ss.type());
+        assert(t == sig_bt[sig_index], "sigs in sync");
+        if (at_this)
+          stream->print("  # this: ");
+        else
+          stream->print("  # parm%d: ", arg_index);
+        stream->move_to(tab1);
+        VMReg fst = regs[sig_index].first();
+        VMReg snd = regs[sig_index].second();
+        if (fst->is_reg()) {
+          stream->print("%s", fst->name());
+          if (snd->is_valid())  {
+            stream->print(":%s", snd->name());
+          }
+        } else if (fst->is_stack()) {
+          int offset = fst->reg2stack() * VMRegImpl::stack_slot_size + stack_slot_offset;
+          if (offset == stack_slot_offset)  at_old_sp = true;
+          stream->print("[%s+0x%x]", spname, offset);
+        } else {
+          stream->print("reg%d:%d??", (int)(intptr_t)fst, (int)(intptr_t)snd);
+        }
+        stream->print(" ");
+        stream->move_to(tab2);
+        stream->print("= ");
+        if (at_this) {
+          m->method_holder()->print_value_on(stream);
+        } else {
+          bool did_name = false;
+          if (!at_this && ss.is_object()) {
+            symbolOop name = ss.as_symbol_or_null();
+            if (name != NULL) {
+              name->print_value_on(stream);
+              did_name = true;
+            }
+          }
+          if (!did_name)
+            stream->print("%s", type2name(t));
+        }
+        if (at_old_sp) {
+          stream->print("  (%s of caller)", spname);
+          did_old_sp = true;
+        }
+        stream->cr();
+        sig_index += type2size[t];
+        arg_index += 1;
+        if (!at_this)  ss.next();
+      }
+      if (!did_old_sp) {
+        stream->print("  # ");
+        stream->move_to(tab1);
+        stream->print("[%s+0x%x]", spname, stack_slot_offset);
+        stream->print("  (%s of caller)", spname);
+        stream->cr();
+      }
+    }
+  }
+}
+
 void nmethod::print_code_comment_on(outputStream* st, int column, u_char* begin, u_char* end) {
   // First, find an oopmap in (begin, end].
   // We use the odd half-closed interval so that oop maps and scope descs
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/nmethod.hpp
--- a/src/share/vm/code/nmethod.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/nmethod.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -81,18 +81,21 @@
 
 struct nmFlags {
   friend class VMStructs;
-  unsigned int version:8;                 // version number (0 = first version)
-  unsigned int level:4;                   // optimization level
-  unsigned int age:4;                     // age (in # of sweep steps)
+  unsigned int version:8;                    // version number (0 = first version)
+  unsigned int level:4;                      // optimization level
+  unsigned int age:4;                        // age (in # of sweep steps)
 
-  unsigned int state:2;                   // {alive, zombie, unloaded)
+  unsigned int state:2;                      // {alive, zombie, unloaded)
 
-  unsigned int isUncommonRecompiled:1;    // recompiled because of uncommon trap?
-  unsigned int isToBeRecompiled:1;        // to be recompiled as soon as it matures
-  unsigned int hasFlushedDependencies:1;  // Used for maintenance of dependencies
-  unsigned int markedForReclamation:1;    // Used by NMethodSweeper
+  unsigned int isUncommonRecompiled:1;       // recompiled because of uncommon trap?
+  unsigned int isToBeRecompiled:1;           // to be recompiled as soon as it matures
+  unsigned int hasFlushedDependencies:1;     // Used for maintenance of dependencies
+  unsigned int markedForReclamation:1;       // Used by NMethodSweeper
 
-  unsigned int has_unsafe_access:1;       // May fault due to unsafe access.
+  unsigned int has_unsafe_access:1;          // May fault due to unsafe access.
+  unsigned int has_method_handle_invokes:1;  // Has this method MethodHandle invokes?
+
+  unsigned int speculatively_disconnected:1; // Marked for potential unload
 
   void clear();
 };
@@ -125,6 +128,7 @@
 class nmethod : public CodeBlob {
   friend class VMStructs;
   friend class NMethodSweeper;
+  friend class CodeCache;  // non-perm oops
  private:
   // Shared fields for all nmethod's
   static int _zombie_instruction_size;
@@ -132,14 +136,24 @@
   methodOop _method;
   int       _entry_bci;        // != InvocationEntryBci if this nmethod is an on-stack replacement method
 
-  nmethod*  _link;             // To support simple linked-list chaining of nmethods
+  // To support simple linked-list chaining of nmethods:
+  nmethod*  _osr_link;         // from instanceKlass::osr_nmethods_head
+  nmethod*  _scavenge_root_link; // from CodeCache::scavenge_root_nmethods
+  nmethod*  _saved_nmethod_link; // from CodeCache::speculatively_disconnect
+
+  static nmethod* volatile _oops_do_mark_nmethods;
+  nmethod*        volatile _oops_do_mark_link;
 
   AbstractCompiler* _compiler; // The compiler which compiled this nmethod
 
   // Offsets for different nmethod parts
   int _exception_offset;
-  // All deoptee's will resume execution at this location described by this offset
+  // All deoptee's will resume execution at this location described by
+  // this offset.
   int _deoptimize_offset;
+  // All deoptee's at a MethodHandle call site will resume execution
+  // at this location described by this offset.
+  int _deoptimize_mh_offset;
 #ifdef HAVE_DTRACE_H
   int _trap_offset;
 #endif // def HAVE_DTRACE_H
@@ -174,6 +188,8 @@
   // used by jvmti to track if an unload event has been posted for this nmethod.
   bool _unload_reported;
 
+  jbyte _scavenge_root_state;
+
   NOT_PRODUCT(bool _has_debug_info; )
 
   // Nmethod Flushing lock (if non-zero, then the nmethod is not removed)
@@ -242,10 +258,11 @@
 
   // helper methods
   void* operator new(size_t size, int nmethod_size);
-  void check_store();
 
   const char* reloc_string_for(u_char* begin, u_char* end);
-  void make_not_entrant_or_zombie(int state);
+  // Returns true if this thread changed the state of the nmethod or
+  // false if another thread performed the transition.
+  bool make_not_entrant_or_zombie(unsigned int state);
   void inc_decompile_count();
 
   // used to check that writes to nmFlags are done consistently.
@@ -314,30 +331,30 @@
   bool is_java_method() const                     { return !method()->is_native(); }
   bool is_native_method() const                   { return method()->is_native(); }
   bool is_osr_method() const                      { return _entry_bci != InvocationEntryBci; }
-  bool is_osr_only_method() const                 { return is_osr_method(); }
 
   bool is_compiled_by_c1() const;
   bool is_compiled_by_c2() const;
 
   // boundaries for different parts
-  address code_begin         () const             { return _entry_point; }
-  address code_end           () const             { return           header_begin() + _stub_offset          ; }
-  address exception_begin    () const             { return           header_begin() + _exception_offset     ; }
-  address deopt_handler_begin() const             { return           header_begin() + _deoptimize_offset    ; }
-  address stub_begin         () const             { return           header_begin() + _stub_offset          ; }
-  address stub_end           () const             { return           header_begin() + _consts_offset        ; }
-  address consts_begin       () const             { return           header_begin() + _consts_offset        ; }
-  address consts_end         () const             { return           header_begin() + _scopes_data_offset   ; }
-  address scopes_data_begin  () const             { return           header_begin() + _scopes_data_offset   ; }
-  address scopes_data_end    () const             { return           header_begin() + _scopes_pcs_offset    ; }
-  PcDesc* scopes_pcs_begin   () const             { return (PcDesc*)(header_begin() + _scopes_pcs_offset   ); }
-  PcDesc* scopes_pcs_end     () const             { return (PcDesc*)(header_begin() + _dependencies_offset); }
-  address dependencies_begin () const             { return           header_begin() + _dependencies_offset ; }
-  address dependencies_end   () const             { return           header_begin() + _handler_table_offset ; }
-  address handler_table_begin() const             { return           header_begin() + _handler_table_offset ; }
-  address handler_table_end  () const             { return           header_begin() + _nul_chk_table_offset   ; }
-  address nul_chk_table_begin() const             { return           header_begin() + _nul_chk_table_offset ; }
-  address nul_chk_table_end  () const             { return           header_begin() + _nmethod_end_offset   ; }
+  address code_begin            () const          { return _entry_point; }
+  address code_end              () const          { return           header_begin() + _stub_offset          ; }
+  address exception_begin       () const          { return           header_begin() + _exception_offset     ; }
+  address deopt_handler_begin   () const          { return           header_begin() + _deoptimize_offset    ; }
+  address deopt_mh_handler_begin() const          { return           header_begin() + _deoptimize_mh_offset ; }
+  address stub_begin            () const          { return           header_begin() + _stub_offset          ; }
+  address stub_end              () const          { return           header_begin() + _consts_offset        ; }
+  address consts_begin          () const          { return           header_begin() + _consts_offset        ; }
+  address consts_end            () const          { return           header_begin() + _scopes_data_offset   ; }
+  address scopes_data_begin     () const          { return           header_begin() + _scopes_data_offset   ; }
+  address scopes_data_end       () const          { return           header_begin() + _scopes_pcs_offset    ; }
+  PcDesc* scopes_pcs_begin      () const          { return (PcDesc*)(header_begin() + _scopes_pcs_offset   ); }
+  PcDesc* scopes_pcs_end        () const          { return (PcDesc*)(header_begin() + _dependencies_offset) ; }
+  address dependencies_begin    () const          { return           header_begin() + _dependencies_offset  ; }
+  address dependencies_end      () const          { return           header_begin() + _handler_table_offset ; }
+  address handler_table_begin   () const          { return           header_begin() + _handler_table_offset ; }
+  address handler_table_end     () const          { return           header_begin() + _nul_chk_table_offset ; }
+  address nul_chk_table_begin   () const          { return           header_begin() + _nul_chk_table_offset ; }
+  address nul_chk_table_end     () const          { return           header_begin() + _nmethod_end_offset   ; }
 
   int code_size         () const                  { return      code_end         () -      code_begin         (); }
   int stub_size         () const                  { return      stub_end         () -      stub_begin         (); }
@@ -369,10 +386,12 @@
   bool  is_zombie() const                         { return flags.state == zombie; }
   bool  is_unloaded() const                       { return flags.state == unloaded;   }
 
-  // Make the nmethod non entrant. The nmethod will continue to be alive.
-  // It is used when an uncommon trap happens.
-  void  make_not_entrant()                        { make_not_entrant_or_zombie(not_entrant); }
-  void  make_zombie()                             { make_not_entrant_or_zombie(zombie); }
+  // Make the nmethod non entrant. The nmethod will continue to be
+  // alive.  It is used when an uncommon trap happens.  Returns true
+  // if this thread changed the state of the nmethod or false if
+  // another thread performed the transition.
+  bool  make_not_entrant()                        { return make_not_entrant_or_zombie(not_entrant); }
+  bool  make_zombie()                             { return make_not_entrant_or_zombie(zombie); }
 
   // used by jvmti to track if the unload event has been reported
   bool  unload_reported()                         { return _unload_reported; }
@@ -399,6 +418,12 @@
   bool  has_unsafe_access() const                 { return flags.has_unsafe_access; }
   void  set_has_unsafe_access(bool z)             { flags.has_unsafe_access = z; }
 
+  bool  has_method_handle_invokes() const         { return flags.has_method_handle_invokes; }
+  void  set_has_method_handle_invokes(bool z)     { flags.has_method_handle_invokes = z; }
+
+  bool  is_speculatively_disconnected() const     { return flags.speculatively_disconnected; }
+  void  set_speculatively_disconnected(bool z)     { flags.speculatively_disconnected = z; }
+
   int   level() const                             { return flags.level; }
   void  set_level(int newLevel)                   { check_safepoint(); flags.level = newLevel; }
 
@@ -407,6 +432,27 @@
   int   version() const                           { return flags.version; }
   void  set_version(int v);
 
+  // Non-perm oop support
+  bool  on_scavenge_root_list() const                  { return (_scavenge_root_state & 1) != 0; }
+ protected:
+  enum { npl_on_list = 0x01, npl_marked = 0x10 };
+  void  set_on_scavenge_root_list()                    { _scavenge_root_state = npl_on_list; }
+  void  clear_on_scavenge_root_list()                  { _scavenge_root_state = 0; }
+  // assertion-checking and pruning logic uses the bits of _scavenge_root_state
+#ifndef PRODUCT
+  void  set_scavenge_root_marked()                     { _scavenge_root_state |= npl_marked; }
+  void  clear_scavenge_root_marked()                   { _scavenge_root_state &= ~npl_marked; }
+  bool  scavenge_root_not_marked()                     { return (_scavenge_root_state &~ npl_on_list) == 0; }
+  // N.B. there is no positive marked query, and we only use the not_marked query for asserts.
+#endif //PRODUCT
+  nmethod* scavenge_root_link() const                  { return _scavenge_root_link; }
+  void     set_scavenge_root_link(nmethod *n)          { _scavenge_root_link = n; }
+
+  nmethod* saved_nmethod_link() const                  { return _saved_nmethod_link; }
+  void     set_saved_nmethod_link(nmethod *n)          { _saved_nmethod_link = n; }
+
+ public:
+
   // Sweeper support
   long  stack_traversal_mark()                    { return _stack_traversal_mark; }
   void  set_stack_traversal_mark(long l)          { _stack_traversal_mark = l; }
@@ -425,8 +471,8 @@
   int   osr_entry_bci() const                     { assert(_entry_bci != InvocationEntryBci, "wrong kind of nmethod"); return _entry_bci; }
   address  osr_entry() const                      { assert(_entry_bci != InvocationEntryBci, "wrong kind of nmethod"); return _osr_entry_point; }
   void  invalidate_osr_method();
-  nmethod* link() const                           { return _link; }
-  void     set_link(nmethod *n)                   { _link = n; }
+  nmethod* osr_link() const                       { return _osr_link; }
+  void     set_osr_link(nmethod *n)               { _osr_link = n; }
 
   // tells whether frames described by this nmethod can be deoptimized
   // note: native wrappers cannot be deoptimized.
@@ -466,7 +512,16 @@
 
   void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map,
                                      OopClosure* f);
-  void oops_do(OopClosure* f);
+  virtual void oops_do(OopClosure* f) { oops_do(f, false); }
+  void         oops_do(OopClosure* f, bool do_strong_roots_only);
+  bool detect_scavenge_root_oops();
+  void verify_scavenge_root_oops() PRODUCT_RETURN;
+
+  bool test_set_oops_do_mark();
+  static void oops_do_marking_prologue();
+  static void oops_do_marking_epilogue();
+  static bool oops_do_marking_is_active() { return _oops_do_mark_nmethods != NULL; }
+  DEBUG_ONLY(bool test_oops_do_mark() { return _oops_do_mark_link != NULL; })
 
   // ScopeDesc for an instruction
   ScopeDesc* scope_desc_at(address pc);
@@ -474,7 +529,7 @@
  private:
   ScopeDesc* scope_desc_in(address begin, address end);
 
-  address* orig_pc_addr(const frame* fr ) { return (address*) ((address)fr->unextended_sp() + _orig_pc_offset); }
+  address* orig_pc_addr(const frame* fr) { return (address*) ((address)fr->unextended_sp() + _orig_pc_offset); }
 
   PcDesc* find_pc_desc_internal(address pc, bool approximate);
 
@@ -497,13 +552,20 @@
   void copy_scopes_pcs(PcDesc* pcs, int count);
   void copy_scopes_data(address buffer, int size);
 
-  // deopt
-  // return true is the pc is one would expect if the frame is being deopted.
-  bool is_deopt_pc(address pc);
+  // Deopt
+  // Return true is the PC is one would expect if the frame is being deopted.
+  bool is_deopt_pc      (address pc) { return is_deopt_entry(pc) || is_deopt_mh_entry(pc); }
+  bool is_deopt_entry   (address pc) { return pc == deopt_handler_begin(); }
+  bool is_deopt_mh_entry(address pc) { return pc == deopt_mh_handler_begin(); }
   // Accessor/mutator for the original pc of a frame before a frame was deopted.
   address get_original_pc(const frame* fr) { return *orig_pc_addr(fr); }
   void    set_original_pc(const frame* fr, address pc) { *orig_pc_addr(fr) = pc; }
 
+  static address get_deopt_original_pc(const frame* fr);
+
+  // MethodHandle
+  bool is_method_handle_return(address return_pc);
+
   // jvmti support:
   void post_compiled_method_load_event();
 
@@ -530,7 +592,14 @@
   // Logging
   void log_identity(xmlStream* log) const;
   void log_new_nmethod() const;
-  void log_state_change(int state) const;
+  void log_state_change() const;
+
+  // Prints block-level comments, including nmethod specific block labels:
+  virtual void print_block_comment(outputStream* stream, address block_begin) {
+    print_nmethod_labels(stream, block_begin);
+    CodeBlob::print_block_comment(stream, block_begin);
+  }
+  void print_nmethod_labels(outputStream* stream, address block_begin);
 
   // Prints a comment for one native instruction (reloc info, pc desc)
   void print_code_comment_on(outputStream* st, int column, address begin, address end);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/pcDesc.cpp
--- a/src/share/vm/code/pcDesc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/pcDesc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -26,9 +26,11 @@
 # include "incls/_pcDesc.cpp.incl"
 
 PcDesc::PcDesc(int pc_offset, int scope_decode_offset, int obj_decode_offset) {
+  assert(sizeof(PcDescFlags) <= 4, "occupies more than a word");
   _pc_offset           = pc_offset;
   _scope_decode_offset = scope_decode_offset;
   _obj_decode_offset   = obj_decode_offset;
+  _flags.word          = 0;
 }
 
 address PcDesc::real_pc(const nmethod* code) const {
@@ -50,6 +52,8 @@
     tty->print("  ");
     sd->method()->print_short_name(tty);
     tty->print("  @%d", sd->bci());
+    if (sd->should_reexecute())
+      tty->print("  reexecute=true");
     tty->cr();
   }
 #endif
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/pcDesc.hpp
--- a/src/share/vm/code/pcDesc.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/pcDesc.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -34,6 +34,16 @@
   int _scope_decode_offset; // offset for scope in nmethod
   int _obj_decode_offset;
 
+  union PcDescFlags {
+    int word;
+    struct {
+      unsigned int reexecute: 1;
+      unsigned int is_method_handle_invoke: 1;
+      unsigned int return_oop: 1;
+    } bits;
+    bool operator ==(const PcDescFlags& other) { return word == other.word; }
+  } _flags;
+
  public:
   int pc_offset() const           { return _pc_offset;   }
   int scope_decode_offset() const { return _scope_decode_offset; }
@@ -53,6 +63,23 @@
     upper_offset_limit = (unsigned int)-1 >> 1
   };
 
+  // Flags
+  bool     should_reexecute()              const { return _flags.bits.reexecute; }
+  void set_should_reexecute(bool z)              { _flags.bits.reexecute = z;    }
+
+  // Does pd refer to the same information as pd?
+  bool is_same_info(const PcDesc* pd) {
+    return _scope_decode_offset == pd->_scope_decode_offset &&
+      _obj_decode_offset == pd->_obj_decode_offset &&
+      _flags == pd->_flags;
+  }
+
+  bool     is_method_handle_invoke()       const { return _flags.bits.is_method_handle_invoke;     }
+  void set_is_method_handle_invoke(bool z)       {        _flags.bits.is_method_handle_invoke = z; }
+
+  bool     return_oop()                    const { return _flags.bits.return_oop;     }
+  void set_return_oop(bool z)                    {        _flags.bits.return_oop = z; }
+
   // Returns the real pc
   address real_pc(const nmethod* code) const;
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/scopeDesc.cpp
--- a/src/share/vm/code/scopeDesc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/scopeDesc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -26,17 +26,21 @@
 # include "incls/_scopeDesc.cpp.incl"
 
 
-ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset) {
+ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute, bool return_oop) {
   _code          = code;
   _decode_offset = decode_offset;
   _objects       = decode_object_values(obj_decode_offset);
+  _reexecute     = reexecute;
+  _return_oop    = return_oop;
   decode_body();
 }
 
-ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset) {
+ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, bool reexecute, bool return_oop) {
   _code          = code;
   _decode_offset = decode_offset;
   _objects       = decode_object_values(DebugInformationRecorder::serialized_null);
+  _reexecute     = reexecute;
+  _return_oop    = return_oop;
   decode_body();
 }
 
@@ -45,8 +49,9 @@
   _code          = parent->_code;
   _decode_offset = parent->_sender_decode_offset;
   _objects       = parent->_objects;
+  _reexecute     = false; //reexecute only applies to the first scope
+  _return_oop    = false;
   decode_body();
-  assert(_reexecute == false, "reexecute not allowed");
 }
 
 
@@ -57,7 +62,6 @@
     _sender_decode_offset = DebugInformationRecorder::serialized_null;
     _method = methodHandle(_code->method());
     _bci = InvocationEntryBci;
-    _reexecute = false;
     _locals_decode_offset = DebugInformationRecorder::serialized_null;
     _expressions_decode_offset = DebugInformationRecorder::serialized_null;
     _monitors_decode_offset = DebugInformationRecorder::serialized_null;
@@ -67,7 +71,7 @@
 
     _sender_decode_offset = stream->read_int();
     _method = methodHandle((methodOop) stream->read_oop());
-    _bci    = stream->read_bci_and_reexecute(_reexecute);
+    _bci    = stream->read_bci();
 
     // decode offsets for body and sender
     _locals_decode_offset      = stream->read_int();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/code/scopeDesc.hpp
--- a/src/share/vm/code/scopeDesc.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/code/scopeDesc.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -39,8 +39,7 @@
     DebugInfoReadStream buffer(code, pc_desc->scope_decode_offset());
     int ignore_sender = buffer.read_int();
     _method           = methodOop(buffer.read_oop());
-    bool dummy_reexecute; //only methodOop and bci are needed!
-    _bci              = buffer.read_bci_and_reexecute(dummy_reexecute);
+    _bci              = buffer.read_bci();
   }
 
   methodOop method() { return _method; }
@@ -53,17 +52,18 @@
 class ScopeDesc : public ResourceObj {
  public:
   // Constructor
-  ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset);
+  ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute, bool return_oop);
 
   // Calls above, giving default value of "serialized_null" to the
   // "obj_decode_offset" argument.  (We don't use a default argument to
   // avoid a .hpp-.hpp dependency.)
-  ScopeDesc(const nmethod* code, int decode_offset);
+  ScopeDesc(const nmethod* code, int decode_offset, bool reexecute, bool return_oop);
 
   // JVM state
   methodHandle method()   const { return _method; }
   int          bci()      const { return _bci;    }
   bool should_reexecute() const { return _reexecute; }
+  bool return_oop()       const { return _return_oop; }
 
   GrowableArray<ScopeValue*>*   locals();
   GrowableArray<ScopeValue*>*   expressions();
@@ -89,6 +89,7 @@
   methodHandle  _method;
   int           _bci;
   bool          _reexecute;
+  bool          _return_oop;
 
   // Decoding offsets
   int _decode_offset;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/compiler/compileBroker.cpp
--- a/src/share/vm/compiler/compileBroker.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/compiler/compileBroker.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -69,6 +69,7 @@
 
 bool CompileBroker::_initialized = false;
 volatile bool CompileBroker::_should_block = false;
+volatile jint CompileBroker::_should_compile_new_jobs = run_compilation;
 
 // The installed compiler(s)
 AbstractCompiler* CompileBroker::_compilers[2];
@@ -986,6 +987,13 @@
       return method_code;
     }
     if (method->is_not_compilable(comp_level)) return NULL;
+
+    nmethod* saved = CodeCache::find_and_remove_saved_code(method());
+    if (saved != NULL) {
+      method->set_code(method, saved);
+      return saved;
+    }
+
   } else {
     // osr compilation
 #ifndef TIERED
@@ -1037,6 +1045,14 @@
     method->jmethod_id();
   }
 
+  // If the compiler is shut off due to code cache flushing or otherwise,
+  // fail out now so blocking compiles dont hang the java thread
+  if (!should_compile_new_jobs() || (UseCodeCacheFlushing && CodeCache::needs_flushing())) {
+    method->invocation_counter()->decay();
+    method->backedge_counter()->decay();
+    return NULL;
+  }
+
   // do the compilation
   if (method->is_native()) {
     if (!PreferInterpreterNativeStubs) {
@@ -1116,7 +1132,7 @@
   // the specified level
   if (is_native &&
       (!CICompileNatives || !compiler(comp_level)->supports_native())) {
-    method->set_not_compilable();
+    method->set_not_compilable_quietly();
     return true;
   }
 
@@ -1140,7 +1156,7 @@
       method->print_short_name(tty);
       tty->cr();
     }
-    method->set_not_compilable();
+    method->set_not_compilable_quietly();
   }
 
   return false;
@@ -1173,7 +1189,7 @@
   }
 
   // Method was not in the appropriate compilation range.
-  method->set_not_compilable();
+  method->set_not_compilable_quietly();
   return 0;
 }
 
@@ -1325,26 +1341,13 @@
     {
       // We need this HandleMark to avoid leaking VM handles.
       HandleMark hm(thread);
+
       if (CodeCache::unallocated_capacity() < CodeCacheMinimumFreeSpace) {
-        // The CodeCache is full.  Print out warning and disable compilation.
-        UseInterpreter = true;
-        if (UseCompiler || AlwaysCompileLoopMethods ) {
-          if (log != NULL) {
-            log->begin_elem("code_cache_full");
-            log->stamp();
-            log->end_elem();
-          }
-#ifndef PRODUCT
-          warning("CodeCache is full. Compiler has been disabled");
-          if (CompileTheWorld || ExitOnFullCodeCache) {
-            before_exit(thread);
-            exit_globals(); // will delete tty
-            vm_direct_exit(CompileTheWorld ? 0 : 1);
-          }
-#endif
-          UseCompiler               = false;
-          AlwaysCompileLoopMethods  = false;
-        }
+        // the code cache is really full
+        handle_full_code_cache();
+      } else if (UseCodeCacheFlushing && CodeCache::needs_flushing()) {
+        // Attempt to start cleaning the code cache while there is still a little headroom
+        NMethodSweeper::handle_full_code_cache(false);
       }
 
       CompileTask* task = queue->get();
@@ -1369,7 +1372,7 @@
       // Never compile a method if breakpoints are present in it
       if (method()->number_of_breakpoints() == 0) {
         // Compile the method.
-        if (UseCompiler || AlwaysCompileLoopMethods) {
+        if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) {
 #ifdef COMPILER1
           // Allow repeating compilations for the purpose of benchmarking
           // compile speed. This is not useful for customers.
@@ -1587,10 +1590,10 @@
     if (is_osr) {
       method->set_not_osr_compilable();
     } else {
-      method->set_not_compilable();
+      method->set_not_compilable_quietly();
     }
   } else if (compilable == ciEnv::MethodCompilable_not_at_tier) {
-    method->set_not_compilable(task->comp_level());
+    method->set_not_compilable_quietly(task->comp_level());
   }
 
   // Note that the queued_for_compilation bits are cleared without
@@ -1614,6 +1617,38 @@
 
 
 // ------------------------------------------------------------------
+// CompileBroker::handle_full_code_cache
+//
+// The CodeCache is full.  Print out warning and disable compilation or
+// try code cache cleaning so compilation can continue later.
+void CompileBroker::handle_full_code_cache() {
+  UseInterpreter = true;
+  if (UseCompiler || AlwaysCompileLoopMethods ) {
+    CompilerThread* thread = CompilerThread::current();
+    CompileLog* log = thread->log();
+    if (log != NULL) {
+      log->begin_elem("code_cache_full");
+      log->stamp();
+      log->end_elem();
+    }
+  #ifndef PRODUCT
+    warning("CodeCache is full. Compiler has been disabled");
+    if (CompileTheWorld || ExitOnFullCodeCache) {
+      before_exit(JavaThread::current());
+      exit_globals(); // will delete tty
+      vm_direct_exit(CompileTheWorld ? 0 : 1);
+    }
+  #endif
+    if (UseCodeCacheFlushing) {
+      NMethodSweeper::handle_full_code_cache(true);
+    } else {
+      UseCompiler               = false;
+      AlwaysCompileLoopMethods  = false;
+    }
+  }
+}
+
+// ------------------------------------------------------------------
 // CompileBroker::set_last_compile
 //
 // Record this compilation for debugging purposes.
@@ -1820,9 +1855,11 @@
                 CompileBroker::_t_standard_compilation.seconds(),
                 CompileBroker::_t_standard_compilation.seconds() / CompileBroker::_total_standard_compile_count);
   tty->print_cr("    On stack replacement   : %6.3f s, Average : %2.3f", CompileBroker::_t_osr_compilation.seconds(), CompileBroker::_t_osr_compilation.seconds() / CompileBroker::_total_osr_compile_count);
-  compiler(CompLevel_fast_compile)->print_timers();
-  if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier)) {
-    compiler(CompLevel_highest_tier)->print_timers();
+
+  if (compiler(CompLevel_fast_compile)) {
+    compiler(CompLevel_fast_compile)->print_timers();
+    if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier))
+      compiler(CompLevel_highest_tier)->print_timers();
   }
 
   tty->cr();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/compiler/compileBroker.hpp
--- a/src/share/vm/compiler/compileBroker.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/compiler/compileBroker.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -193,6 +193,9 @@
   static bool _initialized;
   static volatile bool _should_block;
 
+  // This flag can be used to stop compilation or turn it back on
+  static volatile jint _should_compile_new_jobs;
+
   // The installed compiler(s)
   static AbstractCompiler* _compilers[2];
 
@@ -319,6 +322,7 @@
 
   static void compiler_thread_loop();
 
+  static uint get_compilation_id() { return _compilation_id; }
   static bool is_idle();
 
   // Set _should_block.
@@ -328,6 +332,20 @@
   // Call this from the compiler at convenient points, to poll for _should_block.
   static void maybe_block();
 
+  enum {
+    // Flags for toggling compiler activity
+    stop_compilation = 0,
+    run_compilation  = 1
+  };
+
+  static bool should_compile_new_jobs() { return UseCompiler && (_should_compile_new_jobs == run_compilation); }
+  static bool set_should_compile_new_jobs(jint new_state) {
+    // Return success if the current caller set it
+    jint old = Atomic::cmpxchg(new_state, &_should_compile_new_jobs, 1-new_state);
+    return (old == (1-new_state));
+  }
+  static void handle_full_code_cache();
+
   // Return total compilation ticks
   static jlong total_compilation_ticks() {
     return _perf_total_compilation != NULL ? _perf_total_compilation->get_value() : 0;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/compiler/compilerOracle.cpp
--- a/src/share/vm/compiler/compilerOracle.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/compiler/compilerOracle.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -392,18 +392,18 @@
 };
 
 static MethodMatcher::Mode check_mode(char name[], const char*& error_msg) {
-  if (strcmp(name, "*") == 0) return MethodMatcher::Any;
-
   int match = MethodMatcher::Exact;
-  if (name[0] == '*') {
+  while (name[0] == '*') {
     match |= MethodMatcher::Suffix;
     strcpy(name, name + 1);
   }
 
+  if (strcmp(name, "*") == 0) return MethodMatcher::Any;
+
   size_t len = strlen(name);
-  if (len > 0 && name[len - 1] == '*') {
+  while (len > 0 && name[len - 1] == '*') {
     match |= MethodMatcher::Prefix;
-    name[len - 1] = '\0';
+    name[--len] = '\0';
   }
 
   if (strstr(name, "*") != NULL) {
@@ -610,6 +610,14 @@
   CompilerOracle::parse_from_string(CompileCommand, CompilerOracle::parse_from_line);
   CompilerOracle::parse_from_string(CompileOnly, CompilerOracle::parse_compile_only);
   CompilerOracle::parse_from_file();
+  if (lists[PrintCommand] != NULL) {
+    if (PrintAssembly) {
+      warning("CompileCommand and/or .hotspot_compiler file contains 'print' commands, but PrintAssembly is also enabled");
+    } else if (FLAG_IS_DEFAULT(DebugNonSafepoints)) {
+      warning("printing of assembly code is enabled; turning on DebugNonSafepoints to gain additional output");
+      DebugNonSafepoints = true;
+    }
+  }
 }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/compiler/disassembler.cpp
--- a/src/share/vm/compiler/disassembler.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/compiler/disassembler.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -151,8 +151,10 @@
     outputStream* st = output();
     if (_print_bytes && pc > pc0)
       print_insn_bytes(pc0, pc);
-    if (_nm != NULL)
+    if (_nm != NULL) {
       _nm->print_code_comment_on(st, COMMENT_COLUMN, pc0, pc);
+      // this calls reloc_string_for which calls oop::print_value_on
+    }
 
     // Output pc bucket ticks if we have any
     if (total_ticks() != 0) {
@@ -273,8 +275,15 @@
     oop obj;
     if (_nm != NULL
         && (obj = _nm->embeddedOop_at(cur_insn())) != NULL
-        && (address) obj == adr) {
+        && (address) obj == adr
+        && Universe::heap()->is_in(obj)
+        && Universe::heap()->is_in(obj->klass())) {
+      julong c = st->count();
       obj->print_value_on(st);
+      if (st->count() == c) {
+        // No output.  (Can happen in product builds.)
+        st->print("(a %s)", Klass::cast(obj->klass())->external_name());
+      }
       return;
     }
   }
@@ -286,17 +295,9 @@
 void decode_env::print_insn_labels() {
   address p = cur_insn();
   outputStream* st = output();
-  nmethod* nm = _nm;
-  if (nm != NULL) {
-    if (p == nm->entry_point())             st->print_cr("[Entry Point]");
-    if (p == nm->verified_entry_point())    st->print_cr("[Verified Entry Point]");
-    if (p == nm->exception_begin())         st->print_cr("[Exception Handler]");
-    if (p == nm->stub_begin())              st->print_cr("[Stub Code]");
-    if (p == nm->consts_begin())            st->print_cr("[Constants]");
-  }
   CodeBlob* cb = _code;
   if (cb != NULL) {
-    cb->print_block_comment(st, (intptr_t)(p - cb->instructions_begin()));
+    cb->print_block_comment(st, p);
   }
   if (_print_pc) {
     st->print("  " INTPTR_FORMAT ": ", (intptr_t) p);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/compiler/methodLiveness.cpp
--- a/src/share/vm/compiler/methodLiveness.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/compiler/methodLiveness.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -782,6 +782,7 @@
     case Bytecodes::_invokespecial:
     case Bytecodes::_invokestatic:
     case Bytecodes::_invokeinterface:
+    case Bytecodes::_invokedynamic:
     case Bytecodes::_newarray:
     case Bytecodes::_anewarray:
     case Bytecodes::_checkcast:
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/compiler/oopMap.cpp
--- a/src/share/vm/compiler/oopMap.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/compiler/oopMap.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/compiler/oopMap.hpp
--- a/src/share/vm/compiler/oopMap.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/compiler/oopMap.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -62,12 +62,13 @@
   tl->link_head(tc);
   tl->link_tail(tc);
   tl->set_count(1);
-  tl->init_statistics();
+  tl->init_statistics(true /* split_birth */);
   tl->setParent(NULL);
   tl->setLeft(NULL);
   tl->setRight(NULL);
   return tl;
 }
+
 TreeList* TreeList::as_TreeList(HeapWord* addr, size_t size) {
   TreeChunk* tc = (TreeChunk*) addr;
   assert(size >= sizeof(TreeChunk), "Chunk is too small for a TreeChunk");
@@ -267,6 +268,31 @@
   return retTC;
 }
 
+// Returns the block with the largest heap address amongst
+// those in the list for this size; potentially slow and expensive,
+// use with caution!
+TreeChunk* TreeList::largest_address() {
+  guarantee(head() != NULL, "The head of the list cannot be NULL");
+  FreeChunk* fc = head()->next();
+  TreeChunk* retTC;
+  if (fc == NULL) {
+    retTC = head_as_TreeChunk();
+  } else {
+    // walk down the list and return the one with the highest
+    // heap address among chunks of this size.
+    FreeChunk* last = fc;
+    while (fc->next() != NULL) {
+      if ((HeapWord*)last < (HeapWord*)fc) {
+        last = fc;
+      }
+      fc = fc->next();
+    }
+    retTC = TreeChunk::as_TreeChunk(last);
+  }
+  assert(retTC->list() == this, "Wrong type of chunk.");
+  return retTC;
+}
+
 BinaryTreeDictionary::BinaryTreeDictionary(MemRegion mr, bool splay):
   _splay(splay)
 {
@@ -379,7 +405,7 @@
             break;
           }
           // The evm code reset the hint of the candidate as
-          // at an interrim point.  Why?  Seems like this leaves
+          // at an interim point.  Why?  Seems like this leaves
           // the hint pointing to a list that didn't work.
           // curTL->set_hint(hintTL->size());
         }
@@ -436,7 +462,7 @@
   TreeList *curTL = root();
   if (curTL != NULL) {
     while(curTL->right() != NULL) curTL = curTL->right();
-    return curTL->first_available();
+    return curTL->largest_address();
   } else {
     return NULL;
   }
@@ -664,7 +690,7 @@
     }
   }
   TreeChunk* tc = TreeChunk::as_TreeChunk(fc);
-  // This chunk is being returned to the binary try.  It's embedded
+  // This chunk is being returned to the binary tree.  Its embedded
   // TreeList should be unused at this point.
   tc->initialize();
   if (curTL != NULL) {          // exact match
@@ -807,6 +833,8 @@
 }
 
 bool BinaryTreeDictionary::coalDictOverPopulated(size_t size) {
+  if (FLSAlwaysCoalesceLarge) return true;
+
   TreeList* list_of_size = findList(size);
   // None of requested size implies overpopulated.
   return list_of_size == NULL || list_of_size->coalDesired() <= 0 ||
@@ -854,17 +882,20 @@
   double _percentage;
   float _inter_sweep_current;
   float _inter_sweep_estimate;
+  float _intra_sweep_estimate;
 
  public:
   BeginSweepClosure(double p, float inter_sweep_current,
-                              float inter_sweep_estimate) :
+                              float inter_sweep_estimate,
+                              float intra_sweep_estimate) :
    _percentage(p),
    _inter_sweep_current(inter_sweep_current),
-   _inter_sweep_estimate(inter_sweep_estimate) { }
+   _inter_sweep_estimate(inter_sweep_estimate),
+   _intra_sweep_estimate(intra_sweep_estimate) { }
 
   void do_list(FreeList* fl) {
     double coalSurplusPercent = _percentage;
-    fl->compute_desired(_inter_sweep_current, _inter_sweep_estimate);
+    fl->compute_desired(_inter_sweep_current, _inter_sweep_estimate, _intra_sweep_estimate);
     fl->set_coalDesired((ssize_t)((double)fl->desired() * coalSurplusPercent));
     fl->set_beforeSweep(fl->count());
     fl->set_bfrSurp(fl->surplus());
@@ -939,9 +970,10 @@
 }
 
 void BinaryTreeDictionary::beginSweepDictCensus(double coalSurplusPercent,
-  float inter_sweep_current, float inter_sweep_estimate) {
+  float inter_sweep_current, float inter_sweep_estimate, float intra_sweep_estimate) {
   BeginSweepClosure bsc(coalSurplusPercent, inter_sweep_current,
-                                            inter_sweep_estimate);
+                                            inter_sweep_estimate,
+                                            intra_sweep_estimate);
   bsc.do_tree(root());
 }
 
@@ -1077,13 +1109,13 @@
 // Print census information - counts, births, deaths, etc.
 // for each list in the tree.  Also print some summary
 // information.
-class printTreeCensusClosure : public AscendTreeCensusClosure {
+class PrintTreeCensusClosure : public AscendTreeCensusClosure {
   int _print_line;
   size_t _totalFree;
   FreeList _total;
 
  public:
-  printTreeCensusClosure() {
+  PrintTreeCensusClosure() {
     _print_line = 0;
     _totalFree = 0;
   }
@@ -1113,7 +1145,7 @@
 
   gclog_or_tty->print("\nBinaryTree\n");
   FreeList::print_labels_on(gclog_or_tty, "size");
-  printTreeCensusClosure ptc;
+  PrintTreeCensusClosure ptc;
   ptc.do_tree(root());
 
   FreeList* total = ptc.total();
@@ -1130,6 +1162,38 @@
              /(total->desired() != 0 ? (double)total->desired() : 1.0));
 }
 
+class PrintFreeListsClosure : public AscendTreeCensusClosure {
+  outputStream* _st;
+  int _print_line;
+
+ public:
+  PrintFreeListsClosure(outputStream* st) {
+    _st = st;
+    _print_line = 0;
+  }
+  void do_list(FreeList* fl) {
+    if (++_print_line >= 40) {
+      FreeList::print_labels_on(_st, "size");
+      _print_line = 0;
+    }
+    fl->print_on(gclog_or_tty);
+    size_t sz = fl->size();
+    for (FreeChunk* fc = fl->head(); fc != NULL;
+         fc = fc->next()) {
+      _st->print_cr("\t[" PTR_FORMAT "," PTR_FORMAT ")  %s",
+                    fc, (HeapWord*)fc + sz,
+                    fc->cantCoalesce() ? "\t CC" : "");
+    }
+  }
+};
+
+void BinaryTreeDictionary::print_free_lists(outputStream* st) const {
+
+  FreeList::print_labels_on(st, "size");
+  PrintFreeListsClosure pflc(st);
+  pflc.do_tree(root());
+}
+
 // Verify the following tree invariants:
 // . _root has no parent
 // . parent and child point to each other
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -42,9 +42,6 @@
   friend class AscendTreeCensusClosure;
   friend class DescendTreeCensusClosure;
   friend class DescendTreeSearchClosure;
-  TreeList* _parent;
-  TreeList* _left;
-  TreeList* _right;
 
  protected:
   TreeList* parent() const { return _parent; }
@@ -82,6 +79,11 @@
   // to a TreeChunk.
   TreeChunk* first_available();
 
+  // Returns the block with the largest heap address amongst
+  // those in the list for this size; potentially slow and expensive,
+  // use with caution!
+  TreeChunk* largest_address();
+
   // removeChunkReplaceIfNeeded() removes the given "tc" from the TreeList.
   // If "tc" is the first chunk in the list, it is also the
   // TreeList that is the node in the tree.  removeChunkReplaceIfNeeded()
@@ -254,8 +256,9 @@
   // Methods called at the beginning of a sweep to prepare the
   // statistics for the sweep.
   void       beginSweepDictCensus(double coalSurplusPercent,
-                                  float sweep_current,
-                                  float sweep_estimate);
+                                  float inter_sweep_current,
+                                  float inter_sweep_estimate,
+                                  float intra_sweep_estimate);
   // Methods called after the end of a sweep to modify the
   // statistics for the sweep.
   void       endSweepDictCensus(double splitSurplusPercent);
@@ -269,6 +272,7 @@
   // Print the statistcis for all the lists in the tree.  Also may
   // print out summaries.
   void       printDictCensus(void) const;
+  void       print_free_lists(outputStream* st) const;
 
   // For debugging.  Returns the sum of the _returnedBytes for
   // all lists in the tree.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -46,9 +46,9 @@
 
   _processor_count = os::active_processor_count();
 
-  if (CMSConcurrentMTEnabled && (ParallelCMSThreads > 1)) {
+  if (CMSConcurrentMTEnabled && (ConcGCThreads > 1)) {
     assert(_processor_count > 0, "Processor count is suspect");
-    _concurrent_processor_count = MIN2((uint) ParallelCMSThreads,
+    _concurrent_processor_count = MIN2((uint) ConcGCThreads,
                                        (uint) _processor_count);
   } else {
     _concurrent_processor_count = 1;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -32,7 +32,9 @@
 // threads. The second argument is in support of an extra locking
 // check for CFL spaces' free list locks.
 #ifndef PRODUCT
-void CMSLockVerifier::assert_locked(const Mutex* lock, const Mutex* p_lock) {
+void CMSLockVerifier::assert_locked(const Mutex* lock,
+                                    const Mutex* p_lock1,
+                                    const Mutex* p_lock2) {
   if (!Universe::is_fully_initialized()) {
     return;
   }
@@ -40,7 +42,7 @@
   Thread* myThread = Thread::current();
 
   if (lock == NULL) { // a "lock-free" structure, e.g. MUT, protected by CMS token
-    assert(p_lock == NULL, "Unexpected state");
+    assert(p_lock1 == NULL && p_lock2 == NULL, "Unexpected caller error");
     if (myThread->is_ConcurrentGC_thread()) {
       // This test might have to change in the future, if there can be
       // multiple peer CMS threads.  But for now, if we're testing the CMS
@@ -60,36 +62,39 @@
     return;
   }
 
-  if (ParallelGCThreads == 0) {
+  if (myThread->is_VM_thread()
+      || myThread->is_ConcurrentGC_thread()
+      || myThread->is_Java_thread()) {
+    // Make sure that we are holding the associated lock.
     assert_lock_strong(lock);
+    // The checking of p_lock is a spl case for CFLS' free list
+    // locks: we make sure that none of the parallel GC work gang
+    // threads are holding "sub-locks" of freeListLock(). We check only
+    // the parDictionaryAllocLock because the others are too numerous.
+    // This spl case code is somewhat ugly and any improvements
+    // are welcome.
+    assert(p_lock1 == NULL || !p_lock1->is_locked() || p_lock1->owned_by_self(),
+           "Possible race between this and parallel GC threads");
+    assert(p_lock2 == NULL || !p_lock2->is_locked() || p_lock2->owned_by_self(),
+           "Possible race between this and parallel GC threads");
+  } else if (myThread->is_GC_task_thread()) {
+    // Make sure that the VM or CMS thread holds lock on our behalf
+    // XXX If there were a concept of a gang_master for a (set of)
+    // gang_workers, we could have used the identity of that thread
+    // for checking ownership here; for now we just disjunct.
+    assert(lock->owner() == VMThread::vm_thread() ||
+           lock->owner() == ConcurrentMarkSweepThread::cmst(),
+           "Should be locked by VM thread or CMS thread on my behalf");
+    if (p_lock1 != NULL) {
+      assert_lock_strong(p_lock1);
+    }
+    if (p_lock2 != NULL) {
+      assert_lock_strong(p_lock2);
+    }
   } else {
-    if (myThread->is_VM_thread()
-        || myThread->is_ConcurrentGC_thread()
-        || myThread->is_Java_thread()) {
-      // Make sure that we are holding the associated lock.
-      assert_lock_strong(lock);
-      // The checking of p_lock is a spl case for CFLS' free list
-      // locks: we make sure that none of the parallel GC work gang
-      // threads are holding "sub-locks" of freeListLock(). We check only
-      // the parDictionaryAllocLock because the others are too numerous.
-      // This spl case code is somewhat ugly and any improvements
-      // are welcome XXX FIX ME!!
-      if (p_lock != NULL) {
-        assert(!p_lock->is_locked() || p_lock->owned_by_self(),
-               "Possible race between this and parallel GC threads");
-      }
-    } else if (myThread->is_GC_task_thread()) {
-      // Make sure that the VM or CMS thread holds lock on our behalf
-      // XXX If there were a concept of a gang_master for a (set of)
-      // gang_workers, we could have used the identity of that thread
-      // for checking ownership here; for now we just disjunct.
-      assert(lock->owner() == VMThread::vm_thread() ||
-             lock->owner() == ConcurrentMarkSweepThread::cmst(),
-             "Should be locked by VM thread or CMS thread on my behalf");
-    } else {
-      // Make sure we didn't miss some obscure corner case
-      ShouldNotReachHere();
-    }
+    // Make sure we didn't miss some other thread type calling into here;
+    // perhaps as a result of future VM evolution.
+    ShouldNotReachHere();
   }
 }
 #endif
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -29,8 +29,11 @@
 // the parallel threads.
 class CMSLockVerifier: AllStatic {
  public:
-  static void assert_locked(const Mutex* lock, const Mutex* p_lock)
+  static void assert_locked(const Mutex* lock, const Mutex* p_lock1, const Mutex* p_lock2)
     PRODUCT_RETURN;
+  static void assert_locked(const Mutex* lock, const Mutex* p_lock) {
+    assert_locked(lock, p_lock, NULL);
+  }
   static void assert_locked(const Mutex* lock) {
     assert_locked(lock, NULL);
   }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -47,20 +47,15 @@
  private:
   const MemRegion _span;
   CMSBitMap*      _bitMap;
-  const bool      _should_do_nmethods;
  protected:
   DO_OOP_WORK_DEFN
  public:
-  MarkRefsIntoClosure(MemRegion span, CMSBitMap* bitMap,
-                      bool should_do_nmethods);
+  MarkRefsIntoClosure(MemRegion span, CMSBitMap* bitMap);
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { MarkRefsIntoClosure::do_oop_work(p); }
   inline void do_oop_nv(narrowOop* p) { MarkRefsIntoClosure::do_oop_work(p); }
   bool do_header() { return true; }
-  virtual const bool do_nmethods() const {
-    return _should_do_nmethods;
-  }
   Prefetch::style prefetch_style() {
     return Prefetch::do_read;
   }
@@ -73,36 +68,65 @@
   const MemRegion _span;
   CMSBitMap*      _verification_bm;
   CMSBitMap*      _cms_bm;
-  const bool      _should_do_nmethods;
  protected:
   DO_OOP_WORK_DEFN
  public:
   MarkRefsIntoVerifyClosure(MemRegion span, CMSBitMap* verification_bm,
-                            CMSBitMap* cms_bm, bool should_do_nmethods);
+                            CMSBitMap* cms_bm);
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { MarkRefsIntoVerifyClosure::do_oop_work(p); }
   inline void do_oop_nv(narrowOop* p) { MarkRefsIntoVerifyClosure::do_oop_work(p); }
   bool do_header() { return true; }
-  virtual const bool do_nmethods() const {
-    return _should_do_nmethods;
-  }
   Prefetch::style prefetch_style() {
     return Prefetch::do_read;
   }
 };
 
+// KlassRememberingOopClosure is used when marking of the permanent generation
+// is being done.  It adds fields to support revisiting of klasses
+// for class unloading.  _should_remember_klasses should be set to
+// indicate if klasses should be remembered.  Currently that is whenever
+// CMS class unloading is turned on.  The _revisit_stack is used
+// to save the klasses for later processing.
+class KlassRememberingOopClosure : public OopClosure {
+ protected:
+  CMSCollector* _collector;
+  CMSMarkStack* _revisit_stack;
+  bool const    _should_remember_klasses;
+ public:
+  void check_remember_klasses() const PRODUCT_RETURN;
+  virtual const bool should_remember_klasses() const {
+    check_remember_klasses();
+    return _should_remember_klasses;
+  }
+  virtual void remember_klass(Klass* k);
+
+  KlassRememberingOopClosure(CMSCollector* collector,
+                             ReferenceProcessor* rp,
+                             CMSMarkStack* revisit_stack);
+};
+
+// Similar to KlassRememberingOopClosure for use when multiple
+// GC threads will execute the closure.
+
+class Par_KlassRememberingOopClosure : public KlassRememberingOopClosure {
+ public:
+  Par_KlassRememberingOopClosure(CMSCollector* collector,
+                                 ReferenceProcessor* rp,
+                                 CMSMarkStack* revisit_stack):
+    KlassRememberingOopClosure(collector, rp, revisit_stack) {}
+  virtual void remember_klass(Klass* k);
+};
+
 // The non-parallel version (the parallel version appears further below).
-class PushAndMarkClosure: public OopClosure {
+class PushAndMarkClosure: public KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   MemRegion     _span;
   CMSBitMap*    _bit_map;
   CMSBitMap*    _mod_union_table;
   CMSMarkStack* _mark_stack;
-  CMSMarkStack* _revisit_stack;
   bool          _concurrent_precleaning;
-  bool const    _should_remember_klasses;
  protected:
   DO_OOP_WORK_DEFN
  public:
@@ -122,10 +146,12 @@
   Prefetch::style prefetch_style() {
     return Prefetch::do_read;
   }
-  virtual const bool should_remember_klasses() const {
-    return _should_remember_klasses;
+  // In support of class unloading
+  virtual const bool should_remember_mdo() const {
+    return false;
+    // return _should_remember_klasses;
   }
-  virtual void remember_klass(Klass* k);
+  virtual void remember_mdo(DataLayout* v);
 };
 
 // In the parallel case, the revisit stack, the bit map and the
@@ -134,14 +160,11 @@
 // synchronization (for instance, via CAS). The marking stack
 // used in the non-parallel case above is here replaced with
 // an OopTaskQueue structure to allow efficient work stealing.
-class Par_PushAndMarkClosure: public OopClosure {
+class Par_PushAndMarkClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   MemRegion     _span;
   CMSBitMap*    _bit_map;
   OopTaskQueue* _work_queue;
-  CMSMarkStack* _revisit_stack;
-  bool const    _should_remember_klasses;
  protected:
   DO_OOP_WORK_DEFN
  public:
@@ -159,10 +182,12 @@
   Prefetch::style prefetch_style() {
     return Prefetch::do_read;
   }
-  virtual const bool should_remember_klasses() const {
-    return _should_remember_klasses;
+  // In support of class unloading
+  virtual const bool should_remember_mdo() const {
+    return false;
+    // return _should_remember_klasses;
   }
-  virtual void remember_klass(Klass* k);
+  virtual void remember_mdo(DataLayout* v);
 };
 
 // The non-parallel version (the parallel version appears further below).
@@ -194,13 +219,18 @@
   inline void do_oop_nv(oop* p)       { MarkRefsIntoAndScanClosure::do_oop_work(p); }
   inline void do_oop_nv(narrowOop* p) { MarkRefsIntoAndScanClosure::do_oop_work(p); }
   bool do_header() { return true; }
-  virtual const bool do_nmethods() const { return true; }
   Prefetch::style prefetch_style() {
     return Prefetch::do_read;
   }
   void set_freelistLock(Mutex* m) {
     _freelistLock = m;
   }
+  virtual const bool should_remember_klasses() const {
+    return _pushAndMarkClosure.should_remember_klasses();
+  }
+  virtual void remember_klass(Klass* k) {
+    _pushAndMarkClosure.remember_klass(k);
+  }
 
  private:
   inline void do_yield_check();
@@ -233,7 +263,16 @@
   inline void do_oop_nv(oop* p)       { Par_MarkRefsIntoAndScanClosure::do_oop_work(p); }
   inline void do_oop_nv(narrowOop* p) { Par_MarkRefsIntoAndScanClosure::do_oop_work(p); }
   bool do_header() { return true; }
-  virtual const bool do_nmethods() const { return true; }
+  // When ScanMarkedObjectsAgainClosure is used,
+  // it passes [Par_]MarkRefsIntoAndScanClosure to oop_oop_iterate(),
+  // and this delegation is used.
+  virtual const bool should_remember_klasses() const {
+    return _par_pushAndMarkClosure.should_remember_klasses();
+  }
+  // See comment on should_remember_klasses() above.
+  virtual void remember_klass(Klass* k) {
+    _par_pushAndMarkClosure.remember_klass(k);
+  }
   Prefetch::style prefetch_style() {
     return Prefetch::do_read;
   }
@@ -243,17 +282,14 @@
 // This closure is used during the concurrent marking phase
 // following the first checkpoint. Its use is buried in
 // the closure MarkFromRootsClosure.
-class PushOrMarkClosure: public OopClosure {
+class PushOrMarkClosure: public KlassRememberingOopClosure {
  private:
-  CMSCollector*   _collector;
   MemRegion       _span;
   CMSBitMap*      _bitMap;
   CMSMarkStack*   _markStack;
-  CMSMarkStack*   _revisitStack;
   HeapWord* const _finger;
   MarkFromRootsClosure* const
                   _parent;
-  bool const      _should_remember_klasses;
  protected:
   DO_OOP_WORK_DEFN
  public:
@@ -268,10 +304,13 @@
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { PushOrMarkClosure::do_oop_work(p); }
   inline void do_oop_nv(narrowOop* p) { PushOrMarkClosure::do_oop_work(p); }
-  virtual const bool should_remember_klasses() const {
-    return _should_remember_klasses;
+  // In support of class unloading
+  virtual const bool should_remember_mdo() const {
+    return false;
+    // return _should_remember_klasses;
   }
-  virtual void remember_klass(Klass* k);
+  virtual void remember_mdo(DataLayout* v);
+
   // Deal with a stack overflow condition
   void handle_stack_overflow(HeapWord* lost);
  private:
@@ -282,20 +321,17 @@
 // This closure is used during the concurrent marking phase
 // following the first checkpoint. Its use is buried in
 // the closure Par_MarkFromRootsClosure.
-class Par_PushOrMarkClosure: public OopClosure {
+class Par_PushOrMarkClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector*    _collector;
   MemRegion        _whole_span;
   MemRegion        _span;        // local chunk
   CMSBitMap*       _bit_map;
   OopTaskQueue*    _work_queue;
   CMSMarkStack*    _overflow_stack;
-  CMSMarkStack*    _revisit_stack;
   HeapWord*  const _finger;
   HeapWord** const _global_finger_addr;
   Par_MarkFromRootsClosure* const
                    _parent;
-  bool const       _should_remember_klasses;
  protected:
   DO_OOP_WORK_DEFN
  public:
@@ -312,10 +348,13 @@
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { Par_PushOrMarkClosure::do_oop_work(p); }
   inline void do_oop_nv(narrowOop* p) { Par_PushOrMarkClosure::do_oop_work(p); }
-  virtual const bool should_remember_klasses() const {
-    return _should_remember_klasses;
+  // In support of class unloading
+  virtual const bool should_remember_mdo() const {
+    return false;
+    // return _should_remember_klasses;
   }
-  virtual void remember_klass(Klass* k);
+  virtual void remember_mdo(DataLayout* v);
+
   // Deal with a stack overflow condition
   void handle_stack_overflow(HeapWord* lost);
  private:
@@ -328,9 +367,8 @@
 // processing phase of the CMS final checkpoint step, as
 // well as during the concurrent precleaning of the discovered
 // reference lists.
-class CMSKeepAliveClosure: public OopClosure {
+class CMSKeepAliveClosure: public KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   const MemRegion _span;
   CMSMarkStack* _mark_stack;
   CMSBitMap*    _bit_map;
@@ -340,14 +378,7 @@
  public:
   CMSKeepAliveClosure(CMSCollector* collector, MemRegion span,
                       CMSBitMap* bit_map, CMSMarkStack* mark_stack,
-                      bool cpc):
-    _collector(collector),
-    _span(span),
-    _bit_map(bit_map),
-    _mark_stack(mark_stack),
-    _concurrent_precleaning(cpc) {
-    assert(!_span.is_empty(), "Empty span could spell trouble");
-  }
+                      CMSMarkStack* revisit_stack, bool cpc);
   bool    concurrent_precleaning() const { return _concurrent_precleaning; }
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
@@ -355,9 +386,8 @@
   inline void do_oop_nv(narrowOop* p) { CMSKeepAliveClosure::do_oop_work(p); }
 };
 
-class CMSInnerParMarkAndPushClosure: public OopClosure {
+class CMSInnerParMarkAndPushClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   MemRegion     _span;
   OopTaskQueue* _work_queue;
   CMSBitMap*    _bit_map;
@@ -366,11 +396,8 @@
  public:
   CMSInnerParMarkAndPushClosure(CMSCollector* collector,
                                 MemRegion span, CMSBitMap* bit_map,
-                                OopTaskQueue* work_queue):
-    _collector(collector),
-    _span(span),
-    _bit_map(bit_map),
-    _work_queue(work_queue) { }
+                                CMSMarkStack* revisit_stack,
+                                OopTaskQueue* work_queue);
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { CMSInnerParMarkAndPushClosure::do_oop_work(p); }
@@ -380,9 +407,8 @@
 // A parallel (MT) version of the above, used when
 // reference processing is parallel; the only difference
 // is in the do_oop method.
-class CMSParKeepAliveClosure: public OopClosure {
+class CMSParKeepAliveClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   MemRegion     _span;
   OopTaskQueue* _work_queue;
   CMSBitMap*    _bit_map;
@@ -394,7 +420,8 @@
   DO_OOP_WORK_DEFN
  public:
   CMSParKeepAliveClosure(CMSCollector* collector, MemRegion span,
-                         CMSBitMap* bit_map, OopTaskQueue* work_queue);
+                         CMSBitMap* bit_map, CMSMarkStack* revisit_stack,
+                         OopTaskQueue* work_queue);
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { CMSParKeepAliveClosure::do_oop_work(p); }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -37,16 +37,34 @@
   }
 }
 
-inline void PushOrMarkClosure::remember_klass(Klass* k) {
-  if (!_revisitStack->push(oop(k))) {
+#ifndef PRODUCT
+void KlassRememberingOopClosure::check_remember_klasses() const {
+  assert(_should_remember_klasses == must_remember_klasses(),
+    "Should remember klasses in this context.");
+}
+#endif
+
+void KlassRememberingOopClosure::remember_klass(Klass* k) {
+  if (!_revisit_stack->push(oop(k))) {
     fatal("Revisit stack overflow in PushOrMarkClosure");
   }
+  check_remember_klasses();
+}
+
+inline void PushOrMarkClosure::remember_mdo(DataLayout* v) {
+  // TBD
 }
 
-inline void Par_PushOrMarkClosure::remember_klass(Klass* k) {
+
+void Par_KlassRememberingOopClosure::remember_klass(Klass* k) {
   if (!_revisit_stack->par_push(oop(k))) {
-    fatal("Revisit stack overflow in PushOrMarkClosure");
+    fatal("Revisit stack overflow in Par_KlassRememberingOopClosure");
   }
+  check_remember_klasses();
+}
+
+inline void Par_PushOrMarkClosure::remember_mdo(DataLayout* v) {
+  // TBD
 }
 
 inline void PushOrMarkClosure::do_yield_check() {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -62,18 +62,15 @@
   // implementation, namely, the simple binary tree (splaying
   // temporarily disabled).
   switch (dictionaryChoice) {
-    case FreeBlockDictionary::dictionaryBinaryTree:
-      _dictionary = new BinaryTreeDictionary(mr);
-      break;
     case FreeBlockDictionary::dictionarySplayTree:
     case FreeBlockDictionary::dictionarySkipList:
     default:
       warning("dictionaryChoice: selected option not understood; using"
               " default BinaryTreeDictionary implementation instead.");
+    case FreeBlockDictionary::dictionaryBinaryTree:
       _dictionary = new BinaryTreeDictionary(mr);
       break;
   }
-  splitBirth(mr.word_size());
   assert(_dictionary != NULL, "CMS dictionary initialization");
   // The indexed free lists are initially all empty and are lazily
   // filled in on demand. Initialize the array elements to NULL.
@@ -388,6 +385,105 @@
   return res;
 }
 
+void CompactibleFreeListSpace::print_indexed_free_lists(outputStream* st)
+const {
+  reportIndexedFreeListStatistics();
+  gclog_or_tty->print_cr("Layout of Indexed Freelists");
+  gclog_or_tty->print_cr("---------------------------");
+  FreeList::print_labels_on(st, "size");
+  for (size_t i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
+    _indexedFreeList[i].print_on(gclog_or_tty);
+    for (FreeChunk* fc = _indexedFreeList[i].head(); fc != NULL;
+         fc = fc->next()) {
+      gclog_or_tty->print_cr("\t[" PTR_FORMAT "," PTR_FORMAT ")  %s",
+                          fc, (HeapWord*)fc + i,
+                          fc->cantCoalesce() ? "\t CC" : "");
+    }
+  }
+}
+
+void CompactibleFreeListSpace::print_promo_info_blocks(outputStream* st)
+const {
+  _promoInfo.print_on(st);
+}
+
+void CompactibleFreeListSpace::print_dictionary_free_lists(outputStream* st)
+const {
+  _dictionary->reportStatistics();
+  st->print_cr("Layout of Freelists in Tree");
+  st->print_cr("---------------------------");
+  _dictionary->print_free_lists(st);
+}
+
+class BlkPrintingClosure: public BlkClosure {
+  const CMSCollector*             _collector;
+  const CompactibleFreeListSpace* _sp;
+  const CMSBitMap*                _live_bit_map;
+  const bool                      _post_remark;
+  outputStream*                   _st;
+public:
+  BlkPrintingClosure(const CMSCollector* collector,
+                     const CompactibleFreeListSpace* sp,
+                     const CMSBitMap* live_bit_map,
+                     outputStream* st):
+    _collector(collector),
+    _sp(sp),
+    _live_bit_map(live_bit_map),
+    _post_remark(collector->abstract_state() > CMSCollector::FinalMarking),
+    _st(st) { }
+  size_t do_blk(HeapWord* addr);
+};
+
+size_t BlkPrintingClosure::do_blk(HeapWord* addr) {
+  size_t sz = _sp->block_size_no_stall(addr, _collector);
+  assert(sz != 0, "Should always be able to compute a size");
+  if (_sp->block_is_obj(addr)) {
+    const bool dead = _post_remark && !_live_bit_map->isMarked(addr);
+    _st->print_cr(PTR_FORMAT ": %s object of size " SIZE_FORMAT "%s",
+      addr,
+      dead ? "dead" : "live",
+      sz,
+      (!dead && CMSPrintObjectsInDump) ? ":" : ".");
+    if (CMSPrintObjectsInDump && !dead) {
+      oop(addr)->print_on(_st);
+      _st->print_cr("--------------------------------------");
+    }
+  } else { // free block
+    _st->print_cr(PTR_FORMAT ": free block of size " SIZE_FORMAT "%s",
+      addr, sz, CMSPrintChunksInDump ? ":" : ".");
+    if (CMSPrintChunksInDump) {
+      ((FreeChunk*)addr)->print_on(_st);
+      _st->print_cr("--------------------------------------");
+    }
+  }
+  return sz;
+}
+
+void CompactibleFreeListSpace::dump_at_safepoint_with_locks(CMSCollector* c,
+  outputStream* st) {
+  st->print_cr("\n=========================");
+  st->print_cr("Block layout in CMS Heap:");
+  st->print_cr("=========================");
+  BlkPrintingClosure  bpcl(c, this, c->markBitMap(), st);
+  blk_iterate(&bpcl);
+
+  st->print_cr("\n=======================================");
+  st->print_cr("Order & Layout of Promotion Info Blocks");
+  st->print_cr("=======================================");
+  print_promo_info_blocks(st);
+
+  st->print_cr("\n===========================");
+  st->print_cr("Order of Indexed Free Lists");
+  st->print_cr("=========================");
+  print_indexed_free_lists(st);
+
+  st->print_cr("\n=================================");
+  st->print_cr("Order of Free Lists in Dictionary");
+  st->print_cr("=================================");
+  print_dictionary_free_lists(st);
+}
+
+
 void CompactibleFreeListSpace::reportFreeListStatistics() const {
   assert_lock_strong(&_freelistLock);
   assert(PrintFLSStatistics != 0, "Reporting error");
@@ -449,37 +545,37 @@
   if (prevEnd != NULL) {
     // Resize the underlying block offset table.
     _bt.resize(pointer_delta(value, bottom()));
-  if (value <= prevEnd) {
-    assert(value >= unallocated_block(), "New end is below unallocated block");
-  } else {
-    // Now, take this new chunk and add it to the free blocks.
-    // Note that the BOT has not yet been updated for this block.
-    size_t newFcSize = pointer_delta(value, prevEnd);
-    // XXX This is REALLY UGLY and should be fixed up. XXX
-    if (!_adaptive_freelists && _smallLinearAllocBlock._ptr == NULL) {
-      // Mark the boundary of the new block in BOT
-      _bt.mark_block(prevEnd, value);
-      // put it all in the linAB
-      if (ParallelGCThreads == 0) {
-        _smallLinearAllocBlock._ptr = prevEnd;
-        _smallLinearAllocBlock._word_size = newFcSize;
-        repairLinearAllocBlock(&_smallLinearAllocBlock);
-      } else { // ParallelGCThreads > 0
-        MutexLockerEx x(parDictionaryAllocLock(),
-                        Mutex::_no_safepoint_check_flag);
-        _smallLinearAllocBlock._ptr = prevEnd;
-        _smallLinearAllocBlock._word_size = newFcSize;
-        repairLinearAllocBlock(&_smallLinearAllocBlock);
+    if (value <= prevEnd) {
+      assert(value >= unallocated_block(), "New end is below unallocated block");
+    } else {
+      // Now, take this new chunk and add it to the free blocks.
+      // Note that the BOT has not yet been updated for this block.
+      size_t newFcSize = pointer_delta(value, prevEnd);
+      // XXX This is REALLY UGLY and should be fixed up. XXX
+      if (!_adaptive_freelists && _smallLinearAllocBlock._ptr == NULL) {
+        // Mark the boundary of the new block in BOT
+        _bt.mark_block(prevEnd, value);
+        // put it all in the linAB
+        if (ParallelGCThreads == 0) {
+          _smallLinearAllocBlock._ptr = prevEnd;
+          _smallLinearAllocBlock._word_size = newFcSize;
+          repairLinearAllocBlock(&_smallLinearAllocBlock);
+        } else { // ParallelGCThreads > 0
+          MutexLockerEx x(parDictionaryAllocLock(),
+                          Mutex::_no_safepoint_check_flag);
+          _smallLinearAllocBlock._ptr = prevEnd;
+          _smallLinearAllocBlock._word_size = newFcSize;
+          repairLinearAllocBlock(&_smallLinearAllocBlock);
+        }
+        // Births of chunks put into a LinAB are not recorded.  Births
+        // of chunks as they are allocated out of a LinAB are.
+      } else {
+        // Add the block to the free lists, if possible coalescing it
+        // with the last free block, and update the BOT and census data.
+        addChunkToFreeListsAtEndRecordingStats(prevEnd, newFcSize);
       }
-      // Births of chunks put into a LinAB are not recorded.  Births
-      // of chunks as they are allocated out of a LinAB are.
-    } else {
-      // Add the block to the free lists, if possible coalescing it
-      // with the last free block, and update the BOT and census data.
-      addChunkToFreeListsAtEndRecordingStats(prevEnd, newFcSize);
     }
   }
-  }
 }
 
 class FreeListSpace_DCTOC : public Filtering_DCTOC {
@@ -732,7 +828,7 @@
 
 void CompactibleFreeListSpace::object_iterate_mem(MemRegion mr,
                                                   UpwardsObjectClosure* cl) {
-  assert_locked();
+  assert_locked(freelistLock());
   NOT_PRODUCT(verify_objects_initialized());
   Space::object_iterate_mem(mr, cl);
 }
@@ -1212,12 +1308,15 @@
 void CompactibleFreeListSpace::assert_locked() const {
   CMSLockVerifier::assert_locked(freelistLock(), parDictionaryAllocLock());
 }
+
+void CompactibleFreeListSpace::assert_locked(const Mutex* lock) const {
+  CMSLockVerifier::assert_locked(lock);
+}
 #endif
 
 FreeChunk* CompactibleFreeListSpace::allocateScratch(size_t size) {
   // In the parallel case, the main thread holds the free list lock
   // on behalf the parallel threads.
-  assert_locked();
   FreeChunk* fc;
   {
     // If GC is parallel, this might be called by several threads.
@@ -1298,17 +1397,18 @@
     res = blk->_ptr;
     _bt.allocated(res, blk->_word_size);
   } else if (size + MinChunkSize <= blk->_refillSize) {
+    size_t sz = blk->_word_size;
     // Update _unallocated_block if the size is such that chunk would be
     // returned to the indexed free list.  All other chunks in the indexed
     // free lists are allocated from the dictionary so that _unallocated_block
     // has already been adjusted for them.  Do it here so that the cost
     // for all chunks added back to the indexed free lists.
-    if (blk->_word_size < SmallForDictionary) {
-      _bt.allocated(blk->_ptr, blk->_word_size);
+    if (sz < SmallForDictionary) {
+      _bt.allocated(blk->_ptr, sz);
     }
     // Return the chunk that isn't big enough, and then refill below.
-    addChunkToFreeLists(blk->_ptr, blk->_word_size);
-    _bt.verify_single_block(blk->_ptr, (blk->_ptr + blk->_word_size));
+    addChunkToFreeLists(blk->_ptr, sz);
+    splitBirth(sz);
     // Don't keep statistics on adding back chunk from a LinAB.
   } else {
     // A refilled block would not satisfy the request.
@@ -1376,11 +1476,13 @@
     res = getChunkFromIndexedFreeListHelper(size);
   }
   _bt.verify_not_unallocated((HeapWord*) res, size);
+  assert(res == NULL || res->size() == size, "Incorrect block size");
   return res;
 }
 
 FreeChunk*
-CompactibleFreeListSpace::getChunkFromIndexedFreeListHelper(size_t size) {
+CompactibleFreeListSpace::getChunkFromIndexedFreeListHelper(size_t size,
+  bool replenish) {
   assert_locked();
   FreeChunk* fc = NULL;
   if (size < SmallForDictionary) {
@@ -1398,54 +1500,66 @@
       // and replenishing indexed lists from the small linAB.
       //
       FreeChunk* newFc = NULL;
-      size_t replenish_size = CMSIndexedFreeListReplenish * size;
+      const size_t replenish_size = CMSIndexedFreeListReplenish * size;
       if (replenish_size < SmallForDictionary) {
         // Do not replenish from an underpopulated size.
         if (_indexedFreeList[replenish_size].surplus() > 0 &&
             _indexedFreeList[replenish_size].head() != NULL) {
-          newFc =
-            _indexedFreeList[replenish_size].getChunkAtHead();
-        } else {
+          newFc = _indexedFreeList[replenish_size].getChunkAtHead();
+        } else if (bestFitFirst()) {
           newFc = bestFitSmall(replenish_size);
         }
       }
-      if (newFc != NULL) {
-        splitDeath(replenish_size);
-      } else if (replenish_size > size) {
+      if (newFc == NULL && replenish_size > size) {
         assert(CMSIndexedFreeListReplenish > 1, "ctl pt invariant");
-        newFc =
-          getChunkFromIndexedFreeListHelper(replenish_size);
+        newFc = getChunkFromIndexedFreeListHelper(replenish_size, false);
       }
+      // Note: The stats update re split-death of block obtained above
+      // will be recorded below precisely when we know we are going to
+      // be actually splitting it into more than one pieces below.
       if (newFc != NULL) {
-        assert(newFc->size() == replenish_size, "Got wrong size");
-        size_t i;
-        FreeChunk *curFc, *nextFc;
-        // carve up and link blocks 0, ..., CMSIndexedFreeListReplenish - 2
-        // The last chunk is not added to the lists but is returned as the
-        // free chunk.
-        for (curFc = newFc, nextFc = (FreeChunk*)((HeapWord*)curFc + size),
-             i = 0;
-             i < (CMSIndexedFreeListReplenish - 1);
-             curFc = nextFc, nextFc = (FreeChunk*)((HeapWord*)nextFc + size),
-             i++) {
+        if  (replenish || CMSReplenishIntermediate) {
+          // Replenish this list and return one block to caller.
+          size_t i;
+          FreeChunk *curFc, *nextFc;
+          size_t num_blk = newFc->size() / size;
+          assert(num_blk >= 1, "Smaller than requested?");
+          assert(newFc->size() % size == 0, "Should be integral multiple of request");
+          if (num_blk > 1) {
+            // we are sure we will be splitting the block just obtained
+            // into multiple pieces; record the split-death of the original
+            splitDeath(replenish_size);
+          }
+          // carve up and link blocks 0, ..., num_blk - 2
+          // The last chunk is not added to the lists but is returned as the
+          // free chunk.
+          for (curFc = newFc, nextFc = (FreeChunk*)((HeapWord*)curFc + size),
+               i = 0;
+               i < (num_blk - 1);
+               curFc = nextFc, nextFc = (FreeChunk*)((HeapWord*)nextFc + size),
+               i++) {
+            curFc->setSize(size);
+            // Don't record this as a return in order to try and
+            // determine the "returns" from a GC.
+            _bt.verify_not_unallocated((HeapWord*) fc, size);
+            _indexedFreeList[size].returnChunkAtTail(curFc, false);
+            _bt.mark_block((HeapWord*)curFc, size);
+            splitBirth(size);
+            // Don't record the initial population of the indexed list
+            // as a split birth.
+          }
+
+          // check that the arithmetic was OK above
+          assert((HeapWord*)nextFc == (HeapWord*)newFc + num_blk*size,
+            "inconsistency in carving newFc");
           curFc->setSize(size);
-          // Don't record this as a return in order to try and
-          // determine the "returns" from a GC.
-          _bt.verify_not_unallocated((HeapWord*) fc, size);
-          _indexedFreeList[size].returnChunkAtTail(curFc, false);
           _bt.mark_block((HeapWord*)curFc, size);
           splitBirth(size);
-          // Don't record the initial population of the indexed list
-          // as a split birth.
+          fc = curFc;
+        } else {
+          // Return entire block to caller
+          fc = newFc;
         }
-
-        // check that the arithmetic was OK above
-        assert((HeapWord*)nextFc == (HeapWord*)newFc + replenish_size,
-          "inconsistency in carving newFc");
-        curFc->setSize(size);
-        _bt.mark_block((HeapWord*)curFc, size);
-        splitBirth(size);
-        return curFc;
       }
     }
   } else {
@@ -1453,7 +1567,7 @@
     // replenish the indexed free list.
     fc = getChunkFromDictionaryExact(size);
   }
-  assert(fc == NULL || fc->isFree(), "Should be returning a free chunk");
+  // assert(fc == NULL || fc->isFree(), "Should be returning a free chunk");
   return fc;
 }
 
@@ -1512,6 +1626,11 @@
   // adjust _unallocated_block downward, as necessary
   _bt.freed((HeapWord*)chunk, size);
   _dictionary->returnChunk(chunk);
+#ifndef PRODUCT
+  if (CMSCollector::abstract_state() != CMSCollector::Sweeping) {
+    TreeChunk::as_TreeChunk(chunk)->list()->verify_stats();
+  }
+#endif // PRODUCT
 }
 
 void
@@ -1525,6 +1644,11 @@
   } else {
     _indexedFreeList[size].returnChunkAtHead(fc);
   }
+#ifndef PRODUCT
+  if (CMSCollector::abstract_state() != CMSCollector::Sweeping) {
+     _indexedFreeList[size].verify_stats();
+  }
+#endif // PRODUCT
 }
 
 // Add chunk to end of last block -- if it's the largest
@@ -1537,7 +1661,6 @@
   HeapWord* chunk, size_t     size) {
   // check that the chunk does lie in this space!
   assert(chunk != NULL && is_in_reserved(chunk), "Not in this space!");
-  assert_locked();
   // One of the parallel gc task threads may be here
   // whilst others are allocating.
   Mutex* lock = NULL;
@@ -1991,24 +2114,26 @@
   return frag;
 }
 
-#define CoalSurplusPercent 1.05
-#define SplitSurplusPercent 1.10
-
 void CompactibleFreeListSpace::beginSweepFLCensus(
   float inter_sweep_current,
-  float inter_sweep_estimate) {
+  float inter_sweep_estimate,
+  float intra_sweep_estimate) {
   assert_locked();
   size_t i;
   for (i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
     FreeList* fl    = &_indexedFreeList[i];
-    fl->compute_desired(inter_sweep_current, inter_sweep_estimate);
-    fl->set_coalDesired((ssize_t)((double)fl->desired() * CoalSurplusPercent));
+    if (PrintFLSStatistics > 1) {
+      gclog_or_tty->print("size[%d] : ", i);
+    }
+    fl->compute_desired(inter_sweep_current, inter_sweep_estimate, intra_sweep_estimate);
+    fl->set_coalDesired((ssize_t)((double)fl->desired() * CMSSmallCoalSurplusPercent));
     fl->set_beforeSweep(fl->count());
     fl->set_bfrSurp(fl->surplus());
   }
-  _dictionary->beginSweepDictCensus(CoalSurplusPercent,
+  _dictionary->beginSweepDictCensus(CMSLargeCoalSurplusPercent,
                                     inter_sweep_current,
-                                    inter_sweep_estimate);
+                                    inter_sweep_estimate,
+                                    intra_sweep_estimate);
 }
 
 void CompactibleFreeListSpace::setFLSurplus() {
@@ -2017,7 +2142,7 @@
   for (i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
     FreeList *fl = &_indexedFreeList[i];
     fl->set_surplus(fl->count() -
-                    (ssize_t)((double)fl->desired() * SplitSurplusPercent));
+                    (ssize_t)((double)fl->desired() * CMSSmallSplitSurplusPercent));
   }
 }
 
@@ -2048,6 +2173,11 @@
 }
 
 void CompactibleFreeListSpace::endSweepFLCensus(size_t sweep_count) {
+  if (PrintFLSStatistics > 0) {
+    HeapWord* largestAddr = (HeapWord*) dictionary()->findLargestDict();
+    gclog_or_tty->print_cr("CMS: Large block " PTR_FORMAT,
+                           largestAddr);
+  }
   setFLSurplus();
   setFLHints();
   if (PrintGC && PrintFLSCensus > 0) {
@@ -2055,7 +2185,7 @@
   }
   clearFLCensus();
   assert_locked();
-  _dictionary->endSweepDictCensus(SplitSurplusPercent);
+  _dictionary->endSweepDictCensus(CMSLargeSplitSurplusPercent);
 }
 
 bool CompactibleFreeListSpace::coalOverPopulated(size_t size) {
@@ -2312,13 +2442,18 @@
 }
 
 void CompactibleFreeListSpace::verifyIndexedFreeList(size_t size) const {
-  FreeChunk* fc =  _indexedFreeList[size].head();
+  FreeChunk* fc   =  _indexedFreeList[size].head();
+  FreeChunk* tail =  _indexedFreeList[size].tail();
+  size_t    num = _indexedFreeList[size].count();
+  size_t      n = 0;
   guarantee((size % 2 == 0) || fc == NULL, "Odd slots should be empty");
-  for (; fc != NULL; fc = fc->next()) {
+  for (; fc != NULL; fc = fc->next(), n++) {
     guarantee(fc->size() == size, "Size inconsistency");
     guarantee(fc->isFree(), "!free?");
     guarantee(fc->next() == NULL || fc->next()->prev() == fc, "Broken list");
+    guarantee((fc->next() == NULL) == (fc == tail), "Incorrect tail");
   }
+  guarantee(n == num, "Incorrect count");
 }
 
 #ifndef PRODUCT
@@ -2516,11 +2651,41 @@
   _tracking = true;
 }
 
-void PromotionInfo::stopTrackingPromotions() {
+#define CMSPrintPromoBlockInfo 1
+
+void PromotionInfo::stopTrackingPromotions(uint worker_id) {
   assert(_spoolHead == _spoolTail && _firstIndex == _nextIndex,
          "spooling inconsistency?");
   _firstIndex = _nextIndex = 1;
   _tracking = false;
+  if (CMSPrintPromoBlockInfo > 1) {
+    print_statistics(worker_id);
+  }
+}
+
+void PromotionInfo::print_statistics(uint worker_id) const {
+  assert(_spoolHead == _spoolTail && _firstIndex == _nextIndex,
+         "Else will undercount");
+  assert(CMSPrintPromoBlockInfo > 0, "Else unnecessary call");
+  // Count the number of blocks and slots in the free pool
+  size_t slots  = 0;
+  size_t blocks = 0;
+  for (SpoolBlock* cur_spool = _spareSpool;
+       cur_spool != NULL;
+       cur_spool = cur_spool->nextSpoolBlock) {
+    // the first entry is just a self-pointer; indices 1 through
+    // bufferSize - 1 are occupied (thus, bufferSize - 1 slots).
+    guarantee((void*)cur_spool->displacedHdr == (void*)&cur_spool->displacedHdr,
+              "first entry of displacedHdr should be self-referential");
+    slots += cur_spool->bufferSize - 1;
+    blocks++;
+  }
+  if (_spoolHead != NULL) {
+    slots += _spoolHead->bufferSize - 1;
+    blocks++;
+  }
+  gclog_or_tty->print_cr(" [worker %d] promo_blocks = %d, promo_slots = %d ",
+                         worker_id, blocks, slots);
 }
 
 // When _spoolTail is not NULL, then the slot <_spoolTail, _nextIndex>
@@ -2584,15 +2749,84 @@
   guarantee(numDisplacedHdrs == numObjsWithDisplacedHdrs, "Displaced hdr count");
 }
 
+void PromotionInfo::print_on(outputStream* st) const {
+  SpoolBlock* curSpool = NULL;
+  size_t i = 0;
+  st->print_cr("start & end indices: [" SIZE_FORMAT ", " SIZE_FORMAT ")",
+               _firstIndex, _nextIndex);
+  for (curSpool = _spoolHead; curSpool != _spoolTail && curSpool != NULL;
+       curSpool = curSpool->nextSpoolBlock) {
+    curSpool->print_on(st);
+    st->print_cr(" active ");
+    i++;
+  }
+  for (curSpool = _spoolTail; curSpool != NULL;
+       curSpool = curSpool->nextSpoolBlock) {
+    curSpool->print_on(st);
+    st->print_cr(" inactive ");
+    i++;
+  }
+  for (curSpool = _spareSpool; curSpool != NULL;
+       curSpool = curSpool->nextSpoolBlock) {
+    curSpool->print_on(st);
+    st->print_cr(" free ");
+    i++;
+  }
+  st->print_cr(SIZE_FORMAT " header spooling blocks", i);
+}
+
+void SpoolBlock::print_on(outputStream* st) const {
+  st->print("[" PTR_FORMAT "," PTR_FORMAT "), " SIZE_FORMAT " HeapWords -> " PTR_FORMAT,
+            this, (HeapWord*)displacedHdr + bufferSize,
+            bufferSize, nextSpoolBlock);
+}
+
+///////////////////////////////////////////////////////////////////////////
+// CFLS_LAB
+///////////////////////////////////////////////////////////////////////////
+
+#define VECTOR_257(x)                                                                                  \
+  /* 1  2  3  4  5  6  7  8  9 1x 11 12 13 14 15 16 17 18 19 2x 21 22 23 24 25 26 27 28 29 3x 31 32 */ \
+  {  x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,   \
+     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,   \
+     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,   \
+     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,   \
+     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,   \
+     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,   \
+     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,   \
+     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,   \
+     x }
+
+// Initialize with default setting of CMSParPromoteBlocksToClaim, _not_
+// OldPLABSize, whose static default is different; if overridden at the
+// command-line, this will get reinitialized via a call to
+// modify_initialization() below.
+AdaptiveWeightedAverage CFLS_LAB::_blocks_to_claim[]    =
+  VECTOR_257(AdaptiveWeightedAverage(OldPLABWeight, (float)CMSParPromoteBlocksToClaim));
+size_t CFLS_LAB::_global_num_blocks[]  = VECTOR_257(0);
+int    CFLS_LAB::_global_num_workers[] = VECTOR_257(0);
 
 CFLS_LAB::CFLS_LAB(CompactibleFreeListSpace* cfls) :
   _cfls(cfls)
 {
-  _blocks_to_claim = CMSParPromoteBlocksToClaim;
+  assert(CompactibleFreeListSpace::IndexSetSize == 257, "Modify VECTOR_257() macro above");
   for (size_t i = CompactibleFreeListSpace::IndexSetStart;
        i < CompactibleFreeListSpace::IndexSetSize;
        i += CompactibleFreeListSpace::IndexSetStride) {
     _indexedFreeList[i].set_size(i);
+    _num_blocks[i] = 0;
+  }
+}
+
+static bool _CFLS_LAB_modified = false;
+
+void CFLS_LAB::modify_initialization(size_t n, unsigned wt) {
+  assert(!_CFLS_LAB_modified, "Call only once");
+  _CFLS_LAB_modified = true;
+  for (size_t i = CompactibleFreeListSpace::IndexSetStart;
+       i < CompactibleFreeListSpace::IndexSetSize;
+       i += CompactibleFreeListSpace::IndexSetStride) {
+    _blocks_to_claim[i].modify(n, wt, true /* force */);
   }
 }
 
@@ -2607,11 +2841,9 @@
     if (res == NULL) return NULL;
   } else {
     FreeList* fl = &_indexedFreeList[word_sz];
-    bool filled = false; //TRAP
     if (fl->count() == 0) {
-      bool filled = true; //TRAP
       // Attempt to refill this local free list.
-      _cfls->par_get_chunk_of_blocks(word_sz, _blocks_to_claim, fl);
+      get_from_global_pool(word_sz, fl);
       // If it didn't work, give up.
       if (fl->count() == 0) return NULL;
     }
@@ -2626,80 +2858,190 @@
   return (HeapWord*)res;
 }
 
-void CFLS_LAB::retire() {
-  for (size_t i = CompactibleFreeListSpace::IndexSetStart;
+// Get a chunk of blocks of the right size and update related
+// book-keeping stats
+void CFLS_LAB::get_from_global_pool(size_t word_sz, FreeList* fl) {
+  // Get the #blocks we want to claim
+  size_t n_blks = (size_t)_blocks_to_claim[word_sz].average();
+  assert(n_blks > 0, "Error");
+  assert(ResizePLAB || n_blks == OldPLABSize, "Error");
+  // In some cases, when the application has a phase change,
+  // there may be a sudden and sharp shift in the object survival
+  // profile, and updating the counts at the end of a scavenge
+  // may not be quick enough, giving rise to large scavenge pauses
+  // during these phase changes. It is beneficial to detect such
+  // changes on-the-fly during a scavenge and avoid such a phase-change
+  // pothole. The following code is a heuristic attempt to do that.
+  // It is protected by a product flag until we have gained
+  // enough experience with this heuristic and fine-tuned its behaviour.
+  // WARNING: This might increase fragmentation if we overreact to
+  // small spikes, so some kind of historical smoothing based on
+  // previous experience with the greater reactivity might be useful.
+  // Lacking sufficient experience, CMSOldPLABResizeQuicker is disabled by
+  // default.
+  if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
+    size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
+    n_blks +=  CMSOldPLABReactivityFactor*multiple*n_blks;
+    n_blks = MIN2(n_blks, CMSOldPLABMax);
+  }
+  assert(n_blks > 0, "Error");
+  _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
+  // Update stats table entry for this block size
+  _num_blocks[word_sz] += fl->count();
+}
+
+void CFLS_LAB::compute_desired_plab_size() {
+  for (size_t i =  CompactibleFreeListSpace::IndexSetStart;
        i < CompactibleFreeListSpace::IndexSetSize;
        i += CompactibleFreeListSpace::IndexSetStride) {
-    if (_indexedFreeList[i].count() > 0) {
-      MutexLockerEx x(_cfls->_indexedFreeListParLocks[i],
-                      Mutex::_no_safepoint_check_flag);
-      _cfls->_indexedFreeList[i].prepend(&_indexedFreeList[i]);
-      // Reset this list.
-      _indexedFreeList[i] = FreeList();
-      _indexedFreeList[i].set_size(i);
+    assert((_global_num_workers[i] == 0) == (_global_num_blocks[i] == 0),
+           "Counter inconsistency");
+    if (_global_num_workers[i] > 0) {
+      // Need to smooth wrt historical average
+      if (ResizeOldPLAB) {
+        _blocks_to_claim[i].sample(
+          MAX2((size_t)CMSOldPLABMin,
+          MIN2((size_t)CMSOldPLABMax,
+               _global_num_blocks[i]/(_global_num_workers[i]*CMSOldPLABNumRefills))));
+      }
+      // Reset counters for next round
+      _global_num_workers[i] = 0;
+      _global_num_blocks[i] = 0;
+      if (PrintOldPLAB) {
+        gclog_or_tty->print_cr("[%d]: %d", i, (size_t)_blocks_to_claim[i].average());
+      }
     }
   }
 }
 
-void
-CompactibleFreeListSpace::
-par_get_chunk_of_blocks(size_t word_sz, size_t n, FreeList* fl) {
+void CFLS_LAB::retire(int tid) {
+  // We run this single threaded with the world stopped;
+  // so no need for locks and such.
+#define CFLS_LAB_PARALLEL_ACCESS 0
+  NOT_PRODUCT(Thread* t = Thread::current();)
+  assert(Thread::current()->is_VM_thread(), "Error");
+  assert(CompactibleFreeListSpace::IndexSetStart == CompactibleFreeListSpace::IndexSetStride,
+         "Will access to uninitialized slot below");
+#if CFLS_LAB_PARALLEL_ACCESS
+  for (size_t i = CompactibleFreeListSpace::IndexSetSize - 1;
+       i > 0;
+       i -= CompactibleFreeListSpace::IndexSetStride) {
+#else // CFLS_LAB_PARALLEL_ACCESS
+  for (size_t i =  CompactibleFreeListSpace::IndexSetStart;
+       i < CompactibleFreeListSpace::IndexSetSize;
+       i += CompactibleFreeListSpace::IndexSetStride) {
+#endif // !CFLS_LAB_PARALLEL_ACCESS
+    assert(_num_blocks[i] >= (size_t)_indexedFreeList[i].count(),
+           "Can't retire more than what we obtained");
+    if (_num_blocks[i] > 0) {
+      size_t num_retire =  _indexedFreeList[i].count();
+      assert(_num_blocks[i] > num_retire, "Should have used at least one");
+      {
+#if CFLS_LAB_PARALLEL_ACCESS
+        MutexLockerEx x(_cfls->_indexedFreeListParLocks[i],
+                        Mutex::_no_safepoint_check_flag);
+#endif // CFLS_LAB_PARALLEL_ACCESS
+        // Update globals stats for num_blocks used
+        _global_num_blocks[i] += (_num_blocks[i] - num_retire);
+        _global_num_workers[i]++;
+        assert(_global_num_workers[i] <= (ssize_t)ParallelGCThreads, "Too big");
+        if (num_retire > 0) {
+          _cfls->_indexedFreeList[i].prepend(&_indexedFreeList[i]);
+          // Reset this list.
+          _indexedFreeList[i] = FreeList();
+          _indexedFreeList[i].set_size(i);
+        }
+      }
+      if (PrintOldPLAB) {
+        gclog_or_tty->print_cr("%d[%d]: %d/%d/%d",
+                               tid, i, num_retire, _num_blocks[i], (size_t)_blocks_to_claim[i].average());
+      }
+      // Reset stats for next round
+      _num_blocks[i]         = 0;
+    }
+  }
+}
+
+void CompactibleFreeListSpace:: par_get_chunk_of_blocks(size_t word_sz, size_t n, FreeList* fl) {
   assert(fl->count() == 0, "Precondition.");
   assert(word_sz < CompactibleFreeListSpace::IndexSetSize,
          "Precondition");
 
-  // We'll try all multiples of word_sz in the indexed set (starting with
-  // word_sz itself), then try getting a big chunk and splitting it.
-  int k = 1;
-  size_t cur_sz = k * word_sz;
-  bool found = false;
-  while (cur_sz < CompactibleFreeListSpace::IndexSetSize && k == 1) {
-    FreeList* gfl = &_indexedFreeList[cur_sz];
-    FreeList fl_for_cur_sz;  // Empty.
-    fl_for_cur_sz.set_size(cur_sz);
-    {
-      MutexLockerEx x(_indexedFreeListParLocks[cur_sz],
-                      Mutex::_no_safepoint_check_flag);
-      if (gfl->count() != 0) {
-        size_t nn = MAX2(n/k, (size_t)1);
-        gfl->getFirstNChunksFromList(nn, &fl_for_cur_sz);
-        found = true;
+  // We'll try all multiples of word_sz in the indexed set, starting with
+  // word_sz itself and, if CMSSplitIndexedFreeListBlocks, try larger multiples,
+  // then try getting a big chunk and splitting it.
+  {
+    bool found;
+    int  k;
+    size_t cur_sz;
+    for (k = 1, cur_sz = k * word_sz, found = false;
+         (cur_sz < CompactibleFreeListSpace::IndexSetSize) &&
+         (CMSSplitIndexedFreeListBlocks || k <= 1);
+         k++, cur_sz = k * word_sz) {
+      FreeList* gfl = &_indexedFreeList[cur_sz];
+      FreeList fl_for_cur_sz;  // Empty.
+      fl_for_cur_sz.set_size(cur_sz);
+      {
+        MutexLockerEx x(_indexedFreeListParLocks[cur_sz],
+                        Mutex::_no_safepoint_check_flag);
+        if (gfl->count() != 0) {
+          // nn is the number of chunks of size cur_sz that
+          // we'd need to split k-ways each, in order to create
+          // "n" chunks of size word_sz each.
+          const size_t nn = MAX2(n/k, (size_t)1);
+          gfl->getFirstNChunksFromList(nn, &fl_for_cur_sz);
+          found = true;
+          if (k > 1) {
+            // Update split death stats for the cur_sz-size blocks list:
+            // we increment the split death count by the number of blocks
+            // we just took from the cur_sz-size blocks list and which
+            // we will be splitting below.
+            ssize_t deaths = _indexedFreeList[cur_sz].splitDeaths() +
+                             fl_for_cur_sz.count();
+            _indexedFreeList[cur_sz].set_splitDeaths(deaths);
+          }
+        }
+      }
+      // Now transfer fl_for_cur_sz to fl.  Common case, we hope, is k = 1.
+      if (found) {
+        if (k == 1) {
+          fl->prepend(&fl_for_cur_sz);
+        } else {
+          // Divide each block on fl_for_cur_sz up k ways.
+          FreeChunk* fc;
+          while ((fc = fl_for_cur_sz.getChunkAtHead()) != NULL) {
+            // Must do this in reverse order, so that anybody attempting to
+            // access the main chunk sees it as a single free block until we
+            // change it.
+            size_t fc_size = fc->size();
+            for (int i = k-1; i >= 0; i--) {
+              FreeChunk* ffc = (FreeChunk*)((HeapWord*)fc + i * word_sz);
+              ffc->setSize(word_sz);
+              ffc->linkNext(NULL);
+              ffc->linkPrev(NULL); // Mark as a free block for other (parallel) GC threads.
+              // Above must occur before BOT is updated below.
+              // splitting from the right, fc_size == (k - i + 1) * wordsize
+              _bt.mark_block((HeapWord*)ffc, word_sz);
+              fc_size -= word_sz;
+              _bt.verify_not_unallocated((HeapWord*)ffc, ffc->size());
+              _bt.verify_single_block((HeapWord*)fc, fc_size);
+              _bt.verify_single_block((HeapWord*)ffc, ffc->size());
+              // Push this on "fl".
+              fl->returnChunkAtHead(ffc);
+            }
+            // TRAP
+            assert(fl->tail()->next() == NULL, "List invariant.");
+          }
+        }
+        // Update birth stats for this block size.
+        size_t num = fl->count();
+        MutexLockerEx x(_indexedFreeListParLocks[word_sz],
+                        Mutex::_no_safepoint_check_flag);
+        ssize_t births = _indexedFreeList[word_sz].splitBirths() + num;
+        _indexedFreeList[word_sz].set_splitBirths(births);
+        return;
       }
     }
-    // Now transfer fl_for_cur_sz to fl.  Common case, we hope, is k = 1.
-    if (found) {
-      if (k == 1) {
-        fl->prepend(&fl_for_cur_sz);
-      } else {
-        // Divide each block on fl_for_cur_sz up k ways.
-        FreeChunk* fc;
-        while ((fc = fl_for_cur_sz.getChunkAtHead()) != NULL) {
-          // Must do this in reverse order, so that anybody attempting to
-          // access the main chunk sees it as a single free block until we
-          // change it.
-          size_t fc_size = fc->size();
-          for (int i = k-1; i >= 0; i--) {
-            FreeChunk* ffc = (FreeChunk*)((HeapWord*)fc + i * word_sz);
-            ffc->setSize(word_sz);
-            ffc->linkNext(NULL);
-            ffc->linkPrev(NULL); // Mark as a free block for other (parallel) GC threads.
-            // Above must occur before BOT is updated below.
-            // splitting from the right, fc_size == (k - i + 1) * wordsize
-            _bt.mark_block((HeapWord*)ffc, word_sz);
-            fc_size -= word_sz;
-            _bt.verify_not_unallocated((HeapWord*)ffc, ffc->size());
-            _bt.verify_single_block((HeapWord*)fc, fc_size);
-            _bt.verify_single_block((HeapWord*)ffc, ffc->size());
-            // Push this on "fl".
-            fl->returnChunkAtHead(ffc);
-          }
-          // TRAP
-          assert(fl->tail()->next() == NULL, "List invariant.");
-        }
-      }
-      return;
-    }
-    k++; cur_sz = k * word_sz;
   }
   // Otherwise, we'll split a block from the dictionary.
   FreeChunk* fc = NULL;
@@ -2723,17 +3065,31 @@
       }
     }
     if (fc == NULL) return;
+    assert((ssize_t)n >= 1, "Control point invariant");
     // Otherwise, split up that block.
-    size_t nn = fc->size() / word_sz;
+    const size_t nn = fc->size() / word_sz;
     n = MIN2(nn, n);
+    assert((ssize_t)n >= 1, "Control point invariant");
     rem = fc->size() - n * word_sz;
     // If there is a remainder, and it's too small, allocate one fewer.
     if (rem > 0 && rem < MinChunkSize) {
       n--; rem += word_sz;
     }
+    // Note that at this point we may have n == 0.
+    assert((ssize_t)n >= 0, "Control point invariant");
+
+    // If n is 0, the chunk fc that was found is not large
+    // enough to leave a viable remainder.  We are unable to
+    // allocate even one block.  Return fc to the
+    // dictionary and return, leaving "fl" empty.
+    if (n == 0) {
+      returnChunkToDictionary(fc);
+      return;
+    }
+
     // First return the remainder, if any.
     // Note that we hold the lock until we decide if we're going to give
-    // back the remainder to the dictionary, since a contending allocator
+    // back the remainder to the dictionary, since a concurrent allocation
     // may otherwise see the heap as empty.  (We're willing to take that
     // hit if the block is a small block.)
     if (rem > 0) {
@@ -2743,18 +3099,16 @@
       rem_fc->linkNext(NULL);
       rem_fc->linkPrev(NULL); // Mark as a free block for other (parallel) GC threads.
       // Above must occur before BOT is updated below.
+      assert((ssize_t)n > 0 && prefix_size > 0 && rem_fc > fc, "Error");
       _bt.split_block((HeapWord*)fc, fc->size(), prefix_size);
       if (rem >= IndexSetSize) {
         returnChunkToDictionary(rem_fc);
-        dictionary()->dictCensusUpdate(fc->size(),
-                                       true /*split*/,
-                                       true /*birth*/);
+        dictionary()->dictCensusUpdate(rem, true /*split*/, true /*birth*/);
         rem_fc = NULL;
       }
       // Otherwise, return it to the small list below.
     }
   }
-  //
   if (rem_fc != NULL) {
     MutexLockerEx x(_indexedFreeListParLocks[rem],
                     Mutex::_no_safepoint_check_flag);
@@ -2762,7 +3116,7 @@
     _indexedFreeList[rem].returnChunkAtHead(rem_fc);
     smallSplitBirth(rem);
   }
-
+  assert((ssize_t)n > 0 && fc != NULL, "Consistency");
   // Now do the splitting up.
   // Must do this in reverse order, so that anybody attempting to
   // access the main chunk sees it as a single free block until we
@@ -2792,13 +3146,15 @@
   _bt.verify_single_block((HeapWord*)fc, fc->size());
   fl->returnChunkAtHead(fc);
 
+  assert((ssize_t)n > 0 && (ssize_t)n == fl->count(), "Incorrect number of blocks");
   {
+    // Update the stats for this block size.
     MutexLockerEx x(_indexedFreeListParLocks[word_sz],
                     Mutex::_no_safepoint_check_flag);
-    ssize_t new_births = _indexedFreeList[word_sz].splitBirths() + n;
-    _indexedFreeList[word_sz].set_splitBirths(new_births);
-    ssize_t new_surplus = _indexedFreeList[word_sz].surplus() + n;
-    _indexedFreeList[word_sz].set_surplus(new_surplus);
+    const ssize_t births = _indexedFreeList[word_sz].splitBirths() + n;
+    _indexedFreeList[word_sz].set_splitBirths(births);
+    // ssize_t new_surplus = _indexedFreeList[word_sz].surplus() + n;
+    // _indexedFreeList[word_sz].set_surplus(new_surplus);
   }
 
   // TRAP
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -25,8 +25,6 @@
 // Classes in support of keeping track of promotions into a non-Contiguous
 // space, in this case a CompactibleFreeListSpace.
 
-#define CFLS_LAB_REFILL_STATS 0
-
 // Forward declarations
 class CompactibleFreeListSpace;
 class BlkClosure;
@@ -89,6 +87,9 @@
     displacedHdr = (markOop*)&displacedHdr;
     nextSpoolBlock = NULL;
   }
+
+  void print_on(outputStream* st) const;
+  void print() const { print_on(gclog_or_tty); }
 };
 
 class PromotionInfo VALUE_OBJ_CLASS_SPEC {
@@ -121,7 +122,7 @@
     return _promoHead == NULL;
   }
   void startTrackingPromotions();
-  void stopTrackingPromotions();
+  void stopTrackingPromotions(uint worker_id = 0);
   bool tracking() const          { return _tracking;  }
   void track(PromotedObject* trackOop);      // keep track of a promoted oop
   // The following variant must be used when trackOop is not fully
@@ -161,6 +162,9 @@
     _nextIndex = 0;
 
   }
+
+  void print_on(outputStream* st) const;
+  void print_statistics(uint worker_id) const;
 };
 
 class LinearAllocBlock VALUE_OBJ_CLASS_SPEC {
@@ -243,6 +247,7 @@
   mutable Mutex _freelistLock;
   // locking verifier convenience function
   void assert_locked() const PRODUCT_RETURN;
+  void assert_locked(const Mutex* lock) const PRODUCT_RETURN;
 
   // Linear allocation blocks
   LinearAllocBlock _smallLinearAllocBlock;
@@ -281,13 +286,6 @@
   // Locks protecting the exact lists during par promotion allocation.
   Mutex* _indexedFreeListParLocks[IndexSetSize];
 
-#if CFLS_LAB_REFILL_STATS
-  // Some statistics.
-  jint  _par_get_chunk_from_small;
-  jint  _par_get_chunk_from_large;
-#endif
-
-
   // Attempt to obtain up to "n" blocks of the size "word_sz" (which is
   // required to be smaller than "IndexSetSize".)  If successful,
   // adds them to "fl", which is required to be an empty free list.
@@ -320,7 +318,7 @@
   // Helper function for getChunkFromIndexedFreeList.
   // Replenish the indexed free list for this "size".  Do not take from an
   // underpopulated size.
-  FreeChunk*  getChunkFromIndexedFreeListHelper(size_t size);
+  FreeChunk*  getChunkFromIndexedFreeListHelper(size_t size, bool replenish = true);
 
   // Get a chunk from the indexed free list.  If the indexed free list
   // does not have a free chunk, try to replenish the indexed free list
@@ -430,10 +428,6 @@
   void initialize_sequential_subtasks_for_marking(int n_threads,
          HeapWord* low = NULL);
 
-#if CFLS_LAB_REFILL_STATS
-  void print_par_alloc_stats();
-#endif
-
   // Space enquiries
   size_t used() const;
   size_t free() const;
@@ -617,6 +611,12 @@
   // Do some basic checks on the the free lists.
   void checkFreeListConsistency()         const PRODUCT_RETURN;
 
+  // Printing support
+  void dump_at_safepoint_with_locks(CMSCollector* c, outputStream* st);
+  void print_indexed_free_lists(outputStream* st) const;
+  void print_dictionary_free_lists(outputStream* st) const;
+  void print_promo_info_blocks(outputStream* st) const;
+
   NOT_PRODUCT (
     void initializeIndexedFreeListArrayReturnedBytes();
     size_t sumIndexedFreeListArrayReturnedBytes();
@@ -638,8 +638,9 @@
 
   // Statistics functions
   // Initialize census for lists before the sweep.
-  void beginSweepFLCensus(float sweep_current,
-                          float sweep_estimate);
+  void beginSweepFLCensus(float inter_sweep_current,
+                          float inter_sweep_estimate,
+                          float intra_sweep_estimate);
   // Set the surplus for each of the free lists.
   void setFLSurplus();
   // Set the hint for each of the free lists.
@@ -730,16 +731,17 @@
   FreeList _indexedFreeList[CompactibleFreeListSpace::IndexSetSize];
 
   // Initialized from a command-line arg.
-  size_t _blocks_to_claim;
 
-#if CFLS_LAB_REFILL_STATS
-  // Some statistics.
-  int _refills;
-  int _blocksTaken;
-  static int _tot_refills;
-  static int _tot_blocksTaken;
-  static int _next_threshold;
-#endif
+  // Allocation statistics in support of dynamic adjustment of
+  // #blocks to claim per get_from_global_pool() call below.
+  static AdaptiveWeightedAverage
+                 _blocks_to_claim  [CompactibleFreeListSpace::IndexSetSize];
+  static size_t _global_num_blocks [CompactibleFreeListSpace::IndexSetSize];
+  static int    _global_num_workers[CompactibleFreeListSpace::IndexSetSize];
+  size_t        _num_blocks        [CompactibleFreeListSpace::IndexSetSize];
+
+  // Internal work method
+  void get_from_global_pool(size_t word_sz, FreeList* fl);
 
 public:
   CFLS_LAB(CompactibleFreeListSpace* cfls);
@@ -748,7 +750,12 @@
   HeapWord* alloc(size_t word_sz);
 
   // Return any unused portions of the buffer to the global pool.
-  void retire();
+  void retire(int tid);
+
+  // Dynamic OldPLABSize sizing
+  static void compute_desired_plab_size();
+  // When the settings are modified from default static initialization
+  static void modify_initialization(size_t n, unsigned wt);
 };
 
 size_t PromotionInfo::refillSize() const {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -253,7 +253,6 @@
   }
 }
 
-
 void ConcurrentMarkSweepGeneration::ref_processor_init() {
   assert(collector() != NULL, "no collector");
   collector()->ref_processor_init();
@@ -341,6 +340,14 @@
   _icms_duty_cycle = CMSIncrementalDutyCycle;
 }
 
+double CMSStats::cms_free_adjustment_factor(size_t free) const {
+  // TBD: CR 6909490
+  return 1.0;
+}
+
+void CMSStats::adjust_cms_free_adjustment_factor(bool fail, size_t free) {
+}
+
 // If promotion failure handling is on use
 // the padded average size of the promotion for each
 // young generation collection.
@@ -361,7 +368,11 @@
 
     // Adjust by the safety factor.
     double cms_free_dbl = (double)cms_free;
-    cms_free_dbl = cms_free_dbl * (100.0 - CMSIncrementalSafetyFactor) / 100.0;
+    double cms_adjustment = (100.0 - CMSIncrementalSafetyFactor)/100.0;
+    // Apply a further correction factor which tries to adjust
+    // for recent occurance of concurrent mode failures.
+    cms_adjustment = cms_adjustment * cms_free_adjustment_factor(cms_free);
+    cms_free_dbl = cms_free_dbl * cms_adjustment;
 
     if (PrintGCDetails && Verbose) {
       gclog_or_tty->print_cr("CMSStats::time_until_cms_gen_full: cms_free "
@@ -395,6 +406,8 @@
   // late.
   double work = cms_duration() + gc0_period();
   double deadline = time_until_cms_gen_full();
+  // If a concurrent mode failure occurred recently, we want to be
+  // more conservative and halve our expected time_until_cms_gen_full()
   if (work > deadline) {
     if (Verbose && PrintGCDetails) {
       gclog_or_tty->print(
@@ -556,7 +569,8 @@
   _should_unload_classes(false),
   _concurrent_cycles_since_last_unload(0),
   _roots_scanning_options(0),
-  _sweep_estimate(CMS_SweepWeight, CMS_SweepPadding)
+  _inter_sweep_estimate(CMS_SweepWeight, CMS_SweepPadding),
+  _intra_sweep_estimate(CMS_SweepWeight, CMS_SweepPadding)
 {
   if (ExplicitGCInvokesConcurrentAndUnloadsClasses) {
     ExplicitGCInvokesConcurrent = true;
@@ -592,7 +606,7 @@
     assert(_modUnionTable.covers(_span), "_modUnionTable inconsistency?");
   }
 
-  if (!_markStack.allocate(CMSMarkStackSize)) {
+  if (!_markStack.allocate(MarkStackSize)) {
     warning("Failed to allocate CMS Marking Stack");
     return;
   }
@@ -603,13 +617,13 @@
 
   // Support for multi-threaded concurrent phases
   if (ParallelGCThreads > 0 && CMSConcurrentMTEnabled) {
-    if (FLAG_IS_DEFAULT(ParallelCMSThreads)) {
+    if (FLAG_IS_DEFAULT(ConcGCThreads)) {
       // just for now
-      FLAG_SET_DEFAULT(ParallelCMSThreads, (ParallelGCThreads + 3)/4);
-    }
-    if (ParallelCMSThreads > 1) {
+      FLAG_SET_DEFAULT(ConcGCThreads, (ParallelGCThreads + 3)/4);
+    }
+    if (ConcGCThreads > 1) {
       _conc_workers = new YieldingFlexibleWorkGang("Parallel CMS Threads",
-                                 ParallelCMSThreads, true);
+                                 ConcGCThreads, true);
       if (_conc_workers == NULL) {
         warning("GC/CMS: _conc_workers allocation failure: "
               "forcing -CMSConcurrentMTEnabled");
@@ -620,13 +634,13 @@
     }
   }
   if (!CMSConcurrentMTEnabled) {
-    ParallelCMSThreads = 0;
+    ConcGCThreads = 0;
   } else {
     // Turn off CMSCleanOnEnter optimization temporarily for
     // the MT case where it's not fixed yet; see 6178663.
     CMSCleanOnEnter = false;
   }
-  assert((_conc_workers != NULL) == (ParallelCMSThreads > 1),
+  assert((_conc_workers != NULL) == (ConcGCThreads > 1),
          "Inconsistency");
 
   // Parallel task queues; these are shared for the
@@ -634,7 +648,7 @@
   // are not shared with parallel scavenge (ParNew).
   {
     uint i;
-    uint num_queues = (uint) MAX2(ParallelGCThreads, ParallelCMSThreads);
+    uint num_queues = (uint) MAX2(ParallelGCThreads, ConcGCThreads);
 
     if ((CMSParallelRemarkEnabled || CMSConcurrentMTEnabled
          || ParallelRefProcEnabled)
@@ -709,7 +723,9 @@
 
   // Support for parallelizing survivor space rescan
   if (CMSParallelRemarkEnabled && CMSParallelSurvivorRemarkEnabled) {
-    size_t max_plab_samples = MaxNewSize/((SurvivorRatio+2)*MinTLABSize);
+    const size_t max_plab_samples =
+      ((DefNewGeneration*)_young_gen)->max_survivor_size()/MinTLABSize;
+
     _survivor_plab_array  = NEW_C_HEAP_ARRAY(ChunkArray, ParallelGCThreads);
     _survivor_chunk_array = NEW_C_HEAP_ARRAY(HeapWord*, 2*max_plab_samples);
     _cursor               = NEW_C_HEAP_ARRAY(size_t, ParallelGCThreads);
@@ -772,7 +788,7 @@
   NOT_PRODUCT(_overflow_counter = CMSMarkStackOverflowInterval;)
   _gc_counters = new CollectorCounters("CMS", 1);
   _completed_initialization = true;
-  _sweep_timer.start();  // start of time
+  _inter_sweep_timer.start();  // start of time
 }
 
 const char* ConcurrentMarkSweepGeneration::name() const {
@@ -899,6 +915,14 @@
   return result;
 }
 
+// At a promotion failure dump information on block layout in heap
+// (cms old generation).
+void ConcurrentMarkSweepGeneration::promotion_failure_occurred() {
+  if (CMSDumpAtPromotionFailure) {
+    cmsSpace()->dump_at_safepoint_with_locks(collector(), gclog_or_tty);
+  }
+}
+
 CompactibleSpace*
 ConcurrentMarkSweepGeneration::first_compaction_space() const {
   return _cmsSpace;
@@ -1367,12 +1391,7 @@
 ConcurrentMarkSweepGeneration::
 par_promote_alloc_done(int thread_num) {
   CMSParGCThreadState* ps = _par_gc_thread_states[thread_num];
-  ps->lab.retire();
-#if CFLS_LAB_REFILL_STATS
-  if (thread_num == 0) {
-    _cmsSpace->print_par_alloc_stats();
-  }
-#endif
+  ps->lab.retire(thread_num);
 }
 
 void
@@ -1973,11 +1992,14 @@
   // We must adjust the allocation statistics being maintained
   // in the free list space. We do so by reading and clearing
   // the sweep timer and updating the block flux rate estimates below.
-  assert(_sweep_timer.is_active(), "We should never see the timer inactive");
-  _sweep_timer.stop();
-  // Note that we do not use this sample to update the _sweep_estimate.
-  _cmsGen->cmsSpace()->beginSweepFLCensus((float)(_sweep_timer.seconds()),
-                                          _sweep_estimate.padded_average());
+  assert(!_intra_sweep_timer.is_active(), "_intra_sweep_timer should be inactive");
+  if (_inter_sweep_timer.is_active()) {
+    _inter_sweep_timer.stop();
+    // Note that we do not use this sample to update the _inter_sweep_estimate.
+    _cmsGen->cmsSpace()->beginSweepFLCensus((float)(_inter_sweep_timer.seconds()),
+                                            _inter_sweep_estimate.padded_average(),
+                                            _intra_sweep_estimate.padded_average());
+  }
 
   GenMarkSweep::invoke_at_safepoint(_cmsGen->level(),
     ref_processor(), clear_all_soft_refs);
@@ -2014,10 +2036,10 @@
   }
 
   // Adjust the per-size allocation stats for the next epoch.
-  _cmsGen->cmsSpace()->endSweepFLCensus(sweepCount() /* fake */);
-  // Restart the "sweep timer" for next epoch.
-  _sweep_timer.reset();
-  _sweep_timer.start();
+  _cmsGen->cmsSpace()->endSweepFLCensus(sweep_count() /* fake */);
+  // Restart the "inter sweep timer" for the next epoch.
+  _inter_sweep_timer.reset();
+  _inter_sweep_timer.start();
 
   // Sample collection pause time and reset for collection interval.
   if (UseAdaptiveSizePolicy) {
@@ -2276,7 +2298,7 @@
 
           VM_CMS_Final_Remark final_remark_op(this);
           VMThread::execute(&final_remark_op);
-          }
+        }
         assert(_foregroundGCShouldWait, "block post-condition");
         break;
       case Sweeping:
@@ -2675,7 +2697,7 @@
   // Also reset promotion tracking in par gc thread states.
   if (ParallelGCThreads > 0) {
     for (uint i = 0; i < ParallelGCThreads; i++) {
-      _par_gc_thread_states[i]->promo.stopTrackingPromotions();
+      _par_gc_thread_states[i]->promo.stopTrackingPromotions(i);
     }
   }
 }
@@ -2770,7 +2792,7 @@
   bool do_bit(size_t offset) {
     HeapWord* addr = _marks->offsetToHeapWord(offset);
     if (!_marks->isMarked(addr)) {
-      oop(addr)->print();
+      oop(addr)->print_on(gclog_or_tty);
       gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr);
       _failed = true;
     }
@@ -2819,7 +2841,7 @@
   // Clear any marks from a previous round
   verification_mark_bm()->clear_all();
   assert(verification_mark_stack()->isEmpty(), "markStack should be empty");
-  assert(overflow_list_is_empty(), "overflow list should be empty");
+  verify_work_stacks_empty();
 
   GenCollectedHeap* gch = GenCollectedHeap::heap();
   gch->ensure_parsability(false);  // fill TLABs, but no need to retire them
@@ -2852,14 +2874,17 @@
   GenCollectedHeap* gch = GenCollectedHeap::heap();
 
   // Mark from roots one level into CMS
-  MarkRefsIntoClosure notOlder(_span, verification_mark_bm(), true /* nmethods */);
+  MarkRefsIntoClosure notOlder(_span, verification_mark_bm());
   gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
 
   gch->gen_process_strong_roots(_cmsGen->level(),
                                 true,   // younger gens are roots
+                                true,   // activate StrongRootsScope
                                 true,   // collecting perm gen
                                 SharedHeap::ScanningOption(roots_scanning_options()),
-                                NULL, &notOlder);
+                                &notOlder,
+                                true,   // walk code active on stacks
+                                NULL);
 
   // Now mark from the roots
   assert(_revisitStack.isEmpty(), "Should be empty");
@@ -2889,8 +2914,8 @@
   verification_mark_bm()->iterate(&vcl);
   if (vcl.failed()) {
     gclog_or_tty->print("Verification failed");
-    Universe::heap()->print();
-    fatal(" ... aborting");
+    Universe::heap()->print_on(gclog_or_tty);
+    fatal("CMS: failed marking verification after remark");
   }
 }
 
@@ -2901,13 +2926,16 @@
 
   // Mark from roots one level into CMS
   MarkRefsIntoVerifyClosure notOlder(_span, verification_mark_bm(),
-                                     markBitMap(), true /* nmethods */);
+                                     markBitMap());
   gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
   gch->gen_process_strong_roots(_cmsGen->level(),
                                 true,   // younger gens are roots
+                                true,   // activate StrongRootsScope
                                 true,   // collecting perm gen
                                 SharedHeap::ScanningOption(roots_scanning_options()),
-                                NULL, &notOlder);
+                                &notOlder,
+                                true,   // walk code active on stacks
+                                NULL);
 
   // Now mark from the roots
   assert(_revisitStack.isEmpty(), "Should be empty");
@@ -3307,7 +3335,7 @@
     Universe::heap()->barrier_set()->resize_covered_region(mr);
     // Hmmmm... why doesn't CFLS::set_end verify locking?
     // This is quite ugly; FIX ME XXX
-    _cmsSpace->assert_locked();
+    _cmsSpace->assert_locked(freelistLock());
     _cmsSpace->set_end((HeapWord*)_virtual_space.high());
 
     // update the space and generation capacity counters
@@ -3484,8 +3512,10 @@
   FalseClosure falseClosure;
   // In the case of a synchronous collection, we will elide the
   // remark step, so it's important to catch all the nmethod oops
-  // in this step; hence the last argument to the constrcutor below.
-  MarkRefsIntoClosure notOlder(_span, &_markBitMap, !asynch /* nmethods */);
+  // in this step.
+  // The final 'true' flag to gen_process_strong_roots will ensure this.
+  // If 'async' is true, we can relax the nmethod tracing.
+  MarkRefsIntoClosure notOlder(_span, &_markBitMap);
   GenCollectedHeap* gch = GenCollectedHeap::heap();
 
   verify_work_stacks_empty();
@@ -3499,13 +3529,17 @@
   ref_processor()->set_enqueuing_is_done(false);
 
   {
+    // This is not needed. DEBUG_ONLY(RememberKlassesChecker imx(true);)
     COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
     gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
     gch->gen_process_strong_roots(_cmsGen->level(),
                                   true,   // younger gens are roots
+                                  true,   // activate StrongRootsScope
                                   true,   // collecting perm gen
                                   SharedHeap::ScanningOption(roots_scanning_options()),
-                                  NULL, &notOlder);
+                                  &notOlder,
+                                  true,   // walk all of code cache if (so & SO_CodeCache)
+                                  NULL);
   }
 
   // Clear mod-union table; it will be dirtied in the prologue of
@@ -3622,9 +3656,9 @@
   verify_work_stacks_empty();
   verify_overflow_empty();
   assert(_revisitStack.isEmpty(), "tabula rasa");
-
+  DEBUG_ONLY(RememberKlassesChecker cmx(should_unload_classes());)
   bool result = false;
-  if (CMSConcurrentMTEnabled && ParallelCMSThreads > 0) {
+  if (CMSConcurrentMTEnabled && ConcGCThreads > 0) {
     result = do_marking_mt(asynch);
   } else {
     result = do_marking_st(asynch);
@@ -3958,24 +3992,24 @@
   pst->all_tasks_completed();
 }
 
-class Par_ConcMarkingClosure: public OopClosure {
+class Par_ConcMarkingClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   MemRegion     _span;
   CMSBitMap*    _bit_map;
   CMSMarkStack* _overflow_stack;
-  CMSMarkStack* _revisit_stack;     // XXXXXX Check proper use
   OopTaskQueue* _work_queue;
  protected:
   DO_OOP_WORK_DEFN
  public:
   Par_ConcMarkingClosure(CMSCollector* collector, OopTaskQueue* work_queue,
-                         CMSBitMap* bit_map, CMSMarkStack* overflow_stack):
-    _collector(collector),
+                         CMSBitMap* bit_map, CMSMarkStack* overflow_stack,
+                         CMSMarkStack* revisit_stack):
+    Par_KlassRememberingOopClosure(collector, NULL, revisit_stack),
     _span(_collector->_span),
     _work_queue(work_queue),
     _bit_map(bit_map),
-    _overflow_stack(overflow_stack) { }   // need to initialize revisit stack etc.
+    _overflow_stack(overflow_stack)
+  { }
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
   void trim_queue(size_t max);
@@ -4063,8 +4097,9 @@
   oop obj_to_scan;
   CMSBitMap* bm = &(_collector->_markBitMap);
   CMSMarkStack* ovflw = &(_collector->_markStack);
+  CMSMarkStack* revisit = &(_collector->_revisitStack);
   int* seed = _collector->hash_seed(i);
-  Par_ConcMarkingClosure cl(_collector, work_q, bm, ovflw);
+  Par_ConcMarkingClosure cl(_collector, work_q, bm, ovflw, revisit);
   while (true) {
     cl.trim_queue(0);
     assert(work_q->size() == 0, "Should have been emptied above");
@@ -4088,7 +4123,7 @@
 void CMSConcMarkingTask::coordinator_yield() {
   assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
          "CMS thread should hold CMS token");
-
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   // First give up the locks, then yield, then re-lock
   // We should probably use a constructor/destructor idiom to
   // do this unlock/lock or modify the MutexUnlocker class to
@@ -4140,10 +4175,10 @@
 }
 
 bool CMSCollector::do_marking_mt(bool asynch) {
-  assert(ParallelCMSThreads > 0 && conc_workers() != NULL, "precondition");
+  assert(ConcGCThreads > 0 && conc_workers() != NULL, "precondition");
   // In the future this would be determined ergonomically, based
   // on #cpu's, # active mutator threads (and load), and mutation rate.
-  int num_workers = ParallelCMSThreads;
+  int num_workers = ConcGCThreads;
 
   CompactibleFreeListSpace* cms_space  = _cmsGen->cmsSpace();
   CompactibleFreeListSpace* perm_space = _permGen->cmsSpace();
@@ -4164,7 +4199,7 @@
   // Mutate the Refs discovery so it is MT during the
   // multi-threaded marking phase.
   ReferenceProcessorMTMutator mt(ref_processor(), num_workers > 1);
-
+  DEBUG_ONLY(RememberKlassesChecker cmx(should_unload_classes());)
   conc_workers()->start_task(&tsk);
   while (tsk.yielded()) {
     tsk.coordinator_yield();
@@ -4404,7 +4439,8 @@
     CMSPrecleanRefsYieldClosure yield_cl(this);
     assert(rp->span().equals(_span), "Spans should be equal");
     CMSKeepAliveClosure keep_alive(this, _span, &_markBitMap,
-                                   &_markStack, true /* preclean */);
+                                   &_markStack, &_revisitStack,
+                                   true /* preclean */);
     CMSDrainMarkingStackClosure complete_trace(this,
                                    _span, &_markBitMap, &_markStack,
                                    &keep_alive, true /* preclean */);
@@ -4424,6 +4460,7 @@
                             bitMapLock());
     startTimer();
     sample_eden();
+
     // The following will yield to allow foreground
     // collection to proceed promptly. XXX YSR:
     // The code in this method may need further
@@ -4431,7 +4468,7 @@
     // for cleaner interfaces.
     rp->preclean_discovered_references(
           rp->is_alive_non_header(), &keep_alive, &complete_trace,
-          &yield_cl);
+          &yield_cl, should_unload_classes());
   }
 
   if (clean_survivor) {  // preclean the active survivor space(s)
@@ -4453,6 +4490,7 @@
     SurvivorSpacePrecleanClosure
       sss_cl(this, _span, &_markBitMap, &_markStack,
              &pam_cl, before_count, CMSYield);
+    DEBUG_ONLY(RememberKlassesChecker mx(should_unload_classes());)
     dng->from()->object_iterate_careful(&sss_cl);
     dng->to()->object_iterate_careful(&sss_cl);
   }
@@ -4554,6 +4592,13 @@
   verify_work_stacks_empty();
   verify_overflow_empty();
 
+  // Turn off checking for this method but turn it back on
+  // selectively.  There are yield points in this method
+  // but it is difficult to turn the checking off just around
+  // the yield points.  It is simpler to selectively turn
+  // it on.
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
+
   // strategy: starting with the first card, accumulate contiguous
   // ranges of dirty cards; clear these cards, then scan the region
   // covered by these cards.
@@ -4582,6 +4627,7 @@
     MemRegion dirtyRegion;
     {
       stopTimer();
+      // Potential yield point
       CMSTokenSync ts(true);
       startTimer();
       sample_eden();
@@ -4607,6 +4653,7 @@
       assert(numDirtyCards > 0, "consistency check");
       HeapWord* stop_point = NULL;
       stopTimer();
+      // Potential yield point
       CMSTokenSyncWithLocks ts(true, gen->freelistLock(),
                                bitMapLock());
       startTimer();
@@ -4614,6 +4661,7 @@
         verify_work_stacks_empty();
         verify_overflow_empty();
         sample_eden();
+        DEBUG_ONLY(RememberKlassesChecker mx(should_unload_classes());)
         stop_point =
           gen->cmsSpace()->object_iterate_careful_m(dirtyRegion, cl);
       }
@@ -4701,6 +4749,7 @@
       sample_eden();
       verify_work_stacks_empty();
       verify_overflow_empty();
+      DEBUG_ONLY(RememberKlassesChecker mx(should_unload_classes());)
       HeapWord* stop_point =
         gen->cmsSpace()->object_iterate_careful_m(dirtyRegion, cl);
       if (stop_point != NULL) {
@@ -4800,6 +4849,7 @@
   assert(haveFreelistLocks(), "must have free list locks");
   assert_lock_strong(bitMapLock());
 
+  DEBUG_ONLY(RememberKlassesChecker fmx(should_unload_classes());)
   if (!init_mark_was_synchronous) {
     // We might assume that we need not fill TLAB's when
     // CMSScavengeBeforeRemark is set, because we may have just done
@@ -4903,6 +4953,9 @@
   _markStack._hit_limit = 0;
   _markStack._failed_double = 0;
 
+  // Check that all the klasses have been checked
+  assert(_revisitStack.isEmpty(), "Not all klasses revisited");
+
   if ((VerifyAfterGC || VerifyDuringGC) &&
       GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
     verify_after_remark();
@@ -5015,9 +5068,15 @@
   _timer.start();
   gch->gen_process_strong_roots(_collector->_cmsGen->level(),
                                 false,     // yg was scanned above
+                                false,     // this is parallel code
                                 true,      // collecting perm gen
                                 SharedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
-                                NULL, &par_mrias_cl);
+                                &par_mrias_cl,
+                                true,   // walk all of code cache if (so & SO_CodeCache)
+                                NULL);
+  assert(_collector->should_unload_classes()
+         || (_collector->CMSCollector::roots_scanning_options() & SharedHeap::SO_CodeCache),
+         "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
   _timer.stop();
   if (PrintCMSStatistics != 0) {
     gclog_or_tty->print_cr(
@@ -5398,7 +5457,6 @@
 
   // Set up for parallel process_strong_roots work.
   gch->set_par_threads(n_workers);
-  gch->change_strong_roots_parity();
   // We won't be iterating over the cards in the card table updating
   // the younger_gen cards, so we shouldn't call the following else
   // the verification code as well as subsequent younger_refs_iterate
@@ -5429,8 +5487,10 @@
   if (n_workers > 1) {
     // Make refs discovery MT-safe
     ReferenceProcessorMTMutator mt(ref_processor(), true);
+    GenCollectedHeap::StrongRootsScope srs(gch);
     workers->run_task(&tsk);
   } else {
+    GenCollectedHeap::StrongRootsScope srs(gch);
     tsk.work(0);
   }
   gch->set_par_threads(0);  // 0 ==> non-parallel.
@@ -5514,11 +5574,18 @@
     verify_work_stacks_empty();
 
     gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
+    GenCollectedHeap::StrongRootsScope srs(gch);
     gch->gen_process_strong_roots(_cmsGen->level(),
                                   true,  // younger gens as roots
+                                  false, // use the local StrongRootsScope
                                   true,  // collecting perm gen
                                   SharedHeap::ScanningOption(roots_scanning_options()),
-                                  NULL, &mrias_cl);
+                                  &mrias_cl,
+                                  true,   // walk code active on stacks
+                                  NULL);
+    assert(should_unload_classes()
+           || (roots_scanning_options() & SharedHeap::SO_CodeCache),
+           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
   }
   verify_work_stacks_empty();
   // Restore evacuated mark words, if any, used for overflow list links
@@ -5574,9 +5641,13 @@
 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));
+                                        _mark_bit_map,
+                                        &_collector->_revisitStack,
+                                        work_queue(i));
   CMSParDrainMarkingStackClosure par_drain_stack(_collector, _span,
-                                                 _mark_bit_map, work_queue(i));
+                                                 _mark_bit_map,
+                                                 &_collector->_revisitStack,
+                                                 work_queue(i));
   CMSIsAliveClosure is_alive_closure(_span, _mark_bit_map);
   _task.work(i, is_alive_closure, par_keep_alive, par_drain_stack);
   if (_task.marks_oops_alive()) {
@@ -5604,12 +5675,13 @@
 };
 
 CMSParKeepAliveClosure::CMSParKeepAliveClosure(CMSCollector* collector,
-  MemRegion span, CMSBitMap* bit_map, OopTaskQueue* work_queue):
-   _collector(collector),
+  MemRegion span, CMSBitMap* bit_map, CMSMarkStack* revisit_stack,
+  OopTaskQueue* work_queue):
+   Par_KlassRememberingOopClosure(collector, NULL, revisit_stack),
    _span(span),
    _bit_map(bit_map),
    _work_queue(work_queue),
-   _mark_and_push(collector, span, bit_map, work_queue),
+   _mark_and_push(collector, span, bit_map, revisit_stack, work_queue),
    _low_water_mark(MIN2((uint)(work_queue->max_elems()/4),
                         (uint)(CMSWorkQueueDrainThreshold * ParallelGCThreads)))
 { }
@@ -5696,7 +5768,8 @@
   verify_work_stacks_empty();
 
   CMSKeepAliveClosure cmsKeepAliveClosure(this, _span, &_markBitMap,
-                                          &_markStack, false /* !preclean */);
+                                          &_markStack, &_revisitStack,
+                                          false /* !preclean */);
   CMSDrainMarkingStackClosure cmsDrainMarkingStackClosure(this,
                                 _span, &_markBitMap, &_markStack,
                                 &cmsKeepAliveClosure, false /* !preclean */);
@@ -5811,9 +5884,9 @@
   check_correct_thread_executing();
   verify_work_stacks_empty();
   verify_overflow_empty();
-  incrementSweepCount();
-  _sweep_timer.stop();
-  _sweep_estimate.sample(_sweep_timer.seconds());
+  increment_sweep_count();
+  _inter_sweep_timer.stop();
+  _inter_sweep_estimate.sample(_inter_sweep_timer.seconds());
   size_policy()->avg_cms_free_at_sweep()->sample(_cmsGen->free());
 
   // PermGen verification support: If perm gen sweeping is disabled in
@@ -5836,6 +5909,9 @@
     }
   }
 
+  assert(!_intra_sweep_timer.is_active(), "Should not be active");
+  _intra_sweep_timer.reset();
+  _intra_sweep_timer.start();
   if (asynch) {
     TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
     CMSPhaseAccounting pa(this, "sweep", !PrintGCDetails);
@@ -5880,8 +5956,11 @@
   verify_work_stacks_empty();
   verify_overflow_empty();
 
-  _sweep_timer.reset();
-  _sweep_timer.start();
+  _intra_sweep_timer.stop();
+  _intra_sweep_estimate.sample(_intra_sweep_timer.seconds());
+
+  _inter_sweep_timer.reset();
+  _inter_sweep_timer.start();
 
   update_time_of_last_gc(os::javaTimeMillis());
 
@@ -5924,11 +6003,11 @@
 // FIX ME!!! Looks like this belongs in CFLSpace, with
 // CMSGen merely delegating to it.
 void ConcurrentMarkSweepGeneration::setNearLargestChunk() {
-  double nearLargestPercent = 0.999;
+  double nearLargestPercent = FLSLargestBlockCoalesceProximity;
   HeapWord*  minAddr        = _cmsSpace->bottom();
   HeapWord*  largestAddr    =
     (HeapWord*) _cmsSpace->dictionary()->findLargestDict();
-  if (largestAddr == 0) {
+  if (largestAddr == NULL) {
     // The dictionary appears to be empty.  In this case
     // try to coalesce at the end of the heap.
     largestAddr = _cmsSpace->end();
@@ -5936,6 +6015,13 @@
   size_t largestOffset     = pointer_delta(largestAddr, minAddr);
   size_t nearLargestOffset =
     (size_t)((double)largestOffset * nearLargestPercent) - MinChunkSize;
+  if (PrintFLSStatistics != 0) {
+    gclog_or_tty->print_cr(
+      "CMS: Large Block: " PTR_FORMAT ";"
+      " Proximity: " PTR_FORMAT " -> " PTR_FORMAT,
+      largestAddr,
+      _cmsSpace->nearLargestChunk(), minAddr + nearLargestOffset);
+  }
   _cmsSpace->set_nearLargestChunk(minAddr + nearLargestOffset);
 }
 
@@ -6015,9 +6101,11 @@
   assert_lock_strong(gen->freelistLock());
   assert_lock_strong(bitMapLock());
 
-  assert(!_sweep_timer.is_active(), "Was switched off in an outer context");
-  gen->cmsSpace()->beginSweepFLCensus((float)(_sweep_timer.seconds()),
-                                      _sweep_estimate.padded_average());
+  assert(!_inter_sweep_timer.is_active(), "Was switched off in an outer context");
+  assert(_intra_sweep_timer.is_active(),  "Was switched on  in an outer context");
+  gen->cmsSpace()->beginSweepFLCensus((float)(_inter_sweep_timer.seconds()),
+                                      _inter_sweep_estimate.padded_average(),
+                                      _intra_sweep_estimate.padded_average());
   gen->setNearLargestChunk();
 
   {
@@ -6030,7 +6118,7 @@
     // end-of-sweep-census below will be off by a little bit.
   }
   gen->cmsSpace()->sweep_completed();
-  gen->cmsSpace()->endSweepFLCensus(sweepCount());
+  gen->cmsSpace()->endSweepFLCensus(sweep_count());
   if (should_unload_classes()) {                // unloaded classes this cycle,
     _concurrent_cycles_since_last_unload = 0;   // ... reset count
   } else {                                      // did not unload classes,
@@ -6342,8 +6430,8 @@
 // For now we take the expedient path of just disabling the
 // messages for the problematic case.)
 void CMSMarkStack::expand() {
-  assert(_capacity <= CMSMarkStackSizeMax, "stack bigger than permitted");
-  if (_capacity == CMSMarkStackSizeMax) {
+  assert(_capacity <= MarkStackSizeMax, "stack bigger than permitted");
+  if (_capacity == MarkStackSizeMax) {
     if (_hit_limit++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) {
       // We print a warning message only once per CMS cycle.
       gclog_or_tty->print_cr(" (benign) Hit CMSMarkStack max size limit");
@@ -6351,7 +6439,7 @@
     return;
   }
   // Double capacity if possible
-  size_t new_capacity = MIN2(_capacity*2, CMSMarkStackSizeMax);
+  size_t new_capacity = MIN2(_capacity*2, MarkStackSizeMax);
   // Do not give up existing stack until we have managed to
   // get the double capacity that we desired.
   ReservedSpace rs(ReservedSpace::allocation_align_size_up(
@@ -6387,10 +6475,9 @@
 // generation then this will lose younger_gen cards!
 
 MarkRefsIntoClosure::MarkRefsIntoClosure(
-  MemRegion span, CMSBitMap* bitMap, bool should_do_nmethods):
+  MemRegion span, CMSBitMap* bitMap):
     _span(span),
-    _bitMap(bitMap),
-    _should_do_nmethods(should_do_nmethods)
+    _bitMap(bitMap)
 {
     assert(_ref_processor == NULL, "deliberately left NULL");
     assert(_bitMap->covers(_span), "_bitMap/_span mismatch");
@@ -6411,12 +6498,11 @@
 
 // A variant of the above, used for CMS marking verification.
 MarkRefsIntoVerifyClosure::MarkRefsIntoVerifyClosure(
-  MemRegion span, CMSBitMap* verification_bm, CMSBitMap* cms_bm,
-  bool should_do_nmethods):
+  MemRegion span, CMSBitMap* verification_bm, CMSBitMap* cms_bm):
     _span(span),
     _verification_bm(verification_bm),
-    _cms_bm(cms_bm),
-    _should_do_nmethods(should_do_nmethods) {
+    _cms_bm(cms_bm)
+{
     assert(_ref_processor == NULL, "deliberately left NULL");
     assert(_verification_bm->covers(_span), "_verification_bm/_span mismatch");
 }
@@ -6531,6 +6617,7 @@
   assert_lock_strong(_freelistLock);
   assert_lock_strong(_bit_map->lock());
   // relinquish the free_list_lock and bitMaplock()
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   _bit_map->lock()->unlock();
   _freelistLock->unlock();
   ConcurrentMarkSweepThread::desynchronize(true);
@@ -6703,6 +6790,7 @@
          "CMS thread should hold CMS token");
   assert_lock_strong(_freelistLock);
   assert_lock_strong(_bitMap->lock());
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   // relinquish the free_list_lock and bitMaplock()
   _bitMap->lock()->unlock();
   _freelistLock->unlock();
@@ -6779,6 +6867,7 @@
   assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
          "CMS thread should hold CMS token");
   assert_lock_strong(_bit_map->lock());
+  DEBUG_ONLY(RememberKlassesChecker smx(false);)
   // Relinquish the bit map lock
   _bit_map->lock()->unlock();
   ConcurrentMarkSweepThread::desynchronize(true);
@@ -6941,6 +7030,7 @@
   assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
          "CMS thread should hold CMS token");
   assert_lock_strong(_bitMap->lock());
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   _bitMap->lock()->unlock();
   ConcurrentMarkSweepThread::desynchronize(true);
   ConcurrentMarkSweepThread::acknowledge_yield_request();
@@ -7295,15 +7385,12 @@
                      CMSBitMap* bitMap, CMSMarkStack*  markStack,
                      CMSMarkStack*  revisitStack,
                      HeapWord* finger, MarkFromRootsClosure* parent) :
-  OopClosure(collector->ref_processor()),
-  _collector(collector),
+  KlassRememberingOopClosure(collector, collector->ref_processor(), revisitStack),
   _span(span),
   _bitMap(bitMap),
   _markStack(markStack),
-  _revisitStack(revisitStack),
   _finger(finger),
-  _parent(parent),
-  _should_remember_klasses(collector->should_unload_classes())
+  _parent(parent)
 { }
 
 Par_PushOrMarkClosure::Par_PushOrMarkClosure(CMSCollector* collector,
@@ -7315,18 +7402,17 @@
                      HeapWord* finger,
                      HeapWord** global_finger_addr,
                      Par_MarkFromRootsClosure* parent) :
-  OopClosure(collector->ref_processor()),
-  _collector(collector),
+  Par_KlassRememberingOopClosure(collector,
+                            collector->ref_processor(),
+                            revisit_stack),
   _whole_span(collector->_span),
   _span(span),
   _bit_map(bit_map),
   _work_queue(work_queue),
   _overflow_stack(overflow_stack),
-  _revisit_stack(revisit_stack),
   _finger(finger),
   _global_finger_addr(global_finger_addr),
-  _parent(parent),
-  _should_remember_klasses(collector->should_unload_classes())
+  _parent(parent)
 { }
 
 // Assumes thread-safe access by callers, who are
@@ -7456,6 +7542,14 @@
 void Par_PushOrMarkClosure::do_oop(oop* p)       { Par_PushOrMarkClosure::do_oop_work(p); }
 void Par_PushOrMarkClosure::do_oop(narrowOop* p) { Par_PushOrMarkClosure::do_oop_work(p); }
 
+KlassRememberingOopClosure::KlassRememberingOopClosure(CMSCollector* collector,
+                                             ReferenceProcessor* rp,
+                                             CMSMarkStack* revisit_stack) :
+  OopClosure(rp),
+  _collector(collector),
+  _revisit_stack(revisit_stack),
+  _should_remember_klasses(collector->should_unload_classes()) {}
+
 PushAndMarkClosure::PushAndMarkClosure(CMSCollector* collector,
                                        MemRegion span,
                                        ReferenceProcessor* rp,
@@ -7464,15 +7558,12 @@
                                        CMSMarkStack*  mark_stack,
                                        CMSMarkStack*  revisit_stack,
                                        bool           concurrent_precleaning):
-  OopClosure(rp),
-  _collector(collector),
+  KlassRememberingOopClosure(collector, rp, revisit_stack),
   _span(span),
   _bit_map(bit_map),
   _mod_union_table(mod_union_table),
   _mark_stack(mark_stack),
-  _revisit_stack(revisit_stack),
-  _concurrent_precleaning(concurrent_precleaning),
-  _should_remember_klasses(collector->should_unload_classes())
+  _concurrent_precleaning(concurrent_precleaning)
 {
   assert(_ref_processor != NULL, "_ref_processor shouldn't be NULL");
 }
@@ -7540,13 +7631,10 @@
                                                CMSBitMap* bit_map,
                                                OopTaskQueue* work_queue,
                                                CMSMarkStack* revisit_stack):
-  OopClosure(rp),
-  _collector(collector),
+  Par_KlassRememberingOopClosure(collector, rp, revisit_stack),
   _span(span),
   _bit_map(bit_map),
-  _work_queue(work_queue),
-  _revisit_stack(revisit_stack),
-  _should_remember_klasses(collector->should_unload_classes())
+  _work_queue(work_queue)
 {
   assert(_ref_processor != NULL, "_ref_processor shouldn't be NULL");
 }
@@ -7599,19 +7687,16 @@
 void Par_PushAndMarkClosure::do_oop(oop* p)       { Par_PushAndMarkClosure::do_oop_work(p); }
 void Par_PushAndMarkClosure::do_oop(narrowOop* p) { Par_PushAndMarkClosure::do_oop_work(p); }
 
-void PushAndMarkClosure::remember_klass(Klass* k) {
-  if (!_revisit_stack->push(oop(k))) {
-    fatal("Revisit stack overflowed in PushAndMarkClosure");
-  }
-}
-
-void Par_PushAndMarkClosure::remember_klass(Klass* k) {
-  if (!_revisit_stack->par_push(oop(k))) {
-    fatal("Revist stack overflowed in Par_PushAndMarkClosure");
-  }
+void PushAndMarkClosure::remember_mdo(DataLayout* v) {
+  // TBD
+}
+
+void Par_PushAndMarkClosure::remember_mdo(DataLayout* v) {
+  // TBD
 }
 
 void CMSPrecleanRefsYieldClosure::do_yield_work() {
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   Mutex* bml = _collector->bitMapLock();
   assert_lock_strong(bml);
   assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
@@ -8302,6 +8387,19 @@
          (!_span.contains(addr) || _bit_map->isMarked(addr));
 }
 
+CMSKeepAliveClosure::CMSKeepAliveClosure( CMSCollector* collector,
+                      MemRegion span,
+                      CMSBitMap* bit_map, CMSMarkStack* mark_stack,
+                      CMSMarkStack* revisit_stack, bool cpc):
+  KlassRememberingOopClosure(collector, NULL, revisit_stack),
+  _span(span),
+  _bit_map(bit_map),
+  _mark_stack(mark_stack),
+  _concurrent_precleaning(cpc) {
+  assert(!_span.is_empty(), "Empty span could spell trouble");
+}
+
+
 // CMSKeepAliveClosure: the serial version
 void CMSKeepAliveClosure::do_oop(oop obj) {
   HeapWord* addr = (HeapWord*)obj;
@@ -8385,6 +8483,16 @@
   }
 }
 
+CMSInnerParMarkAndPushClosure::CMSInnerParMarkAndPushClosure(
+                                CMSCollector* collector,
+                                MemRegion span, CMSBitMap* bit_map,
+                                CMSMarkStack* revisit_stack,
+                                OopTaskQueue* work_queue):
+  Par_KlassRememberingOopClosure(collector, NULL, revisit_stack),
+  _span(span),
+  _bit_map(bit_map),
+  _work_queue(work_queue) { }
+
 void CMSInnerParMarkAndPushClosure::do_oop(oop obj) {
   HeapWord* addr = (HeapWord*)obj;
   if (_span.contains(addr) &&
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -355,6 +355,11 @@
                                              unsigned int new_duty_cycle);
   unsigned int icms_update_duty_cycle_impl();
 
+  // In support of adjusting of cms trigger ratios based on history
+  // of concurrent mode failure.
+  double cms_free_adjustment_factor(size_t free) const;
+  void   adjust_cms_free_adjustment_factor(bool fail, size_t free);
+
  public:
   CMSStats(ConcurrentMarkSweepGeneration* cms_gen,
            unsigned int alpha = CMSExpAvgFactor);
@@ -570,8 +575,11 @@
   // appropriately.
   void check_gc_time_limit();
   // XXX Move these to CMSStats ??? FIX ME !!!
-  elapsedTimer _sweep_timer;
-  AdaptivePaddedAverage _sweep_estimate;
+  elapsedTimer _inter_sweep_timer;   // time between sweeps
+  elapsedTimer _intra_sweep_timer;   // time _in_ sweeps
+  // padded decaying average estimates of the above
+  AdaptivePaddedAverage _inter_sweep_estimate;
+  AdaptivePaddedAverage _intra_sweep_estimate;
 
  protected:
   ConcurrentMarkSweepGeneration* _cmsGen;  // old gen (CMS)
@@ -625,6 +633,7 @@
   // . _collectorState <= Idling ==  post-sweep && pre-mark
   // . _collectorState in (Idling, Sweeping) == {initial,final}marking ||
   //                                            precleaning || abortablePrecleanb
+ public:
   enum CollectorState {
     Resizing            = 0,
     Resetting           = 1,
@@ -636,6 +645,7 @@
     FinalMarking        = 7,
     Sweeping            = 8
   };
+ protected:
   static CollectorState _collectorState;
 
   // State related to prologue/epilogue invocation for my generations
@@ -655,7 +665,7 @@
 
   int    _numYields;
   size_t _numDirtyCards;
-  uint   _sweepCount;
+  size_t _sweep_count;
   // number of full gc's since the last concurrent gc.
   uint   _full_gcs_since_conc_gc;
 
@@ -905,7 +915,7 @@
 
   // Check that the currently executing thread is the expected
   // one (foreground collector or background collector).
-  void check_correct_thread_executing()        PRODUCT_RETURN;
+  static void check_correct_thread_executing() PRODUCT_RETURN;
   // XXXPERM void print_statistics()           PRODUCT_RETURN;
 
   bool is_cms_reachable(HeapWord* addr);
@@ -930,8 +940,8 @@
   static void set_foregroundGCShouldWait(bool v) { _foregroundGCShouldWait = v; }
   static bool foregroundGCIsActive() { return _foregroundGCIsActive; }
   static void set_foregroundGCIsActive(bool v) { _foregroundGCIsActive = v; }
-  uint  sweepCount() const             { return _sweepCount; }
-  void incrementSweepCount()           { _sweepCount++; }
+  size_t sweep_count() const             { return _sweep_count; }
+  void   increment_sweep_count()         { _sweep_count++; }
 
   // Timers/stats for gc scheduling and incremental mode pacing.
   CMSStats& stats() { return _stats; }
@@ -1165,6 +1175,11 @@
   virtual bool promotion_attempt_is_safe(size_t promotion_in_bytes,
     bool younger_handles_promotion_failure) const;
 
+  // Inform this (non-young) generation that a promotion failure was
+  // encountered during a collection of a younger generation that
+  // promotes into this generation.
+  virtual void promotion_failure_occurred();
+
   bool should_collect(bool full, size_t size, bool tlab);
   virtual bool should_concurrent_collect() const;
   virtual bool is_too_full() const;
@@ -1790,12 +1805,13 @@
  public:
   CMSParDrainMarkingStackClosure(CMSCollector* collector,
                                  MemRegion span, CMSBitMap* bit_map,
+                                 CMSMarkStack* revisit_stack,
                                  OopTaskQueue* work_queue):
     _collector(collector),
     _span(span),
     _bit_map(bit_map),
     _work_queue(work_queue),
-    _mark_and_push(collector, span, bit_map, work_queue) { }
+    _mark_and_push(collector, span, bit_map, revisit_stack, work_queue) { }
 
  public:
   void trim_queue(uint max);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -55,7 +55,8 @@
   virtual void       dictCensusUpdate(size_t size, bool split, bool birth) = 0;
   virtual bool       coalDictOverPopulated(size_t size) = 0;
   virtual void       beginSweepDictCensus(double coalSurplusPercent,
-                       float sweep_current, float sweep_ewstimate) = 0;
+                       float inter_sweep_current, float inter_sweep_estimate,
+                       float intra__sweep_current) = 0;
   virtual void       endSweepDictCensus(double splitSurplusPercent) = 0;
   virtual FreeChunk* findLargestDict() const = 0;
   // verify that the given chunk is in the dictionary.
@@ -79,6 +80,7 @@
   }
 
   virtual void       printDictCensus() const = 0;
+  virtual void       print_free_lists(outputStream* st) const = 0;
 
   virtual void       verify()         const = 0;
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -67,3 +67,8 @@
   }
 }
 #endif
+
+void FreeChunk::print_on(outputStream* st) {
+  st->print_cr("Next: " PTR_FORMAT " Prev: " PTR_FORMAT " %s",
+    next(), prev(), cantCoalesce() ? "[can't coalesce]" : "");
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -129,6 +129,8 @@
   void verifyList()         const PRODUCT_RETURN;
   void mangleAllocated(size_t size) PRODUCT_RETURN;
   void mangleFreed(size_t size)     PRODUCT_RETURN;
+
+  void print_on(outputStream* st);
 };
 
 // Alignment helpers etc.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -81,8 +81,8 @@
   set_hint(hint);
 }
 
-void FreeList::init_statistics() {
-  _allocation_stats.initialize();
+void FreeList::init_statistics(bool split_birth) {
+  _allocation_stats.initialize(split_birth);
 }
 
 FreeChunk* FreeList::getChunkAtHead() {
@@ -292,14 +292,31 @@
 }
 
 #ifndef PRODUCT
+void FreeList::verify_stats() const {
+  // The +1 of the LH comparand is to allow some "looseness" in
+  // checking: we usually call this interface when adding a block
+  // and we'll subsequently update the stats; we cannot update the
+  // stats beforehand because in the case of the large-block BT
+  // dictionary for example, this might be the first block and
+  // in that case there would be no place that we could record
+  // the stats (which are kept in the block itself).
+  assert(_allocation_stats.prevSweep() + _allocation_stats.splitBirths() + 1   // Total Stock + 1
+          >= _allocation_stats.splitDeaths() + (ssize_t)count(), "Conservation Principle");
+}
+
 void FreeList::assert_proper_lock_protection_work() const {
-#ifdef ASSERT
-  if (_protecting_lock != NULL &&
-      SharedHeap::heap()->n_par_threads() > 0) {
-    // Should become an assert.
-    guarantee(_protecting_lock->owned_by_self(), "FreeList RACE DETECTED");
+  assert(_protecting_lock != NULL, "Don't call this directly");
+  assert(ParallelGCThreads > 0, "Don't call this directly");
+  Thread* thr = Thread::current();
+  if (thr->is_VM_thread() || thr->is_ConcurrentGC_thread()) {
+    // assert that we are holding the freelist lock
+  } else if (thr->is_GC_task_thread()) {
+    assert(_protecting_lock->owned_by_self(), "FreeList RACE DETECTED");
+  } else if (thr->is_Java_thread()) {
+    assert(!SafepointSynchronize::is_at_safepoint(), "Should not be executing");
+  } else {
+    ShouldNotReachHere();  // unaccounted thread type?
   }
-#endif
 }
 #endif
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -35,18 +35,26 @@
 // for that implementation.
 
 class Mutex;
+class TreeList;
 
 class FreeList VALUE_OBJ_CLASS_SPEC {
   friend class CompactibleFreeListSpace;
   friend class VMStructs;
-  friend class printTreeCensusClosure;
-  FreeChunk*    _head;          // List of free chunks
+  friend class PrintTreeCensusClosure;
+
+ protected:
+  TreeList* _parent;
+  TreeList* _left;
+  TreeList* _right;
+
+ private:
+  FreeChunk*    _head;          // Head of list of free chunks
   FreeChunk*    _tail;          // Tail of list of free chunks
-  size_t        _size;          // Size in Heap words of each chunks
+  size_t        _size;          // Size in Heap words of each chunk
   ssize_t       _count;         // Number of entries in list
   size_t        _hint;          // next larger size list with a positive surplus
 
-  AllocationStats _allocation_stats;            // statistics for smart allocation
+  AllocationStats _allocation_stats; // allocation-related statistics
 
 #ifdef ASSERT
   Mutex*        _protecting_lock;
@@ -63,9 +71,12 @@
 
   // Initialize the allocation statistics.
  protected:
-  void init_statistics();
+  void init_statistics(bool split_birth = false);
   void set_count(ssize_t v) { _count = v;}
-  void increment_count()    { _count++; }
+  void increment_count()    {
+    _count++;
+  }
+
   void decrement_count() {
     _count--;
     assert(_count >= 0, "Count should not be negative");
@@ -167,11 +178,13 @@
     _allocation_stats.set_desired(v);
   }
   void compute_desired(float inter_sweep_current,
-                       float inter_sweep_estimate) {
+                       float inter_sweep_estimate,
+                       float intra_sweep_estimate) {
     assert_proper_lock_protection();
     _allocation_stats.compute_desired(_count,
                                       inter_sweep_current,
-                                      inter_sweep_estimate);
+                                      inter_sweep_estimate,
+                                      intra_sweep_estimate);
   }
   ssize_t coalDesired() const {
     return _allocation_stats.coalDesired();
@@ -306,6 +319,9 @@
   // found.  Return NULL if "fc" is not found.
   bool verifyChunkInFreeLists(FreeChunk* fc) const;
 
+  // Stats verification
+  void verify_stats() const PRODUCT_RETURN;
+
   // Printing support
   static void print_labels_on(outputStream* st, const char* c);
   void print_on(outputStream* st, const char* c = NULL) const;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
--- a/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -351,9 +351,16 @@
 CollectionSetChooser::printSortedHeapRegions() {
   gclog_or_tty->print_cr("Printing %d Heap Regions sorted by amount of known garbage",
                 _numMarkedRegions);
+
+  DEBUG_ONLY(int marked_count = 0;)
   for (int i = 0; i < _markedRegions.length(); i++) {
-    printHeapRegion(_markedRegions.at(i));
+    HeapRegion* r = _markedRegions.at(i);
+    if (r != NULL) {
+      printHeapRegion(r);
+      DEBUG_ONLY(marked_count++;)
+    }
   }
+  assert(marked_count == _numMarkedRegions, "must be");
   gclog_or_tty->print_cr("Done sorted heap region print");
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -42,28 +42,49 @@
   _n_periods(0),
   _threads(NULL), _n_threads(0)
 {
-  if (G1ConcRefine) {
-    _n_threads = (int)thread_num();
-    if (_n_threads > 0) {
-      _threads = NEW_C_HEAP_ARRAY(ConcurrentG1RefineThread*, _n_threads);
-      int worker_id_offset = (int)DirtyCardQueueSet::num_par_ids();
-      ConcurrentG1RefineThread *next = NULL;
-      for (int i = _n_threads - 1; i >= 0; i--) {
-        ConcurrentG1RefineThread* t = new ConcurrentG1RefineThread(this, next, worker_id_offset, i);
-        assert(t != NULL, "Conc refine should have been created");
-        assert(t->cg1r() == this, "Conc refine thread should refer to this");
-        _threads[i] = t;
-        next = t;
-      }
-    }
+
+  // Ergomonically select initial concurrent refinement parameters
+  if (FLAG_IS_DEFAULT(G1ConcRefinementGreenZone)) {
+    FLAG_SET_DEFAULT(G1ConcRefinementGreenZone, MAX2<int>(ParallelGCThreads, 1));
+  }
+  set_green_zone(G1ConcRefinementGreenZone);
+
+  if (FLAG_IS_DEFAULT(G1ConcRefinementYellowZone)) {
+    FLAG_SET_DEFAULT(G1ConcRefinementYellowZone, green_zone() * 3);
+  }
+  set_yellow_zone(MAX2<int>(G1ConcRefinementYellowZone, green_zone()));
+
+  if (FLAG_IS_DEFAULT(G1ConcRefinementRedZone)) {
+    FLAG_SET_DEFAULT(G1ConcRefinementRedZone, yellow_zone() * 2);
+  }
+  set_red_zone(MAX2<int>(G1ConcRefinementRedZone, yellow_zone()));
+  _n_worker_threads = thread_num();
+  // We need one extra thread to do the young gen rset size sampling.
+  _n_threads = _n_worker_threads + 1;
+  reset_threshold_step();
+
+  _threads = NEW_C_HEAP_ARRAY(ConcurrentG1RefineThread*, _n_threads);
+  int worker_id_offset = (int)DirtyCardQueueSet::num_par_ids();
+  ConcurrentG1RefineThread *next = NULL;
+  for (int i = _n_threads - 1; i >= 0; i--) {
+    ConcurrentG1RefineThread* t = new ConcurrentG1RefineThread(this, next, worker_id_offset, i);
+    assert(t != NULL, "Conc refine should have been created");
+    assert(t->cg1r() == this, "Conc refine thread should refer to this");
+    _threads[i] = t;
+    next = t;
   }
 }
 
-size_t ConcurrentG1Refine::thread_num() {
-  if (G1ConcRefine) {
-    return (G1ParallelRSetThreads > 0) ? G1ParallelRSetThreads : ParallelGCThreads;
+void ConcurrentG1Refine::reset_threshold_step() {
+  if (FLAG_IS_DEFAULT(G1ConcRefinementThresholdStep)) {
+    _thread_threshold_step = (yellow_zone() - green_zone()) / (worker_thread_num() + 1);
+  } else {
+    _thread_threshold_step = G1ConcRefinementThresholdStep;
   }
-  return 0;
+}
+
+int ConcurrentG1Refine::thread_num() {
+  return MAX2<int>((G1ConcRefinementThreads > 0) ? G1ConcRefinementThreads : ParallelGCThreads, 1);
 }
 
 void ConcurrentG1Refine::init() {
@@ -123,6 +144,15 @@
   }
 }
 
+void ConcurrentG1Refine::reinitialize_threads() {
+  reset_threshold_step();
+  if (_threads != NULL) {
+    for (int i = 0; i < _n_threads; i++) {
+      _threads[i]->initialize();
+    }
+  }
+}
+
 ConcurrentG1Refine::~ConcurrentG1Refine() {
   if (G1ConcRSLogCacheSize > 0) {
     assert(_card_counts != NULL, "Logic");
@@ -270,7 +300,23 @@
   int count;
   jbyte* cached_ptr = add_card_count(card_ptr, &count, defer);
   assert(cached_ptr != NULL, "bad cached card ptr");
-  assert(!is_young_card(cached_ptr), "shouldn't get a card in young region");
+
+  if (is_young_card(cached_ptr)) {
+    // The region containing cached_ptr has been freed during a clean up
+    // pause, reallocated, and tagged as young.
+    assert(cached_ptr != card_ptr, "shouldn't be");
+
+    // We've just inserted a new old-gen card pointer into the card count
+    // cache and evicted the previous contents of that count slot.
+    // The evicted card pointer has been determined to be in a young region
+    // and so cannot be the newly inserted card pointer (that will be
+    // in an old region).
+    // The count for newly inserted card will be set to zero during the
+    // insertion, so we don't want to defer the cleaning of the newly
+    // inserted card pointer.
+    assert(*defer == false, "deferring non-hot card");
+    return NULL;
+  }
 
   // The card pointer we obtained from card count cache is not hot
   // so do not store it in the cache; return it for immediate
@@ -377,3 +423,10 @@
   _g1h->g1_policy()->record_cc_clear_time(elapsed * 1000.0);
 #endif
 }
+
+void ConcurrentG1Refine::print_worker_threads_on(outputStream* st) const {
+  for (int i = 0; i < _n_threads; ++i) {
+    _threads[i]->print_on(st);
+    st->cr();
+  }
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp
--- a/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -29,6 +29,32 @@
 class ConcurrentG1Refine: public CHeapObj {
   ConcurrentG1RefineThread** _threads;
   int _n_threads;
+  int _n_worker_threads;
+ /*
+  * The value of the update buffer queue length falls into one of 3 zones:
+  * green, yellow, red. If the value is in [0, green) nothing is
+  * done, the buffers are left unprocessed to enable the caching effect of the
+  * dirtied cards. In the yellow zone [green, yellow) the concurrent refinement
+  * threads are gradually activated. In [yellow, red) all threads are
+  * running. If the length becomes red (max queue length) the mutators start
+  * processing the buffers.
+  *
+  * There are some interesting cases (when G1UseAdaptiveConcRefinement
+  * is turned off):
+  * 1) green = yellow = red = 0. In this case the mutator will process all
+  *    buffers. Except for those that are created by the deferred updates
+  *    machinery during a collection.
+  * 2) green = 0. Means no caching. Can be a good way to minimize the
+  *    amount of time spent updating rsets during a collection.
+  */
+  int _green_zone;
+  int _yellow_zone;
+  int _red_zone;
+
+  int _thread_threshold_step;
+
+  // Reset the threshold step value based of the current zone boundaries.
+  void reset_threshold_step();
 
   // The cache for card refinement.
   bool   _use_cache;
@@ -147,6 +173,8 @@
   void init(); // Accomplish some initialization that has to wait.
   void stop();
 
+  void reinitialize_threads();
+
   // Iterate over the conc refine threads
   void threads_do(ThreadClosure *tc);
 
@@ -178,5 +206,20 @@
 
   void clear_and_record_card_counts();
 
-  static size_t thread_num();
+  static int thread_num();
+
+  void print_worker_threads_on(outputStream* st) const;
+
+  void set_green_zone(int x)  { _green_zone = x;  }
+  void set_yellow_zone(int x) { _yellow_zone = x; }
+  void set_red_zone(int x)    { _red_zone = x;    }
+
+  int green_zone() const      { return _green_zone;  }
+  int yellow_zone() const     { return _yellow_zone; }
+  int red_zone() const        { return _red_zone;    }
+
+  int total_thread_num() const  { return _n_threads;        }
+  int worker_thread_num() const { return _n_worker_threads; }
+
+  int thread_threshold_step() const { return _thread_threshold_step; }
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -25,10 +25,6 @@
 #include "incls/_precompiled.incl"
 #include "incls/_concurrentG1RefineThread.cpp.incl"
 
-// ======= Concurrent Mark Thread ========
-
-// The CM thread is created when the G1 garbage collector is used
-
 ConcurrentG1RefineThread::
 ConcurrentG1RefineThread(ConcurrentG1Refine* cg1r, ConcurrentG1RefineThread *next,
                          int worker_id_offset, int worker_id) :
@@ -37,20 +33,42 @@
   _worker_id(worker_id),
   _active(false),
   _next(next),
+  _monitor(NULL),
   _cg1r(cg1r),
-  _vtime_accum(0.0),
-  _co_tracker(G1CRGroup),
-  _interval_ms(5.0)
+  _vtime_accum(0.0)
 {
+
+  // Each thread has its own monitor. The i-th thread is responsible for signalling
+  // to thread i+1 if the number of buffers in the queue exceeds a threashold for this
+  // thread. Monitors are also used to wake up the threads during termination.
+  // The 0th worker in notified by mutator threads and has a special monitor.
+  // The last worker is used for young gen rset size sampling.
+  if (worker_id > 0) {
+    _monitor = new Monitor(Mutex::nonleaf, "Refinement monitor", true);
+  } else {
+    _monitor = DirtyCardQ_CBL_mon;
+  }
+  initialize();
   create_and_start();
 }
 
+void ConcurrentG1RefineThread::initialize() {
+  if (_worker_id < cg1r()->worker_thread_num()) {
+    // Current thread activation threshold
+    _threshold = MIN2<int>(cg1r()->thread_threshold_step() * (_worker_id + 1) + cg1r()->green_zone(),
+                           cg1r()->yellow_zone());
+    // A thread deactivates once the number of buffer reached a deactivation threshold
+    _deactivation_threshold = MAX2<int>(_threshold - cg1r()->thread_threshold_step(), cg1r()->green_zone());
+  } else {
+    set_active(true);
+  }
+}
+
 void ConcurrentG1RefineThread::sample_young_list_rs_lengths() {
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
   G1CollectorPolicy* g1p = g1h->g1_policy();
   if (g1p->adaptive_young_list_length()) {
     int regions_visited = 0;
-
     g1h->young_list_rs_length_sampling_init();
     while (g1h->young_list_rs_length_sampling_more()) {
       g1h->young_list_rs_length_sampling_next();
@@ -71,104 +89,121 @@
   }
 }
 
-void ConcurrentG1RefineThread::run() {
-  initialize_in_thread();
+void ConcurrentG1RefineThread::run_young_rs_sampling() {
+  DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
   _vtime_start = os::elapsedVTime();
-  wait_for_universe_init();
-
-  _co_tracker.enable();
-  _co_tracker.start();
+  while(!_should_terminate) {
+    _sts.join();
+    sample_young_list_rs_lengths();
+    _sts.leave();
 
-  while (!_should_terminate) {
-    DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
-    // Wait for completed log buffers to exist.
-    {
-      MutexLockerEx x(DirtyCardQ_CBL_mon, Mutex::_no_safepoint_check_flag);
-      while (((_worker_id == 0 && !dcqs.process_completed_buffers()) ||
-              (_worker_id > 0 && !is_active())) &&
-             !_should_terminate) {
-         DirtyCardQ_CBL_mon->wait(Mutex::_no_safepoint_check_flag);
-      }
-    }
-
-    if (_should_terminate) {
-      return;
+    if (os::supports_vtime()) {
+      _vtime_accum = (os::elapsedVTime() - _vtime_start);
+    } else {
+      _vtime_accum = 0.0;
     }
 
-    // Now we take them off (this doesn't hold locks while it applies
-    // closures.)  (If we did a full collection, then we'll do a full
-    // traversal.
-    _sts.join();
-    int n_logs = 0;
-    int lower_limit = 0;
-    double start_vtime_sec; // only used when G1SmoothConcRefine is on
-    int prev_buffer_num; // only used when G1SmoothConcRefine is on
-    // This thread activation threshold
-    int threshold = G1UpdateBufferQueueProcessingThreshold * _worker_id;
-    // Next thread activation threshold
-    int next_threshold = threshold + G1UpdateBufferQueueProcessingThreshold;
-    int deactivation_threshold = MAX2<int>(threshold - G1UpdateBufferQueueProcessingThreshold / 2, 0);
+    MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
+    if (_should_terminate) {
+      break;
+    }
+    _monitor->wait(Mutex::_no_safepoint_check_flag, G1ConcRefinementServiceIntervalMillis);
+  }
+}
 
-    if (G1SmoothConcRefine) {
-      lower_limit = 0;
-      start_vtime_sec = os::elapsedVTime();
-      prev_buffer_num = (int) dcqs.completed_buffers_num();
-    } else {
-      lower_limit = G1UpdateBufferQueueProcessingThreshold / 4; // For now.
+void ConcurrentG1RefineThread::wait_for_completed_buffers() {
+  DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+  MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
+  while (!_should_terminate && !is_active()) {
+    _monitor->wait(Mutex::_no_safepoint_check_flag);
+  }
+}
+
+bool ConcurrentG1RefineThread::is_active() {
+  DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+  return _worker_id > 0 ? _active : dcqs.process_completed_buffers();
+}
+
+void ConcurrentG1RefineThread::activate() {
+  MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
+  if (_worker_id > 0) {
+    if (G1TraceConcRefinement) {
+      DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+      gclog_or_tty->print_cr("G1-Refine-activated worker %d, on threshold %d, current %d",
+                             _worker_id, _threshold, (int)dcqs.completed_buffers_num());
     }
-    while (dcqs.apply_closure_to_completed_buffer(_worker_id + _worker_id_offset, lower_limit)) {
-      double end_vtime_sec;
-      double elapsed_vtime_sec;
-      int elapsed_vtime_ms;
-      int curr_buffer_num = (int) dcqs.completed_buffers_num();
+    set_active(true);
+  } else {
+    DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+    dcqs.set_process_completed(true);
+  }
+  _monitor->notify();
+}
 
-      if (G1SmoothConcRefine) {
-        end_vtime_sec = os::elapsedVTime();
-        elapsed_vtime_sec = end_vtime_sec - start_vtime_sec;
-        elapsed_vtime_ms = (int) (elapsed_vtime_sec * 1000.0);
+void ConcurrentG1RefineThread::deactivate() {
+  MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
+  if (_worker_id > 0) {
+    if (G1TraceConcRefinement) {
+      DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+      gclog_or_tty->print_cr("G1-Refine-deactivated worker %d, off threshold %d, current %d",
+                             _worker_id, _deactivation_threshold, (int)dcqs.completed_buffers_num());
+    }
+    set_active(false);
+  } else {
+    DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+    dcqs.set_process_completed(false);
+  }
+}
+
+void ConcurrentG1RefineThread::run() {
+  initialize_in_thread();
+  wait_for_universe_init();
 
-        if (curr_buffer_num > prev_buffer_num ||
-            curr_buffer_num > next_threshold) {
-          decreaseInterval(elapsed_vtime_ms);
-        } else if (curr_buffer_num < prev_buffer_num) {
-          increaseInterval(elapsed_vtime_ms);
-        }
+  if (_worker_id >= cg1r()->worker_thread_num()) {
+    run_young_rs_sampling();
+    terminate();
+  }
+
+  _vtime_start = os::elapsedVTime();
+  while (!_should_terminate) {
+    DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+
+    // Wait for work
+    wait_for_completed_buffers();
+
+    if (_should_terminate) {
+      break;
+    }
+
+    _sts.join();
+
+    do {
+      int curr_buffer_num = (int)dcqs.completed_buffers_num();
+      // If the number of the buffers falls down into the yellow zone,
+      // that means that the transition period after the evacuation pause has ended.
+      if (dcqs.completed_queue_padding() > 0 && curr_buffer_num <= cg1r()->yellow_zone()) {
+        dcqs.set_completed_queue_padding(0);
       }
-      if (_worker_id == 0) {
-        sample_young_list_rs_lengths();
-      } else if (curr_buffer_num < deactivation_threshold) {
+
+      if (_worker_id > 0 && curr_buffer_num <= _deactivation_threshold) {
         // If the number of the buffer has fallen below our threshold
         // we should deactivate. The predecessor will reactivate this
         // thread should the number of the buffers cross the threshold again.
-        MutexLockerEx x(DirtyCardQ_CBL_mon, Mutex::_no_safepoint_check_flag);
         deactivate();
-        if (G1TraceConcurrentRefinement) {
-          gclog_or_tty->print_cr("G1-Refine-deactivated worker %d", _worker_id);
-        }
         break;
       }
-      _co_tracker.update(false);
 
       // Check if we need to activate the next thread.
-      if (curr_buffer_num > next_threshold && _next != NULL && !_next->is_active()) {
-        MutexLockerEx x(DirtyCardQ_CBL_mon, Mutex::_no_safepoint_check_flag);
+      if (_next != NULL && !_next->is_active() && curr_buffer_num > _next->_threshold) {
         _next->activate();
-        DirtyCardQ_CBL_mon->notify_all();
-        if (G1TraceConcurrentRefinement) {
-          gclog_or_tty->print_cr("G1-Refine-activated worker %d", _next->_worker_id);
-        }
       }
+    } while (dcqs.apply_closure_to_completed_buffer(_worker_id + _worker_id_offset, cg1r()->green_zone()));
 
-      if (G1SmoothConcRefine) {
-        prev_buffer_num = curr_buffer_num;
-        _sts.leave();
-        os::sleep(Thread::current(), (jlong) _interval_ms, false);
-        _sts.join();
-        start_vtime_sec = os::elapsedVTime();
-      }
-      n_logs++;
+    // We can exit the loop above while being active if there was a yield request.
+    if (is_active()) {
+      deactivate();
     }
-    _co_tracker.update(false);
+
     _sts.leave();
 
     if (os::supports_vtime()) {
@@ -177,19 +212,19 @@
       _vtime_accum = 0.0;
     }
   }
-  _sts.join();
-  _co_tracker.update(true);
-  _sts.leave();
   assert(_should_terminate, "just checking");
-
   terminate();
 }
 
 
 void ConcurrentG1RefineThread::yield() {
-  if (G1TraceConcurrentRefinement) gclog_or_tty->print_cr("G1-Refine-yield");
+  if (G1TraceConcRefinement) {
+    gclog_or_tty->print_cr("G1-Refine-yield");
+  }
   _sts.yield("G1 refine");
-  if (G1TraceConcurrentRefinement) gclog_or_tty->print_cr("G1-Refine-yield-end");
+  if (G1TraceConcRefinement) {
+    gclog_or_tty->print_cr("G1-Refine-yield-end");
+  }
 }
 
 void ConcurrentG1RefineThread::stop() {
@@ -200,8 +235,8 @@
   }
 
   {
-    MutexLockerEx x(DirtyCardQ_CBL_mon, Mutex::_no_safepoint_check_flag);
-    DirtyCardQ_CBL_mon->notify_all();
+    MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
+    _monitor->notify();
   }
 
   {
@@ -210,11 +245,17 @@
       Terminator_lock->wait();
     }
   }
-  if (G1TraceConcurrentRefinement) gclog_or_tty->print_cr("G1-Refine-stop");
+  if (G1TraceConcRefinement) {
+    gclog_or_tty->print_cr("G1-Refine-stop");
+  }
 }
 
-void ConcurrentG1RefineThread::print() {
-  gclog_or_tty->print("\"Concurrent G1 Refinement Thread\" ");
-  Thread::print();
-  gclog_or_tty->cr();
+void ConcurrentG1RefineThread::print() const {
+  print_on(tty);
 }
+
+void ConcurrentG1RefineThread::print_on(outputStream* st) const {
+  st->print("\"G1 Concurrent Refinement Thread#%d\" ", _worker_id);
+  Thread::print_on(st);
+  st->cr();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp
--- a/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -40,56 +40,47 @@
   // when the number of the rset update buffer crosses a certain threshold. A successor
   // would self-deactivate when the number of the buffers falls below the threshold.
   bool _active;
-  ConcurrentG1RefineThread *       _next;
- public:
-  virtual void run();
-
-  bool is_active()  { return _active;  }
-  void activate()   { _active = true;  }
-  void deactivate() { _active = false; }
-
- private:
-  ConcurrentG1Refine*              _cg1r;
-
-  COTracker                        _co_tracker;
-  double                           _interval_ms;
+  ConcurrentG1RefineThread* _next;
+  Monitor* _monitor;
+  ConcurrentG1Refine* _cg1r;
 
-  void decreaseInterval(int processing_time_ms) {
-    double min_interval_ms = (double) processing_time_ms;
-    _interval_ms = 0.8 * _interval_ms;
-    if (_interval_ms < min_interval_ms)
-      _interval_ms = min_interval_ms;
-  }
-  void increaseInterval(int processing_time_ms) {
-    double max_interval_ms = 9.0 * (double) processing_time_ms;
-    _interval_ms = 1.1 * _interval_ms;
-    if (max_interval_ms > 0 && _interval_ms > max_interval_ms)
-      _interval_ms = max_interval_ms;
-  }
+  int _thread_threshold_step;
+  // This thread activation threshold
+  int _threshold;
+  // This thread deactivation threshold
+  int _deactivation_threshold;
 
-  void sleepBeforeNextCycle();
+  void sample_young_list_rs_lengths();
+  void run_young_rs_sampling();
+  void wait_for_completed_buffers();
+
+  void set_active(bool x) { _active = x; }
+  bool is_active();
+  void activate();
+  void deactivate();
 
   // For use by G1CollectedHeap, which is a friend.
   static SuspendibleThreadSet* sts() { return &_sts; }
 
- public:
+public:
+  virtual void run();
   // Constructor
   ConcurrentG1RefineThread(ConcurrentG1Refine* cg1r, ConcurrentG1RefineThread* next,
                            int worker_id_offset, int worker_id);
 
+  void initialize();
+
   // Printing
-  void print();
+  void print() const;
+  void print_on(outputStream* st) const;
 
   // Total virtual time so far.
   double vtime_accum() { return _vtime_accum; }
 
-  ConcurrentG1Refine* cg1r()                     { return _cg1r;     }
-
-  void            sample_young_list_rs_lengths();
+  ConcurrentG1Refine* cg1r() { return _cg1r;     }
 
   // Yield for GC
-  void            yield();
-
+  void yield();
   // shutdown
   void stop();
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -237,7 +237,7 @@
   _index = next_index;
   for (int i = 0; i < n; i++) {
     int ind = start + i;
-    guarantee(ind < _capacity, "By overflow test above.");
+    assert(ind < _capacity, "By overflow test above.");
     _base[ind] = ptr_arr[i];
   }
 }
@@ -310,12 +310,12 @@
     if (res == index) {
       MemRegion mr = _base[next_index];
       if (mr.start() != NULL) {
-        tmp_guarantee_CM( mr.end() != NULL, "invariant" );
-        tmp_guarantee_CM( mr.word_size() > 0, "invariant" );
+        assert(mr.end() != NULL, "invariant");
+        assert(mr.word_size() > 0, "invariant");
         return mr;
       } else {
         // that entry was invalidated... let's skip it
-        tmp_guarantee_CM( mr.end() == NULL, "invariant" );
+        assert(mr.end() == NULL, "invariant");
       }
     }
     // Otherwise, we need to try again.
@@ -328,10 +328,10 @@
   for (int i = 0; i < _oops_do_bound; ++i) {
     MemRegion mr = _base[i];
     if (mr.start() != NULL) {
-      tmp_guarantee_CM( mr.end() != NULL, "invariant");
-      tmp_guarantee_CM( mr.word_size() > 0, "invariant" );
+      assert(mr.end() != NULL, "invariant");
+      assert(mr.word_size() > 0, "invariant");
       HeapRegion* hr = g1h->heap_region_containing(mr.start());
-      tmp_guarantee_CM( hr != NULL, "invariant" );
+      assert(hr != NULL, "invariant");
       if (hr->in_collection_set()) {
         // The region points into the collection set
         _base[i] = MemRegion();
@@ -339,7 +339,7 @@
       }
     } else {
       // that entry was invalidated... let's skip it
-      tmp_guarantee_CM( mr.end() == NULL, "invariant" );
+      assert(mr.end() == NULL, "invariant");
     }
   }
   return result;
@@ -433,8 +433,7 @@
   _total_counting_time(0.0),
   _total_rs_scrub_time(0.0),
 
-  _parallel_workers(NULL),
-  _cleanup_co_tracker(G1CLGroup)
+  _parallel_workers(NULL)
 {
   CMVerboseLevel verbose_level =
     (CMVerboseLevel) G1MarkingVerboseLevel;
@@ -448,7 +447,7 @@
     gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", "
                            "heap end = "PTR_FORMAT, _heap_start, _heap_end);
 
-  _markStack.allocate(G1MarkStackSize);
+  _markStack.allocate(MarkStackSize);
   _regionStack.allocate(G1MarkRegionStackSize);
 
   // Create & start a ConcurrentMark thread.
@@ -462,7 +461,7 @@
   assert(_markBitMap2.covers(rs), "_markBitMap2 inconsistency");
 
   SATBMarkQueueSet& satb_qs = JavaThread::satb_mark_queue_set();
-  satb_qs.set_buffer_size(G1SATBLogBufferSize);
+  satb_qs.set_buffer_size(G1SATBBufferSize);
 
   int size = (int) MAX2(ParallelGCThreads, (size_t)1);
   _par_cleanup_thread_state = NEW_C_HEAP_ARRAY(ParCleanupThreadState*, size);
@@ -484,8 +483,8 @@
     _accum_task_vtime[i] = 0.0;
   }
 
-  if (ParallelMarkingThreads > ParallelGCThreads) {
-    vm_exit_during_initialization("Can't have more ParallelMarkingThreads "
+  if (ConcGCThreads > ParallelGCThreads) {
+    vm_exit_during_initialization("Can't have more ConcGCThreads "
                                   "than ParallelGCThreads.");
   }
   if (ParallelGCThreads == 0) {
@@ -495,11 +494,11 @@
     _sleep_factor             = 0.0;
     _marking_task_overhead    = 1.0;
   } else {
-    if (ParallelMarkingThreads > 0) {
-      // notice that ParallelMarkingThreads overwrites G1MarkingOverheadPercent
+    if (ConcGCThreads > 0) {
+      // notice that ConcGCThreads overwrites G1MarkingOverheadPercent
       // if both are set
 
-      _parallel_marking_threads = ParallelMarkingThreads;
+      _parallel_marking_threads = ConcGCThreads;
       _sleep_factor             = 0.0;
       _marking_task_overhead    = 1.0;
     } else if (G1MarkingOverheadPercent > 0) {
@@ -543,8 +542,8 @@
     gclog_or_tty->print_cr("CL Sleep Factor          %1.4lf", cleanup_sleep_factor());
 #endif
 
-    guarantee( parallel_marking_threads() > 0, "peace of mind" );
-    _parallel_workers = new WorkGang("Parallel Marking Threads",
+    guarantee(parallel_marking_threads() > 0, "peace of mind");
+    _parallel_workers = new WorkGang("G1 Parallel Marking Threads",
                                      (int) parallel_marking_threads(), false, true);
     if (_parallel_workers == NULL)
       vm_exit_during_initialization("Failed necessary allocation.");
@@ -570,8 +569,7 @@
     return;
 
   MemRegion committed = _g1h->g1_committed();
-  tmp_guarantee_CM( committed.start() == _heap_start,
-                    "start shouldn't change" );
+  assert(committed.start() == _heap_start, "start shouldn't change");
   HeapWord* new_end = committed.end();
   if (new_end > _heap_end) {
     // The heap has been expanded.
@@ -593,9 +591,10 @@
   _heap_start = committed.start();
   _heap_end   = committed.end();
 
-  guarantee( _heap_start != NULL &&
-             _heap_end != NULL   &&
-             _heap_start < _heap_end, "heap bounds should look ok" );
+  // Separated the asserts so that we know which one fires.
+  assert(_heap_start != NULL, "heap bounds should look ok");
+  assert(_heap_end != NULL, "heap bounds should look ok");
+  assert(_heap_start < _heap_end, "heap bounds should look ok");
 
   // reset all the marking data structures and any necessary flags
   clear_marking_state();
@@ -615,7 +614,7 @@
 }
 
 void ConcurrentMark::set_phase(size_t active_tasks, bool concurrent) {
-  guarantee( active_tasks <= _max_task_num, "we should not have more" );
+  assert(active_tasks <= _max_task_num, "we should not have more");
 
   _active_tasks = active_tasks;
   // Need to update the three data structures below according to the
@@ -635,8 +634,8 @@
     // We currently assume that the concurrent flag has been set to
     // false before we start remark. At this point we should also be
     // in a STW phase.
-    guarantee( !concurrent_marking_in_progress(), "invariant" );
-    guarantee( _finger == _heap_end, "only way to get here" );
+    assert(!concurrent_marking_in_progress(), "invariant");
+    assert(_finger == _heap_end, "only way to get here");
     update_g1_committed(true);
   }
 }
@@ -668,39 +667,6 @@
 // Called at the first checkpoint.
 //
 
-#define PRINT_REACHABLE_AT_INITIAL_MARK 0
-#if PRINT_REACHABLE_AT_INITIAL_MARK
-static FILE* reachable_file = NULL;
-
-class PrintReachableClosure: public OopsInGenClosure {
-  CMBitMap* _bm;
-  int _level;
-public:
-  PrintReachableClosure(CMBitMap* bm) :
-    _bm(bm), _level(0) {
-    guarantee(reachable_file != NULL, "pre-condition");
-  }
-  void do_oop(oop* p) {
-    oop obj = *p;
-    HeapWord* obj_addr = (HeapWord*)obj;
-    if (obj == NULL) return;
-    fprintf(reachable_file, "%d: "PTR_FORMAT" -> "PTR_FORMAT" (%d)\n",
-            _level, p, (void*) obj, _bm->isMarked(obj_addr));
-    if (!_bm->isMarked(obj_addr)) {
-      _bm->mark(obj_addr);
-      _level++;
-      obj->oop_iterate(this);
-      _level--;
-    }
-  }
-};
-#endif // PRINT_REACHABLE_AT_INITIAL_MARK
-
-#define SEND_HEAP_DUMP_TO_FILE 0
-#if SEND_HEAP_DUMP_TO_FILE
-static FILE* heap_dump_file = NULL;
-#endif // SEND_HEAP_DUMP_TO_FILE
-
 void ConcurrentMark::clearNextBitmap() {
    guarantee(!G1CollectedHeap::heap()->mark_in_progress(), "Precondition.");
 
@@ -738,31 +704,9 @@
 
   _has_aborted = false;
 
-  // Find all the reachable objects...
-#if PRINT_REACHABLE_AT_INITIAL_MARK
-  guarantee(reachable_file == NULL, "Protocol");
-  char fn_buf[100];
-  sprintf(fn_buf, "/tmp/reachable.txt.%d", os::current_process_id());
-  reachable_file = fopen(fn_buf, "w");
-  // clear the mark bitmap (no grey objects to start with)
-  _nextMarkBitMap->clearAll();
-  PrintReachableClosure prcl(_nextMarkBitMap);
-  g1h->process_strong_roots(
-                            false,   // fake perm gen collection
-                            SharedHeap::SO_AllClasses,
-                            &prcl, // Regular roots
-                            &prcl    // Perm Gen Roots
-                            );
-  // The root iteration above "consumed" dirty cards in the perm gen.
-  // Therefore, as a shortcut, we dirty all such cards.
-  g1h->rem_set()->invalidate(g1h->perm_gen()->used_region(), false);
-  fclose(reachable_file);
-  reachable_file = NULL;
-  // clear the mark bitmap again.
-  _nextMarkBitMap->clearAll();
-  COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
-  COMPILER2_PRESENT(DerivedPointerTable::clear());
-#endif // PRINT_REACHABLE_AT_INITIAL_MARK
+  if (G1PrintReachableAtInitialMark) {
+    print_reachable(true, "before");
+  }
 
   // Initialise marking structures. This has to be done in a STW phase.
   reset();
@@ -816,25 +760,12 @@
   rp->setup_policy(false); // snapshot the soft ref policy to be used in this cycle
 
   SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
-  satb_mq_set.set_process_completed_threshold(G1SATBProcessCompletedThreshold);
   satb_mq_set.set_active_all_threads(true);
 
   // update_g1_committed() will be called at the end of an evac pause
   // when marking is on. So, it's also called at the end of the
   // initial-mark pause to update the heap end, if the heap expands
   // during it. No need to call it here.
-
-  guarantee( !_cleanup_co_tracker.enabled(), "invariant" );
-
-  size_t max_marking_threads =
-    MAX2((size_t) 1, parallel_marking_threads());
-  for (int i = 0; i < (int)_max_task_num; ++i) {
-    _tasks[i]->enable_co_tracker();
-    if (i < (int) max_marking_threads)
-      _tasks[i]->reset_co_tracker(marking_task_overhead());
-    else
-      _tasks[i]->reset_co_tracker(0.0);
-  }
 }
 
 // Checkpoint the roots into this generation from outside
@@ -845,7 +776,6 @@
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
 
   double start = os::elapsedTime();
-  GCOverheadReporter::recordSTWStart(start);
 
   G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
   g1p->record_concurrent_mark_init_start();
@@ -866,9 +796,11 @@
   g1h->set_marking_started();
   g1h->rem_set()->prepare_for_younger_refs_iterate(false);
 
-  g1h->process_strong_roots(false,   // fake perm gen collection
+  g1h->process_strong_roots(true,    // activate StrongRootsScope
+                            false,   // fake perm gen collection
                             SharedHeap::SO_AllClasses,
                             &notOlder, // Regular roots
+                            NULL,     // do not visit active blobs
                             &older    // Perm Gen Roots
                             );
   checkpointRootsInitialPost();
@@ -876,7 +808,6 @@
   // Statistics.
   double end = os::elapsedTime();
   _init_times.add((end - start) * 1000.0);
-  GCOverheadReporter::recordSTWEnd(end);
 
   g1p->record_concurrent_mark_init_end();
 }
@@ -945,8 +876,8 @@
   // initial-mark that the committed space is expanded during the
   // pause without CM observing this change. So the assertions below
   // is a bit conservative; but better than nothing.
-  tmp_guarantee_CM( _g1h->g1_committed().contains(addr),
-                    "address should be within the heap bounds" );
+  assert(_g1h->g1_committed().contains(addr),
+         "address should be within the heap bounds");
 
   if (!_nextMarkBitMap->isMarked(addr))
     _nextMarkBitMap->parMark(addr);
@@ -972,12 +903,15 @@
   if (mr.start() < finger) {
     // The finger is always heap region aligned and it is not possible
     // for mr to span heap regions.
-    tmp_guarantee_CM( mr.end() <= finger, "invariant" );
-
-    tmp_guarantee_CM( mr.start() <= mr.end() &&
-                      _heap_start <= mr.start() &&
-                      mr.end() <= _heap_end,
-                  "region boundaries should fall within the committed space" );
+    assert(mr.end() <= finger, "invariant");
+
+    // Separated the asserts so that we know which one fires.
+    assert(mr.start() <= mr.end(),
+           "region boundaries should fall within the committed space");
+    assert(_heap_start <= mr.start(),
+           "region boundaries should fall within the committed space");
+    assert(mr.end() <= _heap_end,
+           "region boundaries should fall within the committed space");
     if (verbose_low())
       gclog_or_tty->print_cr("[global] region ["PTR_FORMAT", "PTR_FORMAT") "
                              "below the finger, pushing it",
@@ -1026,16 +960,15 @@
 
 public:
   void work(int worker_i) {
-    guarantee( Thread::current()->is_ConcurrentGC_thread(),
-               "this should only be done by a conc GC thread" );
+    assert(Thread::current()->is_ConcurrentGC_thread(),
+           "this should only be done by a conc GC thread");
 
     double start_vtime = os::elapsedVTime();
 
     ConcurrentGCThread::stsJoin();
 
-    guarantee( (size_t)worker_i < _cm->active_tasks(), "invariant" );
+    assert((size_t) worker_i < _cm->active_tasks(), "invariant");
     CMTask* the_task = _cm->task(worker_i);
-    the_task->start_co_tracker();
     the_task->record_start_time();
     if (!_cm->has_aborted()) {
       do {
@@ -1061,8 +994,6 @@
         double end_time2_sec = os::elapsedTime();
         double elapsed_time2_sec = end_time2_sec - start_time_sec;
 
-        the_task->update_co_tracker();
-
 #if 0
           gclog_or_tty->print_cr("CM: elapsed %1.4lf ms, sleep %1.4lf ms, "
                                  "overhead %1.4lf",
@@ -1074,12 +1005,11 @@
       } while (!_cm->has_aborted() && the_task->has_aborted());
     }
     the_task->record_end_time();
-    guarantee( !the_task->has_aborted() || _cm->has_aborted(), "invariant" );
+    guarantee(!the_task->has_aborted() || _cm->has_aborted(), "invariant");
 
     ConcurrentGCThread::stsLeave();
 
     double end_vtime = os::elapsedVTime();
-    the_task->update_co_tracker(true);
     _cm->update_accum_task_vtime(worker_i, end_vtime - start_vtime);
   }
 
@@ -1133,7 +1063,6 @@
   g1p->record_concurrent_mark_remark_start();
 
   double start = os::elapsedTime();
-  GCOverheadReporter::recordSTWStart(start);
 
   checkpointRootsFinalWork();
 
@@ -1173,11 +1102,6 @@
   _remark_weak_ref_times.add((now - mark_work_end) * 1000.0);
   _remark_times.add((now - start) * 1000.0);
 
-  GCOverheadReporter::recordSTWEnd(now);
-  for (int i = 0; i < (int)_max_task_num; ++i)
-    _tasks[i]->disable_co_tracker();
-  _cleanup_co_tracker.enable();
-  _cleanup_co_tracker.reset(cleanup_task_overhead());
   g1p->record_concurrent_mark_remark_end();
 }
 
@@ -1188,7 +1112,6 @@
 
   CMBitMapRO* _bm;
   ConcurrentMark* _cm;
-  COTracker* _co_tracker;
   bool _changed;
   bool _yield;
   size_t _words_done;
@@ -1205,8 +1128,7 @@
   void mark_card_num_range(intptr_t start_card_num, intptr_t last_card_num) {
     for (intptr_t i = start_card_num; i <= last_card_num; i++) {
 #if CARD_BM_TEST_MODE
-      guarantee(_card_bm->at(i - _bottom_card_num),
-                "Should already be set.");
+      guarantee(_card_bm->at(i - _bottom_card_num), "Should already be set.");
 #else
       _card_bm->par_at_put(i - _bottom_card_num, 1);
 #endif
@@ -1216,12 +1138,10 @@
 public:
   CalcLiveObjectsClosure(bool final,
                          CMBitMapRO *bm, ConcurrentMark *cm,
-                         BitMap* region_bm, BitMap* card_bm,
-                         COTracker* co_tracker) :
+                         BitMap* region_bm, BitMap* card_bm) :
     _bm(bm), _cm(cm), _changed(false), _yield(true),
     _words_done(0), _tot_live(0), _tot_used(0),
-    _region_bm(region_bm), _card_bm(card_bm),
-    _final(final), _co_tracker(co_tracker),
+    _region_bm(region_bm), _card_bm(card_bm),_final(final),
     _regions_done(0), _start_vtime_sec(0.0)
   {
     _bottom_card_num =
@@ -1265,9 +1185,6 @@
   }
 
   bool doHeapRegion(HeapRegion* hr) {
-    if (_co_tracker != NULL)
-      _co_tracker->update();
-
     if (!_final && _regions_done == 0)
       _start_vtime_sec = os::elapsedVTime();
 
@@ -1356,7 +1273,7 @@
       // In any case, we set the last card num.
       last_card_num = obj_last_card_num;
 
-      marked_bytes += obj_sz * HeapWordSize;
+      marked_bytes += (size_t)obj_sz * HeapWordSize;
       // Find the next marked object after this one.
       start = _bm->getNextMarkedWordAddress(start + 1, nextTop);
       _changed = true;
@@ -1396,12 +1313,6 @@
         if (elapsed_vtime_sec > (10.0 / 1000.0)) {
           jlong sleep_time_ms =
             (jlong) (elapsed_vtime_sec * _cm->cleanup_sleep_factor() * 1000.0);
-#if 0
-          gclog_or_tty->print_cr("CL: elapsed %1.4lf ms, sleep %1.4lf ms, "
-                                 "overhead %1.4lf",
-                                 elapsed_vtime_sec * 1000.0, (double) sleep_time_ms,
-                                 _co_tracker->concOverhead(os::elapsedTime()));
-#endif
           os::sleep(Thread::current(), sleep_time_ms, false);
           _start_vtime_sec = end_vtime_sec;
         }
@@ -1421,15 +1332,11 @@
 
 
 void ConcurrentMark::calcDesiredRegions() {
-  guarantee( _cleanup_co_tracker.enabled(), "invariant" );
-  _cleanup_co_tracker.start();
-
   _region_bm.clear();
   _card_bm.clear();
   CalcLiveObjectsClosure calccl(false /*final*/,
                                 nextMarkBitMap(), this,
-                                &_region_bm, &_card_bm,
-                                &_cleanup_co_tracker);
+                                &_region_bm, &_card_bm);
   G1CollectedHeap *g1h = G1CollectedHeap::heap();
   g1h->heap_region_iterate(&calccl);
 
@@ -1437,8 +1344,6 @@
     calccl.reset();
     g1h->heap_region_iterate(&calccl);
   } while (calccl.changed());
-
-  _cleanup_co_tracker.update(true);
 }
 
 class G1ParFinalCountTask: public AbstractGangTask {
@@ -1472,8 +1377,7 @@
   void work(int i) {
     CalcLiveObjectsClosure calccl(true /*final*/,
                                   _bm, _g1h->concurrent_mark(),
-                                  _region_bm, _card_bm,
-                                  NULL /* CO tracker */);
+                                  _region_bm, _card_bm);
     calccl.no_yield();
     if (ParallelGCThreads > 0) {
       _g1h->heap_region_par_iterate_chunked(&calccl, i,
@@ -1483,7 +1387,7 @@
     }
     assert(calccl.complete(), "Shouldn't have yielded!");
 
-    guarantee( (size_t)i < _n_workers, "invariant" );
+    assert((size_t) i < _n_workers, "invariant");
     _live_bytes[i] = calccl.tot_live();
     _used_bytes[i] = calccl.tot_used();
   }
@@ -1663,13 +1567,10 @@
                      /* prev marking */ true);
   }
 
-  _cleanup_co_tracker.disable();
-
   G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
   g1p->record_concurrent_mark_cleanup_start();
 
   double start = os::elapsedTime();
-  GCOverheadReporter::recordSTWStart(start);
 
   // Do counting once more with the world stopped for good measure.
   G1ParFinalCountTask g1_par_count_task(g1h, nextMarkBitMap(),
@@ -1774,7 +1675,6 @@
   // Statistics.
   double end = os::elapsedTime();
   _cleanup_times.add((end - start) * 1000.0);
-  GCOverheadReporter::recordSTWEnd(end);
 
   // G1CollectedHeap::heap()->print();
   // gclog_or_tty->print_cr("HEAP GC TIME STAMP : %d",
@@ -1819,14 +1719,14 @@
       hd->rem_set()->clear();
       HeapRegion* next_hd = hd->next_from_unclean_list();
       (void)list->pop();
-      guarantee(list->hd() == next_hd, "how not?");
+      assert(list->hd() == next_hd, "how not?");
       _g1h->put_region_on_unclean_list(hd);
       if (!hd->isHumongous()) {
         // Add this to the _free_regions count by 1.
         _g1h->finish_free_region_work(0, 0, 1, NULL);
       }
       hd = list->hd();
-      guarantee(hd == next_hd, "how not?");
+      assert(hd == next_hd, "how not?");
     }
   }
 }
@@ -1963,7 +1863,7 @@
   g1h->ensure_parsability(false);
 
   if (ParallelGCThreads > 0) {
-    g1h->change_strong_roots_parity();
+    G1CollectedHeap::StrongRootsScope srs(g1h);
     // this is remark, so we'll use up all available threads
     int active_workers = ParallelGCThreads;
     set_phase(active_workers, false);
@@ -1976,11 +1876,8 @@
     g1h->set_par_threads(n_workers);
     g1h->workers()->run_task(&remarkTask);
     g1h->set_par_threads(0);
-
-    SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
-    guarantee( satb_mq_set.completed_buffers_num() == 0, "invariant" );
   } else {
-    g1h->change_strong_roots_parity();
+    G1CollectedHeap::StrongRootsScope srs(g1h);
     // this is remark, so we'll use up all available threads
     int active_workers = 1;
     set_phase(active_workers, false);
@@ -1990,10 +1887,9 @@
     // active_workers will be fewer. The extra ones will just bail out
     // immediately.
     remarkTask.work(0);
-
-    SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
-    guarantee( satb_mq_set.completed_buffers_num() == 0, "invariant" );
   }
+  SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
+  guarantee(satb_mq_set.completed_buffers_num() == 0, "invariant");
 
   print_stats();
 
@@ -2012,15 +1908,21 @@
 #endif
 }
 
+#ifndef PRODUCT
+
 class ReachablePrinterOopClosure: public OopClosure {
 private:
   G1CollectedHeap* _g1h;
   CMBitMapRO*      _bitmap;
   outputStream*    _out;
+  bool             _use_prev_marking;
 
 public:
-  ReachablePrinterOopClosure(CMBitMapRO* bitmap, outputStream* out) :
-    _bitmap(bitmap), _g1h(G1CollectedHeap::heap()), _out(out) { }
+  ReachablePrinterOopClosure(CMBitMapRO*   bitmap,
+                             outputStream* out,
+                             bool          use_prev_marking) :
+    _g1h(G1CollectedHeap::heap()),
+    _bitmap(bitmap), _out(out), _use_prev_marking(use_prev_marking) { }
 
   void do_oop(narrowOop* p) { do_oop_work(p); }
   void do_oop(      oop* p) { do_oop_work(p); }
@@ -2034,15 +1936,24 @@
       str = "outside G1 reserved";
     else {
       HeapRegion* hr  = _g1h->heap_region_containing(obj);
-      guarantee( hr != NULL, "invariant" );
-      if (hr->obj_allocated_since_prev_marking(obj)) {
+      guarantee(hr != NULL, "invariant");
+      bool over_tams = false;
+      if (_use_prev_marking) {
+        over_tams = hr->obj_allocated_since_prev_marking(obj);
+      } else {
+        over_tams = hr->obj_allocated_since_next_marking(obj);
+      }
+
+      if (over_tams) {
         str = "over TAMS";
-        if (_bitmap->isMarked((HeapWord*) obj))
+        if (_bitmap->isMarked((HeapWord*) obj)) {
           str2 = " AND MARKED";
-      } else if (_bitmap->isMarked((HeapWord*) obj))
+        }
+      } else if (_bitmap->isMarked((HeapWord*) obj)) {
         str = "marked";
-      else
+      } else {
         str = "#### NOT MARKED ####";
+      }
     }
 
     _out->print_cr("    "PTR_FORMAT" contains "PTR_FORMAT" %s%s",
@@ -2052,16 +1963,19 @@
 
 class ReachablePrinterClosure: public BitMapClosure {
 private:
-  CMBitMapRO* _bitmap;
+  CMBitMapRO*   _bitmap;
   outputStream* _out;
+  bool          _use_prev_marking;
 
 public:
-  ReachablePrinterClosure(CMBitMapRO* bitmap, outputStream* out) :
-    _bitmap(bitmap), _out(out) { }
+  ReachablePrinterClosure(CMBitMapRO*   bitmap,
+                          outputStream* out,
+                          bool          use_prev_marking) :
+    _bitmap(bitmap), _out(out), _use_prev_marking(use_prev_marking) { }
 
   bool do_bit(size_t offset) {
     HeapWord* addr = _bitmap->offsetToHeapWord(offset);
-    ReachablePrinterOopClosure oopCl(_bitmap, _out);
+    ReachablePrinterOopClosure oopCl(_bitmap, _out, _use_prev_marking);
 
     _out->print_cr("  obj "PTR_FORMAT", offset %10d (marked)", addr, offset);
     oop(addr)->oop_iterate(&oopCl);
@@ -2073,76 +1987,111 @@
 
 class ObjInRegionReachablePrinterClosure : public ObjectClosure {
 private:
-  CMBitMapRO* _bitmap;
+  CMBitMapRO*   _bitmap;
   outputStream* _out;
+  bool          _use_prev_marking;
 
 public:
+  ObjInRegionReachablePrinterClosure(CMBitMapRO*   bitmap,
+                                     outputStream* out,
+                                     bool          use_prev_marking) :
+    _bitmap(bitmap), _out(out), _use_prev_marking(use_prev_marking) { }
+
   void do_object(oop o) {
-    ReachablePrinterOopClosure oopCl(_bitmap, _out);
+    ReachablePrinterOopClosure oopCl(_bitmap, _out, _use_prev_marking);
 
     _out->print_cr("  obj "PTR_FORMAT" (over TAMS)", (void*) o);
     o->oop_iterate(&oopCl);
     _out->print_cr("");
   }
-
-  ObjInRegionReachablePrinterClosure(CMBitMapRO* bitmap, outputStream* out) :
-    _bitmap(bitmap), _out(out) { }
 };
 
 class RegionReachablePrinterClosure : public HeapRegionClosure {
 private:
-  CMBitMapRO* _bitmap;
+  CMBitMapRO*   _bitmap;
   outputStream* _out;
+  bool          _use_prev_marking;
 
 public:
   bool doHeapRegion(HeapRegion* hr) {
     HeapWord* b = hr->bottom();
     HeapWord* e = hr->end();
     HeapWord* t = hr->top();
-    HeapWord* p = hr->prev_top_at_mark_start();
+    HeapWord* p = NULL;
+    if (_use_prev_marking) {
+      p = hr->prev_top_at_mark_start();
+    } else {
+      p = hr->next_top_at_mark_start();
+    }
     _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" "
-                   "PTAMS: "PTR_FORMAT, b, e, t, p);
+                   "TAMS: "PTR_FORMAT, b, e, t, p);
     _out->print_cr("");
 
-    ObjInRegionReachablePrinterClosure ocl(_bitmap, _out);
+    ObjInRegionReachablePrinterClosure ocl(_bitmap, _out, _use_prev_marking);
     hr->object_iterate_mem_careful(MemRegion(p, t), &ocl);
 
     return false;
   }
 
-  RegionReachablePrinterClosure(CMBitMapRO* bitmap,
-                                outputStream* out) :
-    _bitmap(bitmap), _out(out) { }
+  RegionReachablePrinterClosure(CMBitMapRO*   bitmap,
+                                outputStream* out,
+                                bool          use_prev_marking) :
+    _bitmap(bitmap), _out(out), _use_prev_marking(use_prev_marking) { }
 };
 
-void ConcurrentMark::print_prev_bitmap_reachable() {
-  outputStream* out = gclog_or_tty;
-
-#if SEND_HEAP_DUMP_TO_FILE
-  guarantee(heap_dump_file == NULL, "Protocol");
-  char fn_buf[100];
-  sprintf(fn_buf, "/tmp/dump.txt.%d", os::current_process_id());
-  heap_dump_file = fopen(fn_buf, "w");
-  fileStream fstream(heap_dump_file);
-  out = &fstream;
-#endif // SEND_HEAP_DUMP_TO_FILE
-
-  RegionReachablePrinterClosure rcl(_prevMarkBitMap, out);
-  out->print_cr("--- ITERATING OVER REGIONS WITH PTAMS < TOP");
+void ConcurrentMark::print_reachable(bool use_prev_marking, const char* str) {
+  gclog_or_tty->print_cr("== Doing reachable object dump... ");
+
+  if (G1PrintReachableBaseFile == NULL) {
+    gclog_or_tty->print_cr("  #### error: no base file defined");
+    return;
+  }
+
+  if (strlen(G1PrintReachableBaseFile) + 1 + strlen(str) >
+      (JVM_MAXPATHLEN - 1)) {
+    gclog_or_tty->print_cr("  #### error: file name too long");
+    return;
+  }
+
+  char file_name[JVM_MAXPATHLEN];
+  sprintf(file_name, "%s.%s", G1PrintReachableBaseFile, str);
+  gclog_or_tty->print_cr("  dumping to file %s", file_name);
+
+  fileStream fout(file_name);
+  if (!fout.is_open()) {
+    gclog_or_tty->print_cr("  #### error: could not open file");
+    return;
+  }
+
+  outputStream* out = &fout;
+
+  CMBitMapRO* bitmap = NULL;
+  if (use_prev_marking) {
+    bitmap = _prevMarkBitMap;
+  } else {
+    bitmap = _nextMarkBitMap;
+  }
+
+  out->print_cr("-- USING %s", (use_prev_marking) ? "PTAMS" : "NTAMS");
+  out->cr();
+
+  RegionReachablePrinterClosure rcl(bitmap, out, use_prev_marking);
+  out->print_cr("--- ITERATING OVER REGIONS WITH TAMS < TOP");
+  out->cr();
   _g1h->heap_region_iterate(&rcl);
-  out->print_cr("");
-
-  ReachablePrinterClosure cl(_prevMarkBitMap, out);
-  out->print_cr("--- REACHABLE OBJECTS ON THE BITMAP");
-  _prevMarkBitMap->iterate(&cl);
-  out->print_cr("");
-
-#if SEND_HEAP_DUMP_TO_FILE
-  fclose(heap_dump_file);
-  heap_dump_file = NULL;
-#endif // SEND_HEAP_DUMP_TO_FILE
+  out->cr();
+
+  ReachablePrinterClosure cl(bitmap, out, use_prev_marking);
+  out->print_cr("--- ITERATING OVER MARKED OBJECTS ON THE BITMAP");
+  out->cr();
+  bitmap->iterate(&cl);
+  out->cr();
+
+  gclog_or_tty->print_cr("  done");
 }
 
+#endif // PRODUCT
+
 // This note is for drainAllSATBBuffers and the code in between.
 // In the future we could reuse a task to do this work during an
 // evacuation pause (since now tasks are not active and can be claimed
@@ -2170,7 +2119,7 @@
   HeapWord* objAddr = (HeapWord*) obj;
   assert(obj->is_oop_or_null(true /* ignore mark word */), "Error");
   if (_g1h->is_in_g1_reserved(objAddr)) {
-    tmp_guarantee_CM( obj != NULL, "is_in_g1_reserved should ensure this" );
+    assert(obj != NULL, "is_in_g1_reserved should ensure this");
     HeapRegion* hr = _g1h->heap_region_containing(obj);
     if (_g1h->is_obj_ill(obj, hr)) {
       if (verbose_high())
@@ -2212,7 +2161,7 @@
   satb_mq_set.iterate_closure_all_threads();
 
   satb_mq_set.set_closure(NULL);
-  guarantee( satb_mq_set.completed_buffers_num() == 0, "invariant" );
+  assert(satb_mq_set.completed_buffers_num() == 0, "invariant");
 }
 
 void ConcurrentMark::markPrev(oop p) {
@@ -2245,7 +2194,7 @@
   // _heap_end will not change underneath our feet; it only changes at
   // yield points.
   while (finger < _heap_end) {
-    tmp_guarantee_CM( _g1h->is_in_g1_reserved(finger), "invariant" );
+    assert(_g1h->is_in_g1_reserved(finger), "invariant");
 
     // is the gap between reading the finger and doing the CAS too long?
 
@@ -2267,7 +2216,7 @@
 
       // notice that _finger == end cannot be guaranteed here since,
       // someone else might have moved the finger even further
-      guarantee( _finger >= end, "the finger should have moved forward" );
+      assert(_finger >= end, "the finger should have moved forward");
 
       if (verbose_low())
         gclog_or_tty->print_cr("[%d] we were successful with region = "
@@ -2279,8 +2228,8 @@
                                  "returning it ", task_num, curr_region);
         return curr_region;
       } else {
-        tmp_guarantee_CM( limit == bottom,
-                          "the region limit should be at bottom" );
+        assert(limit == bottom,
+               "the region limit should be at bottom");
         if (verbose_low())
           gclog_or_tty->print_cr("[%d] region "PTR_FORMAT" is empty, "
                                  "returning NULL", task_num, curr_region);
@@ -2289,7 +2238,7 @@
         return NULL;
       }
     } else {
-      guarantee( _finger > finger, "the finger should have moved forward" );
+      assert(_finger > finger, "the finger should have moved forward");
       if (verbose_low())
         gclog_or_tty->print_cr("[%d] somebody else moved the finger, "
                                "global finger = "PTR_FORMAT", "
@@ -2327,7 +2276,7 @@
   if (_regionStack.invalidate_entries_into_cset()) {
     // otherwise, any gray objects copied during the evacuation pause
     // might not be visited.
-    guarantee( _should_gray_objects, "invariant" );
+    assert(_should_gray_objects, "invariant");
   }
 }
 
@@ -2625,24 +2574,6 @@
     _should_gray_objects = true;
 }
 
-void ConcurrentMark::disable_co_trackers() {
-  if (has_aborted()) {
-    if (_cleanup_co_tracker.enabled())
-      _cleanup_co_tracker.disable();
-    for (int i = 0; i < (int)_max_task_num; ++i) {
-      CMTask* task = _tasks[i];
-      if (task->co_tracker_enabled())
-        task->disable_co_tracker();
-    }
-  } else {
-    guarantee( !_cleanup_co_tracker.enabled(), "invariant" );
-    for (int i = 0; i < (int)_max_task_num; ++i) {
-      CMTask* task = _tasks[i];
-      guarantee( !task->co_tracker_enabled(), "invariant" );
-    }
-  }
-}
-
 // abandon current marking iteration due to a Full GC
 void ConcurrentMark::abort() {
   // Clear all marks to force marking thread to do nothing
@@ -2700,6 +2631,10 @@
                 cmThread()->vtime_count_accum());
 }
 
+void ConcurrentMark::print_worker_threads_on(outputStream* st) const {
+  _parallel_workers->print_worker_threads_on(st);
+}
+
 // Closures
 // XXX: there seems to be a lot of code  duplication here;
 // should refactor and consolidate the shared code.
@@ -2774,12 +2709,12 @@
 
   bool do_bit(size_t offset) {
     HeapWord* addr = _nextMarkBitMap->offsetToHeapWord(offset);
-    tmp_guarantee_CM( _nextMarkBitMap->isMarked(addr), "invariant" );
-    tmp_guarantee_CM( addr < _cm->finger(), "invariant" );
+    assert(_nextMarkBitMap->isMarked(addr), "invariant");
+    assert( addr < _cm->finger(), "invariant");
 
     if (_scanning_heap_region) {
       statsOnly( _task->increase_objs_found_on_bitmap() );
-      tmp_guarantee_CM( addr >= _task->finger(), "invariant" );
+      assert(addr >= _task->finger(), "invariant");
       // We move that task's local finger along.
       _task->move_finger_to(addr);
     } else {
@@ -2824,8 +2759,9 @@
   virtual void do_oop(      oop* p) { do_oop_work(p); }
 
   template <class T> void do_oop_work(T* p) {
-    tmp_guarantee_CM( _g1h->is_in_g1_reserved((HeapWord*) p), "invariant" );
-    tmp_guarantee_CM( !_g1h->heap_region_containing((HeapWord*) p)->is_on_free_list(), "invariant" );
+    assert(_g1h->is_in_g1_reserved((HeapWord*) p), "invariant");
+    assert(!_g1h->heap_region_containing((HeapWord*) p)->is_on_free_list(),
+           "invariant");
 
     oop obj = oopDesc::load_decode_heap_oop(p);
     if (_cm->verbose_high())
@@ -2842,8 +2778,11 @@
 };
 
 void CMTask::setup_for_region(HeapRegion* hr) {
-  tmp_guarantee_CM( hr != NULL && !hr->continuesHumongous(),
-      "claim_region() should have filtered out continues humongous regions" );
+  // Separated the asserts so that we know which one fires.
+  assert(hr != NULL,
+        "claim_region() should have filtered out continues humongous regions");
+  assert(!hr->continuesHumongous(),
+        "claim_region() should have filtered out continues humongous regions");
 
   if (_cm->verbose_low())
     gclog_or_tty->print_cr("[%d] setting up for region "PTR_FORMAT,
@@ -2871,9 +2810,9 @@
     // as the region is not supposed to be empty in the first place)
     _finger = bottom;
   } else if (limit >= _region_limit) {
-    tmp_guarantee_CM( limit >= _finger, "peace of mind" );
+    assert(limit >= _finger, "peace of mind");
   } else {
-    tmp_guarantee_CM( limit < _region_limit, "only way to get here" );
+    assert(limit < _region_limit, "only way to get here");
     // This can happen under some pretty unusual circumstances.  An
     // evacuation pause empties the region underneath our feet (NTAMS
     // at bottom). We then do some allocation in the region (NTAMS
@@ -2891,7 +2830,7 @@
 }
 
 void CMTask::giveup_current_region() {
-  tmp_guarantee_CM( _curr_region != NULL, "invariant" );
+  assert(_curr_region != NULL, "invariant");
   if (_cm->verbose_low())
     gclog_or_tty->print_cr("[%d] giving up region "PTR_FORMAT,
                            _task_id, _curr_region);
@@ -2909,7 +2848,7 @@
 }
 
 void CMTask::reset(CMBitMap* nextMarkBitMap) {
-  guarantee( nextMarkBitMap != NULL, "invariant" );
+  guarantee(nextMarkBitMap != NULL, "invariant");
 
   if (_cm->verbose_low())
     gclog_or_tty->print_cr("[%d] resetting", _task_id);
@@ -2975,7 +2914,7 @@
   HeapWord* objAddr = (HeapWord*) obj;
   assert(obj->is_oop_or_null(true /* ignore mark word */), "Error");
   if (_g1h->is_in_g1_reserved(objAddr)) {
-    tmp_guarantee_CM( obj != NULL, "is_in_g1_reserved should ensure this" );
+    assert(obj != NULL, "is_in_g1_reserved should ensure this");
     HeapRegion* hr =  _g1h->heap_region_containing(obj);
     if (_g1h->is_obj_ill(obj, hr)) {
       if (_cm->verbose_high())
@@ -3036,10 +2975,11 @@
 
 void CMTask::push(oop obj) {
   HeapWord* objAddr = (HeapWord*) obj;
-  tmp_guarantee_CM( _g1h->is_in_g1_reserved(objAddr), "invariant" );
-  tmp_guarantee_CM( !_g1h->heap_region_containing(objAddr)->is_on_free_list(), "invariant" );
-  tmp_guarantee_CM( !_g1h->is_obj_ill(obj), "invariant" );
-  tmp_guarantee_CM( _nextMarkBitMap->isMarked(objAddr), "invariant" );
+  assert(_g1h->is_in_g1_reserved(objAddr), "invariant");
+  assert(!_g1h->heap_region_containing(objAddr)->is_on_free_list(),
+         "invariant");
+  assert(!_g1h->is_obj_ill(obj), "invariant");
+  assert(_nextMarkBitMap->isMarked(objAddr), "invariant");
 
   if (_cm->verbose_high())
     gclog_or_tty->print_cr("[%d] pushing "PTR_FORMAT, _task_id, (void*) obj);
@@ -3058,7 +2998,7 @@
     // stack, we should have definitely removed some entries from the
     // local queue. So, there must be space on it.
     bool success = _task_queue->push(obj);
-    tmp_guarantee_CM( success, "invariant" );
+    assert(success, "invariant");
   }
 
   statsOnly( int tmp_size = _task_queue->size();
@@ -3068,9 +3008,9 @@
 }
 
 void CMTask::reached_limit() {
-  tmp_guarantee_CM( _words_scanned >= _words_scanned_limit ||
-                    _refs_reached >= _refs_reached_limit ,
-                 "shouldn't have been called otherwise" );
+  assert(_words_scanned >= _words_scanned_limit ||
+         _refs_reached >= _refs_reached_limit ,
+         "shouldn't have been called otherwise");
   regular_clock_call();
 }
 
@@ -3228,8 +3168,8 @@
   oop buffer[global_stack_transfer_size];
   int n;
   _cm->mark_stack_pop(buffer, global_stack_transfer_size, &n);
-  tmp_guarantee_CM( n <= global_stack_transfer_size,
-                    "we should not pop more than the given limit" );
+  assert(n <= global_stack_transfer_size,
+         "we should not pop more than the given limit");
   if (n > 0) {
     // yes, we did actually pop at least one entry
 
@@ -3241,7 +3181,7 @@
       bool success = _task_queue->push(buffer[i]);
       // We only call this when the local queue is empty or under a
       // given target limit. So, we do not expect this push to fail.
-      tmp_guarantee_CM( success, "invariant" );
+      assert(success, "invariant");
     }
 
     statsOnly( int tmp_size = _task_queue->size();
@@ -3281,10 +3221,9 @@
         gclog_or_tty->print_cr("[%d] popped "PTR_FORMAT, _task_id,
                                (void*) obj);
 
-      tmp_guarantee_CM( _g1h->is_in_g1_reserved((HeapWord*) obj),
-                        "invariant" );
-      tmp_guarantee_CM( !_g1h->heap_region_containing(obj)->is_on_free_list(),
-                        "invariant" );
+      assert(_g1h->is_in_g1_reserved((HeapWord*) obj), "invariant" );
+      assert(!_g1h->heap_region_containing(obj)->is_on_free_list(),
+             "invariant");
 
       scan_object(obj);
 
@@ -3306,7 +3245,7 @@
 
   // We have a policy to drain the local queue before we attempt to
   // drain the global stack.
-  tmp_guarantee_CM( partially || _task_queue->size() == 0, "invariant" );
+  assert(partially || _task_queue->size() == 0, "invariant");
 
   // Decide what the target size is, depending whether we're going to
   // drain it partially (so that other tasks can steal if they run out
@@ -3387,9 +3326,9 @@
 
   _draining_satb_buffers = false;
 
-  tmp_guarantee_CM( has_aborted() ||
-                    concurrent() ||
-                    satb_mq_set.completed_buffers_num() == 0, "invariant" );
+  assert(has_aborted() ||
+         concurrent() ||
+         satb_mq_set.completed_buffers_num() == 0, "invariant");
 
   if (ParallelGCThreads > 0)
     satb_mq_set.set_par_closure(_task_id, NULL);
@@ -3405,8 +3344,8 @@
   if (has_aborted())
     return;
 
-  tmp_guarantee_CM( _region_finger == NULL,
-                    "it should be NULL when we're not scanning a region" );
+  assert(_region_finger == NULL,
+         "it should be NULL when we're not scanning a region");
 
   if (!_cm->region_stack_empty()) {
     if (_cm->verbose_low())
@@ -3422,12 +3361,12 @@
         gclog_or_tty->print_cr("[%d] we are scanning region "
                                "["PTR_FORMAT", "PTR_FORMAT")",
                                _task_id, mr.start(), mr.end());
-      tmp_guarantee_CM( mr.end() <= _cm->finger(),
-                        "otherwise the region shouldn't be on the stack" );
+      assert(mr.end() <= _cm->finger(),
+             "otherwise the region shouldn't be on the stack");
       assert(!mr.is_empty(), "Only non-empty regions live on the region stack");
       if (_nextMarkBitMap->iterate(bc, mr)) {
-        tmp_guarantee_CM( !has_aborted(),
-               "cannot abort the task without aborting the bitmap iteration" );
+        assert(!has_aborted(),
+               "cannot abort the task without aborting the bitmap iteration");
 
         // We finished iterating over the region without aborting.
         regular_clock_call();
@@ -3439,14 +3378,14 @@
           statsOnly(if (mr.start() != NULL) ++_region_stack_pops );
         }
       } else {
-        guarantee( has_aborted(), "currently the only way to do so" );
+        assert(has_aborted(), "currently the only way to do so");
 
         // The only way to abort the bitmap iteration is to return
         // false from the do_bit() method. However, inside the
         // do_bit() method we move the _region_finger to point to the
         // object currently being looked at. So, if we bail out, we
         // have definitely set _region_finger to something non-null.
-        guarantee( _region_finger != NULL, "invariant" );
+        assert(_region_finger != NULL, "invariant");
 
         // The iteration was actually aborted. So now _region_finger
         // points to the address of the object we last scanned. If we
@@ -3475,13 +3414,6 @@
       _region_finger = NULL;
     }
 
-    // We only push regions on the region stack during evacuation
-    // pauses. So if we come out the above iteration because we region
-    // stack is empty, it will remain empty until the next yield
-    // point. So, the guarantee below is safe.
-    guarantee( has_aborted() || _cm->region_stack_empty(),
-               "only way to exit the loop" );
-
     if (_cm->verbose_low())
       gclog_or_tty->print_cr("[%d] drained region stack, size = %d",
                              _task_id, _cm->region_stack_size());
@@ -3639,21 +3571,21 @@
  *****************************************************************************/
 
 void CMTask::do_marking_step(double time_target_ms) {
-  guarantee( time_target_ms >= 1.0, "minimum granularity is 1ms" );
-  guarantee( concurrent() == _cm->concurrent(), "they should be the same" );
-
-  guarantee( concurrent() || _cm->region_stack_empty(),
-             "the region stack should have been cleared before remark" );
-  guarantee( _region_finger == NULL,
-             "this should be non-null only when a region is being scanned" );
+  assert(time_target_ms >= 1.0, "minimum granularity is 1ms");
+  assert(concurrent() == _cm->concurrent(), "they should be the same");
+
+  assert(concurrent() || _cm->region_stack_empty(),
+         "the region stack should have been cleared before remark");
+  assert(_region_finger == NULL,
+         "this should be non-null only when a region is being scanned");
 
   G1CollectorPolicy* g1_policy = _g1h->g1_policy();
-  guarantee( _task_queues != NULL, "invariant" );
-  guarantee( _task_queue != NULL,  "invariant" );
-  guarantee( _task_queues->queue(_task_id) == _task_queue, "invariant" );
-
-  guarantee( !_claimed,
-             "only one thread should claim this task at any one time" );
+  assert(_task_queues != NULL, "invariant");
+  assert(_task_queue != NULL, "invariant");
+  assert(_task_queues->queue(_task_id) == _task_queue, "invariant");
+
+  assert(!_claimed,
+         "only one thread should claim this task at any one time");
 
   // OK, this doesn't safeguard again all possible scenarios, as it is
   // possible for two threads to set the _claimed flag at the same
@@ -3724,9 +3656,8 @@
   do {
     if (!has_aborted() && _curr_region != NULL) {
       // This means that we're already holding on to a region.
-      tmp_guarantee_CM( _finger != NULL,
-                        "if region is not NULL, then the finger "
-                        "should not be NULL either" );
+      assert(_finger != NULL, "if region is not NULL, then the finger "
+             "should not be NULL either");
 
       // We might have restarted this task after an evacuation pause
       // which might have evacuated the region we're holding on to
@@ -3758,13 +3689,13 @@
         giveup_current_region();
         regular_clock_call();
       } else {
-        guarantee( has_aborted(), "currently the only way to do so" );
+        assert(has_aborted(), "currently the only way to do so");
         // The only way to abort the bitmap iteration is to return
         // false from the do_bit() method. However, inside the
         // do_bit() method we move the _finger to point to the
         // object currently being looked at. So, if we bail out, we
         // have definitely set _finger to something non-null.
-        guarantee( _finger != NULL, "invariant" );
+        assert(_finger != NULL, "invariant");
 
         // Region iteration was actually aborted. So now _finger
         // points to the address of the object we last scanned. If we
@@ -3791,9 +3722,10 @@
     while (!has_aborted() && _curr_region == NULL && !_cm->out_of_regions()) {
       // We are going to try to claim a new region. We should have
       // given up on the previous one.
-      tmp_guarantee_CM( _curr_region  == NULL &&
-                        _finger       == NULL &&
-                        _region_limit == NULL, "invariant" );
+      // Separated the asserts so that we know which one fires.
+      assert(_curr_region  == NULL, "invariant");
+      assert(_finger       == NULL, "invariant");
+      assert(_region_limit == NULL, "invariant");
       if (_cm->verbose_low())
         gclog_or_tty->print_cr("[%d] trying to claim a new region", _task_id);
       HeapRegion* claimed_region = _cm->claim_region(_task_id);
@@ -3807,7 +3739,7 @@
                                  _task_id, claimed_region);
 
         setup_for_region(claimed_region);
-        tmp_guarantee_CM( _curr_region == claimed_region, "invariant" );
+        assert(_curr_region == claimed_region, "invariant");
       }
       // It is important to call the regular clock here. It might take
       // a while to claim a region if, for example, we hit a large
@@ -3818,8 +3750,8 @@
     }
 
     if (!has_aborted() && _curr_region == NULL) {
-      tmp_guarantee_CM( _cm->out_of_regions(),
-                        "at this point we should be out of regions" );
+      assert(_cm->out_of_regions(),
+             "at this point we should be out of regions");
     }
   } while ( _curr_region != NULL && !has_aborted());
 
@@ -3828,8 +3760,8 @@
     // tasks might be pushing objects to it concurrently. We also cannot
     // check if the region stack is empty because if a thread is aborting
     // it can push a partially done region back.
-    tmp_guarantee_CM( _cm->out_of_regions(),
-                      "at this point we should be out of regions" );
+    assert(_cm->out_of_regions(),
+           "at this point we should be out of regions");
 
     if (_cm->verbose_low())
       gclog_or_tty->print_cr("[%d] all regions claimed", _task_id);
@@ -3853,8 +3785,8 @@
     // tasks might be pushing objects to it concurrently. We also cannot
     // check if the region stack is empty because if a thread is aborting
     // it can push a partially done region back.
-    guarantee( _cm->out_of_regions() &&
-               _task_queue->size() == 0, "only way to reach here" );
+    assert(_cm->out_of_regions() && _task_queue->size() == 0,
+           "only way to reach here");
 
     if (_cm->verbose_low())
       gclog_or_tty->print_cr("[%d] starting to steal", _task_id);
@@ -3870,8 +3802,8 @@
 
         statsOnly( ++_steals );
 
-        tmp_guarantee_CM( _nextMarkBitMap->isMarked((HeapWord*) obj),
-                          "any stolen object should be marked" );
+        assert(_nextMarkBitMap->isMarked((HeapWord*) obj),
+               "any stolen object should be marked");
         scan_object(obj);
 
         // And since we're towards the end, let's totally drain the
@@ -3891,8 +3823,9 @@
     // tasks might be concurrently pushing objects on it. We also cannot
     // check if the region stack is empty because if a thread is aborting
     // it can push a partially done region back.
-    guarantee( _cm->out_of_regions() &&
-               _task_queue->size() == 0, "only way to reach here" );
+    // Separated the asserts so that we know which one fires.
+    assert(_cm->out_of_regions(), "only way to reach here");
+    assert(_task_queue->size() == 0, "only way to reach here");
 
     if (_cm->verbose_low())
       gclog_or_tty->print_cr("[%d] starting termination protocol", _task_id);
@@ -3912,7 +3845,7 @@
       if (_task_id == 0) {
         // let's allow task 0 to do this
         if (concurrent()) {
-          guarantee( _cm->concurrent_marking_in_progress(), "invariant" );
+          assert(_cm->concurrent_marking_in_progress(), "invariant");
           // we need to set this to false before the next
           // safepoint. This way we ensure that the marking phase
           // doesn't observe any more heap expansions.
@@ -3921,15 +3854,16 @@
       }
 
       // We can now guarantee that the global stack is empty, since
-      // all other tasks have finished.
-      guarantee( _cm->out_of_regions() &&
-                 _cm->region_stack_empty() &&
-                 _cm->mark_stack_empty() &&
-                 _task_queue->size() == 0 &&
-                 !_cm->has_overflown() &&
-                 !_cm->mark_stack_overflow() &&
-                 !_cm->region_stack_overflow(),
-                 "only way to reach here" );
+      // all other tasks have finished. We separated the guarantees so
+      // that, if a condition is false, we can immediately find out
+      // which one.
+      guarantee(_cm->out_of_regions(), "only way to reach here");
+      guarantee(_cm->region_stack_empty(), "only way to reach here");
+      guarantee(_cm->mark_stack_empty(), "only way to reach here");
+      guarantee(_task_queue->size() == 0, "only way to reach here");
+      guarantee(!_cm->has_overflown(), "only way to reach here");
+      guarantee(!_cm->mark_stack_overflow(), "only way to reach here");
+      guarantee(!_cm->region_stack_overflow(), "only way to reach here");
 
       if (_cm->verbose_low())
         gclog_or_tty->print_cr("[%d] all tasks terminated", _task_id);
@@ -4018,15 +3952,14 @@
                CMTaskQueue* task_queue,
                CMTaskQueueSet* task_queues)
   : _g1h(G1CollectedHeap::heap()),
-    _co_tracker(G1CMGroup),
     _task_id(task_id), _cm(cm),
     _claimed(false),
     _nextMarkBitMap(NULL), _hash_seed(17),
     _task_queue(task_queue),
     _task_queues(task_queues),
     _oop_closure(NULL) {
-  guarantee( task_queue != NULL, "invariant" );
-  guarantee( task_queues != NULL, "invariant" );
+  guarantee(task_queue != NULL, "invariant");
+  guarantee(task_queues != NULL, "invariant");
 
   statsOnly( _clock_due_to_scanning = 0;
              _clock_due_to_marking  = 0 );
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentMark.hpp
--- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -295,12 +295,6 @@
 } while (0)
 #endif // _MARKING_STATS_
 
-// Some extra guarantees that I like to also enable in optimised mode
-// when debugging. If you want to enable them, comment out the assert
-// macro and uncomment out the guaratee macro
-// #define tmp_guarantee_CM(expr, str) guarantee(expr, str)
-#define tmp_guarantee_CM(expr, str) assert(expr, str)
-
 typedef enum {
   no_verbose  = 0,   // verbose turned off
   stats_verbose,     // only prints stats at the end of marking
@@ -407,8 +401,6 @@
   // verbose level
   CMVerboseLevel          _verbose_level;
 
-  COTracker               _cleanup_co_tracker;
-
   // These two fields are used to implement the optimisation that
   // avoids pushing objects on the global/region stack if there are
   // no collection set regions above the lowest finger.
@@ -487,15 +479,15 @@
 
   // Returns the task with the given id
   CMTask* task(int id) {
-    guarantee( 0 <= id && id < (int) _active_tasks, "task id not within "
-               "active bounds" );
+    assert(0 <= id && id < (int) _active_tasks,
+           "task id not within active bounds");
     return _tasks[id];
   }
 
   // Returns the task queue with the given id
   CMTaskQueue* task_queue(int id) {
-    guarantee( 0 <= id && id < (int) _active_tasks, "task queue id not within "
-               "active bounds" );
+    assert(0 <= id && id < (int) _active_tasks,
+           "task queue id not within active bounds");
     return (CMTaskQueue*) _task_queues->queue(id);
   }
 
@@ -620,10 +612,11 @@
   // we do nothing.
   void markAndGrayObjectIfNecessary(oop p);
 
-  // This iterates over the bitmap of the previous marking and prints
-  // out all objects that are marked on the bitmap and indicates
-  // whether what they point to is also marked or not.
-  void print_prev_bitmap_reachable();
+  // This iterates over the marking bitmap (either prev or next) and
+  // prints out all objects that are marked on the bitmap and indicates
+  // whether what they point to is also marked or not. It also iterates
+  // the objects over TAMS (either prev or next).
+  void print_reachable(bool use_prev_marking, const char* str);
 
   // Clear the next marking bitmap (will be called concurrently).
   void clearNextBitmap();
@@ -720,13 +713,13 @@
   // Called to abort the marking cycle after a Full GC takes palce.
   void abort();
 
-  void disable_co_trackers();
-
   // This prints the global/local fingers. It is used for debugging.
   NOT_PRODUCT(void print_finger();)
 
   void print_summary_info();
 
+  void print_worker_threads_on(outputStream* st) const;
+
   // The following indicate whether a given verbose level has been
   // set. Notice that anything above stats is conditional to
   // _MARKING_VERBOSE_ having been set to 1
@@ -773,9 +766,6 @@
   // number of calls to this task
   int                         _calls;
 
-  // concurrent overhead over a single CPU for this task
-  COTracker                   _co_tracker;
-
   // when the virtual timer reaches this time, the marking step should
   // exit
   double                      _time_target_ms;
@@ -928,27 +918,6 @@
 
   void set_concurrent(bool concurrent) { _concurrent = concurrent; }
 
-  void enable_co_tracker() {
-    guarantee( !_co_tracker.enabled(), "invariant" );
-    _co_tracker.enable();
-  }
-  void disable_co_tracker() {
-    guarantee( _co_tracker.enabled(), "invariant" );
-    _co_tracker.disable();
-  }
-  bool co_tracker_enabled() {
-    return _co_tracker.enabled();
-  }
-  void reset_co_tracker(double starting_conc_overhead = 0.0) {
-    _co_tracker.reset(starting_conc_overhead);
-  }
-  void start_co_tracker() {
-    _co_tracker.start();
-  }
-  void update_co_tracker(bool force_end = false) {
-    _co_tracker.update(force_end);
-  }
-
   // The main method of this class which performs a marking step
   // trying not to exceed the given duration. However, it might exit
   // prematurely, according to some conditions (i.e. SATB buffers are
@@ -987,8 +956,7 @@
 
   // It scans an object and visits its children.
   void scan_object(oop obj) {
-    tmp_guarantee_CM( _nextMarkBitMap->isMarked((HeapWord*) obj),
-                      "invariant" );
+    assert(_nextMarkBitMap->isMarked((HeapWord*) obj), "invariant");
 
     if (_cm->verbose_high())
       gclog_or_tty->print_cr("[%d] we're scanning object "PTR_FORMAT,
@@ -1027,14 +995,13 @@
 
   // moves the local finger to a new location
   inline void move_finger_to(HeapWord* new_finger) {
-    tmp_guarantee_CM( new_finger >= _finger && new_finger < _region_limit,
-                   "invariant" );
+    assert(new_finger >= _finger && new_finger < _region_limit, "invariant");
     _finger = new_finger;
   }
 
   // moves the region finger to a new location
   inline void move_region_finger_to(HeapWord* new_finger) {
-    tmp_guarantee_CM( new_finger < _cm->finger(), "invariant" );
+    assert(new_finger < _cm->finger(), "invariant");
     _region_finger = new_finger;
   }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -260,10 +260,6 @@
         }
       }
 
-      _sts.join();
-      _cm->disable_co_trackers();
-      _sts.leave();
-
       // we now want to allow clearing of the marking bitmap to be
       // suspended by a collection pause.
       _sts.join();
@@ -290,10 +286,14 @@
   }
 }
 
-void ConcurrentMarkThread::print() {
-  gclog_or_tty->print("\"Concurrent Mark GC Thread\" ");
-  Thread::print();
-  gclog_or_tty->cr();
+void ConcurrentMarkThread::print() const {
+  print_on(tty);
+}
+
+void ConcurrentMarkThread::print_on(outputStream* st) const {
+  st->print("\"G1 Main Concurrent Mark GC Thread\" ");
+  Thread::print_on(st);
+  st->cr();
 }
 
 void ConcurrentMarkThread::sleepBeforeNextCycle() {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp
--- a/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -57,7 +57,8 @@
   static SurrogateLockerThread* slt() { return _slt; }
 
   // Printing
-  void print();
+  void print_on(outputStream* st) const;
+  void print() const;
 
   // Total virtual time so far.
   double vtime_accum();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 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
@@ -35,8 +35,7 @@
 int ConcurrentZFThread::_regions_filled = 0;
 
 ConcurrentZFThread::ConcurrentZFThread() :
-  ConcurrentGCThread(),
-  _co_tracker(G1ZFGroup)
+  ConcurrentGCThread()
 {
   create_and_start();
 }
@@ -71,8 +70,6 @@
   Thread* thr_self = Thread::current();
   _vtime_start = os::elapsedVTime();
   wait_for_universe_init();
-  _co_tracker.enable();
-  _co_tracker.start();
 
   G1CollectedHeap* g1 = G1CollectedHeap::heap();
   _sts.join();
@@ -135,10 +132,7 @@
     }
     _vtime_accum = (os::elapsedVTime() - _vtime_start);
     _sts.join();
-
-    _co_tracker.update();
   }
-  _co_tracker.update(false);
   _sts.leave();
 
   assert(_should_terminate, "just checking");
@@ -163,10 +157,14 @@
   }
 }
 
-void ConcurrentZFThread::print() {
-  gclog_or_tty->print("\"Concurrent ZF Thread\" ");
-  Thread::print();
-  gclog_or_tty->cr();
+void ConcurrentZFThread::print() const {
+  print_on(tty);
+}
+
+void ConcurrentZFThread::print_on(outputStream* st) const {
+  st->print("\"G1 Concurrent Zero-Fill Thread\" ");
+  Thread::print_on(st);
+  st->cr();
 }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/concurrentZFThread.hpp
--- a/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -42,8 +42,6 @@
   // Number of regions CFZ thread fills.
   static int _regions_filled;
 
-  COTracker _co_tracker;
-
   double _vtime_start;  // Initial virtual time.
 
   // These are static because the "print_summary_info" method is, and
@@ -63,7 +61,8 @@
   virtual void run();
 
   // Printing
-  void print();
+  void print_on(outputStream* st) const;
+  void print() const;
 
   // Waits until "r" has been zero-filled.  Requires caller to hold the
   // ZF_mon.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
--- a/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -61,8 +61,8 @@
 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list
 #endif // _MSC_VER
 
-DirtyCardQueueSet::DirtyCardQueueSet() :
-  PtrQueueSet(true /*notify_when_complete*/),
+DirtyCardQueueSet::DirtyCardQueueSet(bool notify_when_complete) :
+  PtrQueueSet(notify_when_complete),
   _closure(NULL),
   _shared_dirty_card_queue(this, true /*perm*/),
   _free_ids(NULL),
@@ -77,12 +77,12 @@
 }
 
 void DirtyCardQueueSet::initialize(Monitor* cbl_mon, Mutex* fl_lock,
+                                   int process_completed_threshold,
                                    int max_completed_queue,
                                    Mutex* lock, PtrQueueSet* fl_owner) {
-  PtrQueueSet::initialize(cbl_mon, fl_lock, max_completed_queue, fl_owner);
+  PtrQueueSet::initialize(cbl_mon, fl_lock, process_completed_threshold,
+                          max_completed_queue, fl_owner);
   set_buffer_size(G1UpdateBufferSize);
-  set_process_completed_threshold(G1UpdateBufferQueueProcessingThreshold);
-
   _shared_dirty_card_queue.set_lock(lock);
   _free_ids = new FreeIdSet((int) num_par_ids(), _cbl_mon);
 }
@@ -154,9 +154,10 @@
   return b;
 }
 
-DirtyCardQueueSet::CompletedBufferNode*
-DirtyCardQueueSet::get_completed_buffer_lock(int stop_at) {
-  CompletedBufferNode* nd = NULL;
+
+BufferNode*
+DirtyCardQueueSet::get_completed_buffer(int stop_at) {
+  BufferNode* nd = NULL;
   MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag);
 
   if ((int)_n_completed_buffers <= stop_at) {
@@ -166,53 +167,31 @@
 
   if (_completed_buffers_head != NULL) {
     nd = _completed_buffers_head;
-    _completed_buffers_head = nd->next;
+    _completed_buffers_head = nd->next();
     if (_completed_buffers_head == NULL)
       _completed_buffers_tail = NULL;
     _n_completed_buffers--;
+    assert(_n_completed_buffers >= 0, "Invariant");
   }
   debug_only(assert_completed_buffer_list_len_correct_locked());
   return nd;
 }
 
-// We only do this in contexts where there is no concurrent enqueueing.
-DirtyCardQueueSet::CompletedBufferNode*
-DirtyCardQueueSet::get_completed_buffer_CAS() {
-  CompletedBufferNode* nd = _completed_buffers_head;
-
-  while (nd != NULL) {
-    CompletedBufferNode* next = nd->next;
-    CompletedBufferNode* result =
-      (CompletedBufferNode*)Atomic::cmpxchg_ptr(next,
-                                                &_completed_buffers_head,
-                                                nd);
-    if (result == nd) {
-      return result;
-    } else {
-      nd = _completed_buffers_head;
-    }
-  }
-  assert(_completed_buffers_head == NULL, "Loop post");
-  _completed_buffers_tail = NULL;
-  return NULL;
-}
-
 bool DirtyCardQueueSet::
 apply_closure_to_completed_buffer_helper(int worker_i,
-                                         CompletedBufferNode* nd) {
+                                         BufferNode* nd) {
   if (nd != NULL) {
+    void **buf = BufferNode::make_buffer_from_node(nd);
+    size_t index = nd->index();
     bool b =
-      DirtyCardQueue::apply_closure_to_buffer(_closure, nd->buf,
-                                              nd->index, _sz,
+      DirtyCardQueue::apply_closure_to_buffer(_closure, buf,
+                                              index, _sz,
                                               true, worker_i);
-    void** buf = nd->buf;
-    size_t index = nd->index;
-    delete nd;
     if (b) {
       deallocate_buffer(buf);
       return true;  // In normal case, go on to next buffer.
     } else {
-      enqueue_complete_buffer(buf, index, true);
+      enqueue_complete_buffer(buf, index);
       return false;
     }
   } else {
@@ -222,40 +201,36 @@
 
 bool DirtyCardQueueSet::apply_closure_to_completed_buffer(int worker_i,
                                                           int stop_at,
-                                                          bool with_CAS)
+                                                          bool during_pause)
 {
-  CompletedBufferNode* nd = NULL;
-  if (with_CAS) {
-    guarantee(stop_at == 0, "Precondition");
-    nd = get_completed_buffer_CAS();
-  } else {
-    nd = get_completed_buffer_lock(stop_at);
-  }
+  assert(!during_pause || stop_at == 0, "Should not leave any completed buffers during a pause");
+  BufferNode* nd = get_completed_buffer(stop_at);
   bool res = apply_closure_to_completed_buffer_helper(worker_i, nd);
   if (res) Atomic::inc(&_processed_buffers_rs_thread);
   return res;
 }
 
 void DirtyCardQueueSet::apply_closure_to_all_completed_buffers() {
-  CompletedBufferNode* nd = _completed_buffers_head;
+  BufferNode* nd = _completed_buffers_head;
   while (nd != NULL) {
     bool b =
-      DirtyCardQueue::apply_closure_to_buffer(_closure, nd->buf, 0, _sz,
-                                              false);
+      DirtyCardQueue::apply_closure_to_buffer(_closure,
+                                              BufferNode::make_buffer_from_node(nd),
+                                              0, _sz, false);
     guarantee(b, "Should not stop early.");
-    nd = nd->next;
+    nd = nd->next();
   }
 }
 
 void DirtyCardQueueSet::abandon_logs() {
   assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint.");
-  CompletedBufferNode* buffers_to_delete = NULL;
+  BufferNode* buffers_to_delete = NULL;
   {
     MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag);
     while (_completed_buffers_head != NULL) {
-      CompletedBufferNode* nd = _completed_buffers_head;
-      _completed_buffers_head = nd->next;
-      nd->next = buffers_to_delete;
+      BufferNode* nd = _completed_buffers_head;
+      _completed_buffers_head = nd->next();
+      nd->set_next(buffers_to_delete);
       buffers_to_delete = nd;
     }
     _n_completed_buffers = 0;
@@ -263,10 +238,9 @@
     debug_only(assert_completed_buffer_list_len_correct_locked());
   }
   while (buffers_to_delete != NULL) {
-    CompletedBufferNode* nd = buffers_to_delete;
-    buffers_to_delete = nd->next;
-    deallocate_buffer(nd->buf);
-    delete nd;
+    BufferNode* nd = buffers_to_delete;
+    buffers_to_delete = nd->next();
+    deallocate_buffer(BufferNode::make_buffer_from_node(nd));
   }
   // Since abandon is done only at safepoints, we can safely manipulate
   // these queues.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp
--- a/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 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
@@ -84,11 +84,12 @@
   jint _processed_buffers_rs_thread;
 
 public:
-  DirtyCardQueueSet();
+  DirtyCardQueueSet(bool notify_when_complete = true);
 
   void initialize(Monitor* cbl_mon, Mutex* fl_lock,
-                  int max_completed_queue = 0,
-                  Mutex* lock = NULL, PtrQueueSet* fl_owner = NULL);
+                  int process_completed_threshold,
+                  int max_completed_queue,
+                  Mutex* lock, PtrQueueSet* fl_owner = NULL);
 
   // The number of parallel ids that can be claimed to allow collector or
   // mutator threads to do card-processing work.
@@ -120,12 +121,13 @@
   // is returned to the completed buffer set, and this call returns false.
   bool apply_closure_to_completed_buffer(int worker_i = 0,
                                          int stop_at = 0,
-                                         bool with_CAS = false);
+                                         bool during_pause = false);
+
   bool apply_closure_to_completed_buffer_helper(int worker_i,
-                                                CompletedBufferNode* nd);
+                                                BufferNode* nd);
 
-  CompletedBufferNode* get_completed_buffer_CAS();
-  CompletedBufferNode* get_completed_buffer_lock(int stop_at);
+  BufferNode* get_completed_buffer(int stop_at);
+
   // Applies the current closure to all completed buffers,
   // non-consumptively.
   void apply_closure_to_all_completed_buffers();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -25,6 +25,8 @@
 #include "incls/_precompiled.incl"
 #include "incls/_g1CollectedHeap.cpp.incl"
 
+size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0;
+
 // turn it on so that the contents of the young list (scan-only /
 // to-be-collected) are printed at "strategic" points before / during
 // / after the collection --- this is useful for debugging
@@ -581,7 +583,7 @@
            res->zero_fill_state() == HeapRegion::Allocated)),
          "Non-young alloc Regions must be zero filled (and non-H)");
 
-  if (G1PrintRegions) {
+  if (G1PrintHeapRegions) {
     if (res != NULL) {
       gclog_or_tty->print_cr("new alloc region %d:["PTR_FORMAT", "PTR_FORMAT"], "
                              "top "PTR_FORMAT,
@@ -926,8 +928,9 @@
     TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
     TraceTime t(full ? "Full GC (System.gc())" : "Full GC", PrintGC, true, gclog_or_tty);
 
+    TraceMemoryManagerStats tms(true /* fullGC */);
+
     double start = os::elapsedTime();
-    GCOverheadReporter::recordSTWStart(start);
     g1_policy()->record_full_collection_start();
 
     gc_prologue(true);
@@ -1000,6 +1003,8 @@
 
     COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
 
+    MemoryService::track_memory_usage();
+
     if (VerifyAfterGC && total_collections() >= VerifyGCStartAt) {
       HandleMark hm;  // Discard invalid handles created during verification
       gclog_or_tty->print(" VerifyAfterGC:");
@@ -1049,7 +1054,6 @@
     }
 
     double end = os::elapsedTime();
-    GCOverheadReporter::recordSTWEnd(end);
     g1_policy()->record_full_collection_end();
 
 #ifdef TRACESPINNING
@@ -1371,6 +1375,7 @@
 G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
   SharedHeap(policy_),
   _g1_policy(policy_),
+  _dirty_card_queue_set(false),
   _ref_processor(NULL),
   _process_strong_tasks(new SubTasksDone(G1H_PS_NumElements)),
   _bot_shared(NULL),
@@ -1396,6 +1401,9 @@
   if (_process_strong_tasks == NULL || !_process_strong_tasks->valid()) {
     vm_exit_during_initialization("Failed necessary allocation.");
   }
+
+  _humongous_object_threshold_in_words = HeapRegion::GrainWords / 2;
+
   int n_queues = MAX2((int)ParallelGCThreads, 1);
   _task_queues = new RefToScanQueueSet(n_queues);
 
@@ -1433,6 +1441,7 @@
 }
 
 jint G1CollectedHeap::initialize() {
+  CollectedHeap::pre_initialize();
   os::enable_vtime();
 
   // Necessary to satisfy locking discipline assertions.
@@ -1453,8 +1462,6 @@
   Universe::check_alignment(init_byte_size, HeapRegion::GrainBytes, "g1 heap");
   Universe::check_alignment(max_byte_size, HeapRegion::GrainBytes, "g1 heap");
 
-  // We allocate this in any case, but only do no work if the command line
-  // param is off.
   _cg1r = new ConcurrentG1Refine();
 
   // Reserve the maximum.
@@ -1548,9 +1555,10 @@
   const size_t max_region_idx = ((size_t)1 << (sizeof(RegionIdx_t)*BitsPerByte-1)) - 1;
   guarantee((max_regions() - 1) <= max_region_idx, "too many regions");
 
-  const size_t cards_per_region = HeapRegion::GrainBytes >> CardTableModRefBS::card_shift;
   size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1;
-  guarantee(cards_per_region < max_cards_per_region, "too many cards per region");
+  guarantee(HeapRegion::CardsPerRegion > 0, "make sure it's initialized");
+  guarantee((size_t) HeapRegion::CardsPerRegion < max_cards_per_region,
+            "too many cards per region");
 
   _bot_shared = new G1BlockOffsetSharedArray(_reserved,
                                              heap_word_size(init_byte_size));
@@ -1586,18 +1594,20 @@
 
   JavaThread::satb_mark_queue_set().initialize(SATB_Q_CBL_mon,
                                                SATB_Q_FL_lock,
-                                               0,
+                                               G1SATBProcessCompletedThreshold,
                                                Shared_SATB_Q_lock);
 
   JavaThread::dirty_card_queue_set().initialize(DirtyCardQ_CBL_mon,
                                                 DirtyCardQ_FL_lock,
-                                                G1UpdateBufferQueueMaxLength,
+                                                concurrent_g1_refine()->yellow_zone(),
+                                                concurrent_g1_refine()->red_zone(),
                                                 Shared_DirtyCardQ_lock);
 
   if (G1DeferredRSUpdate) {
     dirty_card_queue_set().initialize(DirtyCardQ_CBL_mon,
                                       DirtyCardQ_FL_lock,
-                                      0,
+                                      -1, // never trigger processing
+                                      -1, // no limit on length
                                       Shared_DirtyCardQ_lock,
                                       &JavaThread::dirty_card_queue_set());
   }
@@ -1610,9 +1620,6 @@
   // Do later initialization work for concurrent refinement.
   _cg1r->init();
 
-  const char* group_names[] = { "CR", "ZF", "CM", "CL" };
-  GCOverheadReporter::initGCOverheadReporter(4, group_names);
-
   return JNI_OK;
 }
 
@@ -1731,13 +1738,6 @@
   return car->free();
 }
 
-void G1CollectedHeap::collect(GCCause::Cause cause) {
-  // The caller doesn't have the Heap_lock
-  assert(!Heap_lock->owned_by_self(), "this thread should not own the Heap_lock");
-  MutexLocker ml(Heap_lock);
-  collect_locked(cause);
-}
-
 void G1CollectedHeap::collect_as_vm_thread(GCCause::Cause cause) {
   assert(Thread::current()->is_VM_thread(), "Precondition#1");
   assert(Heap_lock->is_locked(), "Precondition#2");
@@ -1754,17 +1754,31 @@
   }
 }
 
-
-void G1CollectedHeap::collect_locked(GCCause::Cause cause) {
-  // Don't want to do a GC until cleanup is completed.
-  wait_for_cleanup_complete();
-
-  // Read the GC count while holding the Heap_lock
-  int gc_count_before = SharedHeap::heap()->total_collections();
+void G1CollectedHeap::collect(GCCause::Cause cause) {
+  // The caller doesn't have the Heap_lock
+  assert(!Heap_lock->owned_by_self(), "this thread should not own the Heap_lock");
+
+  int gc_count_before;
   {
-    MutexUnlocker mu(Heap_lock);  // give up heap lock, execute gets it back
-    VM_G1CollectFull op(gc_count_before, cause);
-    VMThread::execute(&op);
+    MutexLocker ml(Heap_lock);
+    // Read the GC count while holding the Heap_lock
+    gc_count_before = SharedHeap::heap()->total_collections();
+
+    // Don't want to do a GC until cleanup is completed.
+    wait_for_cleanup_complete();
+  } // We give up heap lock; VMThread::execute gets it back below
+  switch (cause) {
+    case GCCause::_scavenge_alot: {
+      // Do an incremental pause, which might sometimes be abandoned.
+      VM_G1IncCollectionPause op(gc_count_before, cause);
+      VMThread::execute(&op);
+      break;
+    }
+    default: {
+      // In all other cases, we currently do a full gc.
+      VM_G1CollectFull op(gc_count_before, cause);
+      VMThread::execute(&op);
+    }
   }
 }
 
@@ -2118,7 +2132,7 @@
 }
 
 size_t G1CollectedHeap::max_capacity() const {
-  return _g1_committed.byte_size();
+  return g1_reserved_obj_bytes();
 }
 
 jlong G1CollectedHeap::millis_since_last_gc() {
@@ -2209,40 +2223,58 @@
   bool _allow_dirty;
   bool _par;
   bool _use_prev_marking;
+  bool _failures;
 public:
   // use_prev_marking == true  -> use "prev" marking information,
   // use_prev_marking == false -> use "next" marking information
   VerifyRegionClosure(bool allow_dirty, bool par, bool use_prev_marking)
     : _allow_dirty(allow_dirty),
       _par(par),
-      _use_prev_marking(use_prev_marking) {}
+      _use_prev_marking(use_prev_marking),
+      _failures(false) {}
+
+  bool failures() {
+    return _failures;
+  }
 
   bool doHeapRegion(HeapRegion* r) {
     guarantee(_par || r->claim_value() == HeapRegion::InitialClaimValue,
               "Should be unclaimed at verify points.");
     if (!r->continuesHumongous()) {
-      VerifyObjsInRegionClosure not_dead_yet_cl(r, _use_prev_marking);
-      r->verify(_allow_dirty, _use_prev_marking);
-      r->object_iterate(&not_dead_yet_cl);
-      guarantee(r->max_live_bytes() >= not_dead_yet_cl.live_bytes(),
-                "More live objects than counted in last complete marking.");
+      bool failures = false;
+      r->verify(_allow_dirty, _use_prev_marking, &failures);
+      if (failures) {
+        _failures = true;
+      } else {
+        VerifyObjsInRegionClosure not_dead_yet_cl(r, _use_prev_marking);
+        r->object_iterate(&not_dead_yet_cl);
+        if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) {
+          gclog_or_tty->print_cr("["PTR_FORMAT","PTR_FORMAT"] "
+                                 "max_live_bytes "SIZE_FORMAT" "
+                                 "< calculated "SIZE_FORMAT,
+                                 r->bottom(), r->end(),
+                                 r->max_live_bytes(),
+                                 not_dead_yet_cl.live_bytes());
+          _failures = true;
+        }
+      }
     }
-    return false;
+    return false; // stop the region iteration if we hit a failure
   }
 };
 
 class VerifyRootsClosure: public OopsInGenClosure {
 private:
   G1CollectedHeap* _g1h;
+  bool             _use_prev_marking;
   bool             _failures;
-  bool             _use_prev_marking;
 public:
   // use_prev_marking == true  -> use "prev" marking information,
   // use_prev_marking == false -> use "next" marking information
   VerifyRootsClosure(bool use_prev_marking) :
     _g1h(G1CollectedHeap::heap()),
-    _failures(false),
-    _use_prev_marking(use_prev_marking) { }
+    _use_prev_marking(use_prev_marking),
+    _failures(false) { }
 
   bool failures() { return _failures; }
 
@@ -2252,7 +2284,7 @@
       oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
       if (_g1h->is_obj_dead_cond(obj, _use_prev_marking)) {
         gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
-                               "points to dead obj "PTR_FORMAT, p, (void*) obj);
+                              "points to dead obj "PTR_FORMAT, p, (void*) obj);
         obj->print_on(gclog_or_tty);
         _failures = true;
       }
@@ -2270,6 +2302,7 @@
   G1CollectedHeap* _g1h;
   bool _allow_dirty;
   bool _use_prev_marking;
+  bool _failures;
 
 public:
   // use_prev_marking == true  -> use "prev" marking information,
@@ -2279,13 +2312,21 @@
     AbstractGangTask("Parallel verify task"),
     _g1h(g1h),
     _allow_dirty(allow_dirty),
-    _use_prev_marking(use_prev_marking) { }
+    _use_prev_marking(use_prev_marking),
+    _failures(false) { }
+
+  bool failures() {
+    return _failures;
+  }
 
   void work(int worker_i) {
     HandleMark hm;
     VerifyRegionClosure blk(_allow_dirty, true, _use_prev_marking);
     _g1h->heap_region_par_iterate_chunked(&blk, worker_i,
                                           HeapRegion::ParVerifyClaimValue);
+    if (blk.failures()) {
+      _failures = true;
+    }
   }
 };
 
@@ -2299,10 +2340,14 @@
   if (SafepointSynchronize::is_at_safepoint() || ! UseTLAB) {
     if (!silent) { gclog_or_tty->print("roots "); }
     VerifyRootsClosure rootsCl(use_prev_marking);
-    process_strong_roots(false,
+    CodeBlobToOopClosure blobsCl(&rootsCl, /*do_marking=*/ false);
+    process_strong_roots(true,  // activate StrongRootsScope
+                         false,
                          SharedHeap::SO_AllClasses,
                          &rootsCl,
+                         &blobsCl,
                          &rootsCl);
+    bool failures = rootsCl.failures();
     rem_set()->invalidate(perm_gen()->used_region(), false);
     if (!silent) { gclog_or_tty->print("heapRegions "); }
     if (GCParallelVerificationEnabled && ParallelGCThreads > 1) {
@@ -2314,6 +2359,9 @@
       set_par_threads(n_workers);
       workers()->run_task(&task);
       set_par_threads(0);
+      if (task.failures()) {
+        failures = true;
+      }
 
       assert(check_heap_region_claim_values(HeapRegion::ParVerifyClaimValue),
              "sanity check");
@@ -2325,10 +2373,24 @@
     } else {
       VerifyRegionClosure blk(allow_dirty, false, use_prev_marking);
       _hrs->iterate(&blk);
+      if (blk.failures()) {
+        failures = true;
+      }
     }
     if (!silent) gclog_or_tty->print("remset ");
     rem_set()->verify();
-    guarantee(!rootsCl.failures(), "should not have had failures");
+
+    if (failures) {
+      gclog_or_tty->print_cr("Heap:");
+      print_on(gclog_or_tty, true /* extended */);
+      gclog_or_tty->print_cr("");
+      if (VerifyDuringGC && G1VerifyDuringGCPrintReachable) {
+        concurrent_mark()->print_reachable(use_prev_marking,
+                                           "failed-verification");
+      }
+      gclog_or_tty->flush();
+    }
+    guarantee(!failures, "there should not have been any failures");
   } else {
     if (!silent) gclog_or_tty->print("(SKIPPING roots, heapRegions, remset) ");
   }
@@ -2370,6 +2432,7 @@
   st->cr();
   perm()->as_gen()->print_on(st);
   if (extended) {
+    st->cr();
     print_on_extended(st);
   }
 }
@@ -2379,27 +2442,18 @@
   _hrs->iterate(&blk);
 }
 
-class PrintOnThreadsClosure : public ThreadClosure {
-  outputStream* _st;
-public:
-  PrintOnThreadsClosure(outputStream* st) : _st(st) { }
-  virtual void do_thread(Thread *t) {
-    t->print_on(_st);
-  }
-};
-
 void G1CollectedHeap::print_gc_threads_on(outputStream* st) const {
   if (ParallelGCThreads > 0) {
-    workers()->print_worker_threads();
-  }
-  st->print("\"G1 concurrent mark GC Thread\" ");
-  _cmThread->print();
+    workers()->print_worker_threads_on(st);
+  }
+
+  _cmThread->print_on(st);
   st->cr();
-  st->print("\"G1 concurrent refinement GC Threads\" ");
-  PrintOnThreadsClosure p(st);
-  _cg1r->threads_do(&p);
-  st->cr();
-  st->print("\"G1 zero-fill GC Thread\" ");
+
+  _cm->print_worker_threads_on(st);
+
+  _cg1r->print_worker_threads_on(st);
+
   _czft->print_on(st);
   st->cr();
 }
@@ -2423,7 +2477,7 @@
   if (G1SummarizeRSetStats) {
     g1_rem_set()->print_summary_info();
   }
-  if (G1SummarizeConcurrentMark) {
+  if (G1SummarizeConcMark) {
     concurrent_mark()->print_summary_info();
   }
   if (G1SummarizeZFStats) {
@@ -2431,8 +2485,6 @@
   }
   g1_policy()->print_yg_surv_rate_info();
 
-  GCOverheadReporter::printGCOverhead();
-
   SpecializationStats::print();
 }
 
@@ -2453,6 +2505,7 @@
 }
 
 void G1CollectedHeap::gc_prologue(bool full /* Ignored */) {
+  // always_do_update_barrier = false;
   assert(InlineCacheBuffer::is_empty(), "should have cleaned up ICBuffer");
   // Call allocation profiler
   AllocationProfiler::iterate_since_last_gc();
@@ -2466,6 +2519,7 @@
   // is set.
   COMPILER2_PRESENT(assert(DerivedPointerTable::is_empty(),
                         "derived pointer present"));
+  // always_do_update_barrier = true;
 }
 
 void G1CollectedHeap::do_collection_pause() {
@@ -2592,6 +2646,13 @@
 
 // </NEW PREDICTION>
 
+struct PrepareForRSScanningClosure : public HeapRegionClosure {
+  bool doHeapRegion(HeapRegion *r) {
+    r->rem_set()->set_iter_claimed(0);
+    return false;
+  }
+};
+
 void
 G1CollectedHeap::do_collection_pause_at_safepoint() {
   if (PrintHeapAtGC) {
@@ -2599,6 +2660,8 @@
   }
 
   {
+    ResourceMark rm;
+
     char verbose_str[128];
     sprintf(verbose_str, "GC pause ");
     if (g1_policy()->in_young_gc_mode()) {
@@ -2610,8 +2673,6 @@
     if (g1_policy()->should_initiate_conc_mark())
       strcat(verbose_str, " (initial-mark)");
 
-    GCCauseSetter x(this, GCCause::_g1_inc_collection_pause);
-
     // if PrintGCDetails is on, we'll print long statistics information
     // in the collector policy code, so let's not print this as the output
     // is messy if we do.
@@ -2619,7 +2680,8 @@
     TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
     TraceTime t(verbose_str, PrintGC && !PrintGCDetails, true, gclog_or_tty);
 
-    ResourceMark rm;
+    TraceMemoryManagerStats tms(false /* fullGC */);
+
     assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
     assert(Thread::current() == VMThread::vm_thread(), "should be in vm thread");
     guarantee(!is_gc_active(), "collection is not reentrant");
@@ -2669,7 +2731,6 @@
       // The elapsed time induced by the start time below deliberately elides
       // the possible verification above.
       double start_time_sec = os::elapsedTime();
-      GCOverheadReporter::recordSTWStart(start_time_sec);
       size_t start_used_bytes = used();
 
       g1_policy()->record_collection_pause_start(start_time_sec,
@@ -2730,6 +2791,8 @@
         gclog_or_tty->print_cr("\nAfter pause, heap:");
         print();
 #endif
+        PrepareForRSScanningClosure prepare_for_rs_scan;
+        collection_set_iterate(&prepare_for_rs_scan);
 
         setup_surviving_young_words();
 
@@ -2747,8 +2810,6 @@
         _in_cset_fast_test = NULL;
         _in_cset_fast_test_base = NULL;
 
-        release_gc_alloc_regions(false /* totally */);
-
         cleanup_surviving_young_words();
 
         if (g1_policy()->in_young_gc_mode()) {
@@ -2766,6 +2827,22 @@
           _young_list->reset_auxilary_lists();
         }
       } else {
+        if (_in_cset_fast_test != NULL) {
+          assert(_in_cset_fast_test_base != NULL, "Since _in_cset_fast_test isn't");
+          FREE_C_HEAP_ARRAY(bool, _in_cset_fast_test_base);
+          //  this is more for peace of mind; we're nulling them here and
+          // we're expecting them to be null at the beginning of the next GC
+          _in_cset_fast_test = NULL;
+          _in_cset_fast_test_base = NULL;
+        }
+        // This looks confusing, because the DPT should really be empty
+        // at this point -- since we have not done any collection work,
+        // there should not be any derived pointers in the table to update;
+        // however, there is some additional state in the DPT which is
+        // reset at the end of the (null) "gc" here via the following call.
+        // A better approach might be to split off that state resetting work
+        // into a separate method that asserts that the DPT is empty and call
+        // that here. That is deferred for now.
         COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
       }
 
@@ -2798,11 +2875,12 @@
       double end_time_sec = os::elapsedTime();
       double pause_time_ms = (end_time_sec - start_time_sec) * MILLIUNITS;
       g1_policy()->record_pause_time_ms(pause_time_ms);
-      GCOverheadReporter::recordSTWEnd(end_time_sec);
       g1_policy()->record_collection_pause_end(abandoned);
 
       assert(regions_accounted_for(), "Region leakage.");
 
+      MemoryService::track_memory_usage();
+
       if (VerifyAfterGC && total_collections() >= VerifyGCStartAt) {
         HandleMark hm;  // Discard invalid handles created during verification
         gclog_or_tty->print(" VerifyAfterGC:");
@@ -3101,7 +3179,7 @@
          _evac_failure_scan_stack->length() == 0,
          "Postcondition");
   assert(!_drain_in_progress, "Postcondition");
-  // Don't have to delete, since the scan stack is a resource object.
+  delete _evac_failure_scan_stack;
   _evac_failure_scan_stack = NULL;
 }
 
@@ -3402,7 +3480,7 @@
   HeapRegion* r = heap_region_containing(old);
   if (!r->evacuation_failed()) {
     r->set_evacuation_failed(true);
-    if (G1PrintRegions) {
+    if (G1PrintHeapRegions) {
       gclog_or_tty->print("evacuation failed in heap region "PTR_FORMAT" "
                           "["PTR_FORMAT","PTR_FORMAT")\n",
                           r, r->bottom(), r->end());
@@ -3712,22 +3790,16 @@
   return obj;
 }
 
-template <bool do_gen_barrier, G1Barrier barrier, bool do_mark_forwardee, bool skip_cset_test>
+template <bool do_gen_barrier, G1Barrier barrier, bool do_mark_forwardee>
 template <class T>
-void G1ParCopyClosure <do_gen_barrier, barrier, do_mark_forwardee, skip_cset_test>
+void G1ParCopyClosure <do_gen_barrier, barrier, do_mark_forwardee>
 ::do_oop_work(T* p) {
   oop obj = oopDesc::load_decode_heap_oop(p);
   assert(barrier != G1BarrierRS || obj != NULL,
          "Precondition: G1BarrierRS implies obj is nonNull");
 
-  // The only time we skip the cset test is when we're scanning
-  // references popped from the queue. And we only push on the queue
-  // references that we know point into the cset, so no point in
-  // checking again. But we'll leave an assert here for peace of mind.
-  assert(!skip_cset_test || _g1->obj_in_cs(obj), "invariant");
-
   // here the null check is implicit in the cset_fast_test() test
-  if (skip_cset_test || _g1->in_cset_fast_test(obj)) {
+  if (_g1->in_cset_fast_test(obj)) {
 #if G1_REM_SET_LOGGING
     gclog_or_tty->print_cr("Loc "PTR_FORMAT" contains pointer "PTR_FORMAT" "
                            "into CS.", p, (void*) obj);
@@ -3744,7 +3816,6 @@
     }
   }
 
-  // When scanning moved objs, must look at all oops.
   if (barrier == G1BarrierEvac && obj != NULL) {
     _par_scan_state->update_rs(_from, p, _par_scan_state->queue_num());
   }
@@ -3754,8 +3825,8 @@
   }
 }
 
-template void G1ParCopyClosure<false, G1BarrierEvac, false, true>::do_oop_work(oop* p);
-template void G1ParCopyClosure<false, G1BarrierEvac, false, true>::do_oop_work(narrowOop* p);
+template void G1ParCopyClosure<false, G1BarrierEvac, false>::do_oop_work(oop* p);
+template void G1ParCopyClosure<false, G1BarrierEvac, false>::do_oop_work(narrowOop* p);
 
 template <class T> void G1ParScanPartialArrayClosure::do_oop_nv(T* p) {
   assert(has_partial_array_mask(p), "invariant");
@@ -3827,11 +3898,11 @@
           assert(UseCompressedOops, "Error");
           narrowOop* p = (narrowOop*) stolen_task;
           assert(has_partial_array_mask(p) ||
-                 _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "Error");
+                 _g1h->is_in_g1_reserved(oopDesc::load_decode_heap_oop(p)), "Error");
           pss->push_on_queue(p);
         } else {
           oop* p = (oop*) stolen_task;
-          assert(has_partial_array_mask(p) || _g1h->obj_in_cs(*p), "Error");
+          assert(has_partial_array_mask(p) || _g1h->is_in_g1_reserved(*p), "Error");
           pss->push_on_queue(p);
         }
         continue;
@@ -3893,6 +3964,7 @@
     G1ParScanExtRootClosure         only_scan_root_cl(_g1h, &pss);
     G1ParScanPermClosure            only_scan_perm_cl(_g1h, &pss);
     G1ParScanHeapRSClosure          only_scan_heap_rs_cl(_g1h, &pss);
+    G1ParPushHeapRSClosure          push_heap_rs_cl(_g1h, &pss);
 
     G1ParScanAndMarkExtRootClosure  scan_mark_root_cl(_g1h, &pss);
     G1ParScanAndMarkPermClosure     scan_mark_perm_cl(_g1h, &pss);
@@ -3916,7 +3988,7 @@
     _g1h->g1_process_strong_roots(/* not collecting perm */ false,
                                   SharedHeap::SO_AllClasses,
                                   scan_root_cl,
-                                  &only_scan_heap_rs_cl,
+                                  &push_heap_rs_cl,
                                   scan_so_cl,
                                   scan_perm_cl,
                                   i);
@@ -3930,9 +4002,7 @@
       _g1h->g1_policy()->record_obj_copy_time(i, elapsed_ms-term_ms);
       _g1h->g1_policy()->record_termination_time(i, term_ms);
     }
-    if (G1UseSurvivorSpaces) {
-      _g1h->g1_policy()->record_thread_age_table(pss.age_table());
-    }
+    _g1h->g1_policy()->record_thread_age_table(pss.age_table());
     _g1h->update_surviving_young_words(pss.surviving_young_words()+1);
 
     // Clean up any par-expanded rem sets.
@@ -3992,8 +4062,14 @@
   BufferingOopsInGenClosure buf_scan_perm(scan_perm);
   buf_scan_perm.set_generation(perm_gen());
 
-  process_strong_roots(collecting_perm_gen, so,
+  // Walk the code cache w/o buffering, because StarTask cannot handle
+  // unaligned oop locations.
+  CodeBlobToOopClosure eager_scan_code_roots(scan_non_heap_roots, /*do_marking=*/ true);
+
+  process_strong_roots(false, // no scoping; this is parallel code
+                       collecting_perm_gen, so,
                        &buf_scan_non_heap_roots,
+                       &eager_scan_code_roots,
                        &buf_scan_perm);
   // Finish up any enqueued closure apps.
   buf_scan_non_heap_roots.done();
@@ -4083,7 +4159,8 @@
 void
 G1CollectedHeap::g1_process_weak_roots(OopClosure* root_closure,
                                        OopClosure* non_root_closure) {
-  SharedHeap::process_weak_roots(root_closure, non_root_closure);
+  CodeBlobToOopClosure roots_in_blobs(root_closure, /*do_marking=*/ false);
+  SharedHeap::process_weak_roots(root_closure, &roots_in_blobs, non_root_closure);
 }
 
 
@@ -4117,15 +4194,16 @@
 
   init_for_evac_failure(NULL);
 
-  change_strong_roots_parity();  // In preparation for parallel strong roots.
   rem_set()->prepare_for_younger_refs_iterate(true);
 
   assert(dirty_card_queue_set().completed_buffers_num() == 0, "Should be empty");
   double start_par = os::elapsedTime();
   if (ParallelGCThreads > 0) {
     // The individual threads will set their evac-failure closures.
+    StrongRootsScope srs(this);
     workers()->run_task(&g1_par_task);
   } else {
+    StrongRootsScope srs(this);
     g1_par_task.work(0);
   }
 
@@ -4141,6 +4219,7 @@
     G1KeepAliveClosure keep_alive(this);
     JNIHandles::weak_oops_do(&is_alive, &keep_alive);
   }
+  release_gc_alloc_regions(false /* totally */);
   g1_rem_set()->cleanup_after_oops_into_collection_set_do();
 
   concurrent_g1_refine()->clear_hot_cache();
@@ -4165,10 +4244,11 @@
     RedirtyLoggedCardTableEntryFastClosure redirty;
     dirty_card_queue_set().set_closure(&redirty);
     dirty_card_queue_set().apply_closure_to_all_completed_buffers();
-    JavaThread::dirty_card_queue_set().merge_bufferlists(&dirty_card_queue_set());
+
+    DirtyCardQueueSet& dcq = JavaThread::dirty_card_queue_set();
+    dcq.merge_bufferlists(&dirty_card_queue_set());
     assert(dirty_card_queue_set().completed_buffers_num() == 0, "All should be consumed");
   }
-
   COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
 }
 
@@ -4274,12 +4354,18 @@
 class G1ParCleanupCTTask : public AbstractGangTask {
   CardTableModRefBS* _ct_bs;
   G1CollectedHeap* _g1h;
+  HeapRegion* volatile _so_head;
+  HeapRegion* volatile _su_head;
 public:
   G1ParCleanupCTTask(CardTableModRefBS* ct_bs,
-                     G1CollectedHeap* g1h) :
+                     G1CollectedHeap* g1h,
+                     HeapRegion* scan_only_list,
+                     HeapRegion* survivor_list) :
     AbstractGangTask("G1 Par Cleanup CT Task"),
     _ct_bs(ct_bs),
-    _g1h(g1h)
+    _g1h(g1h),
+    _so_head(scan_only_list),
+    _su_head(survivor_list)
   { }
 
   void work(int i) {
@@ -4287,22 +4373,64 @@
     while (r = _g1h->pop_dirty_cards_region()) {
       clear_cards(r);
     }
-  }
+    // Redirty the cards of the scan-only and survivor regions.
+    dirty_list(&this->_so_head);
+    dirty_list(&this->_su_head);
+  }
+
   void clear_cards(HeapRegion* r) {
     // Cards for Survivor and Scan-Only regions will be dirtied later.
     if (!r->is_scan_only() && !r->is_survivor()) {
       _ct_bs->clear(MemRegion(r->bottom(), r->end()));
     }
   }
+
+  void dirty_list(HeapRegion* volatile * head_ptr) {
+    HeapRegion* head;
+    do {
+      // Pop region off the list.
+      head = *head_ptr;
+      if (head != NULL) {
+        HeapRegion* r = (HeapRegion*)
+          Atomic::cmpxchg_ptr(head->get_next_young_region(), head_ptr, head);
+        if (r == head) {
+          assert(!r->isHumongous(), "Humongous regions shouldn't be on survivor list");
+          _ct_bs->dirty(MemRegion(r->bottom(), r->end()));
+        }
+      }
+    } while (*head_ptr != NULL);
+  }
 };
 
 
+#ifndef PRODUCT
+class G1VerifyCardTableCleanup: public HeapRegionClosure {
+  CardTableModRefBS* _ct_bs;
+public:
+  G1VerifyCardTableCleanup(CardTableModRefBS* ct_bs)
+    : _ct_bs(ct_bs)
+  { }
+  virtual bool doHeapRegion(HeapRegion* r)
+  {
+    MemRegion mr(r->bottom(), r->end());
+    if (r->is_scan_only() || r->is_survivor()) {
+      _ct_bs->verify_dirty_region(mr);
+    } else {
+      _ct_bs->verify_clean_region(mr);
+    }
+    return false;
+  }
+};
+#endif
+
 void G1CollectedHeap::cleanUpCardTable() {
   CardTableModRefBS* ct_bs = (CardTableModRefBS*) (barrier_set());
   double start = os::elapsedTime();
 
   // Iterate over the dirty cards region list.
-  G1ParCleanupCTTask cleanup_task(ct_bs, this);
+  G1ParCleanupCTTask cleanup_task(ct_bs, this,
+                                  _young_list->first_scan_only_region(),
+                                  _young_list->first_survivor_region());
   if (ParallelGCThreads > 0) {
     set_par_threads(workers()->total_workers());
     workers()->run_task(&cleanup_task);
@@ -4318,18 +4446,22 @@
       }
       r->set_next_dirty_cards_region(NULL);
     }
-  }
-  // now, redirty the cards of the scan-only and survivor regions
-  // (it seemed faster to do it this way, instead of iterating over
-  // all regions and then clearing / dirtying as appropriate)
-  dirtyCardsForYoungRegions(ct_bs, _young_list->first_scan_only_region());
-  dirtyCardsForYoungRegions(ct_bs, _young_list->first_survivor_region());
-
+    // now, redirty the cards of the scan-only and survivor regions
+    // (it seemed faster to do it this way, instead of iterating over
+    // all regions and then clearing / dirtying as appropriate)
+    dirtyCardsForYoungRegions(ct_bs, _young_list->first_scan_only_region());
+    dirtyCardsForYoungRegions(ct_bs, _young_list->first_survivor_region());
+  }
   double elapsed = os::elapsedTime() - start;
   g1_policy()->record_clear_ct_time( elapsed * 1000.0);
+#ifndef PRODUCT
+  if (G1VerifyCTCleanup || VerifyAfterGC) {
+    G1VerifyCardTableCleanup cleanup_verifier(ct_bs);
+    heap_region_iterate(&cleanup_verifier);
+  }
+#endif
 }
 
-
 void G1CollectedHeap::do_collection_pause_if_appropriate(size_t word_size) {
   if (g1_policy()->should_do_collection_pause(word_size)) {
     do_collection_pause();
@@ -5022,7 +5154,7 @@
     return hr->is_in(p);
   }
 }
-#endif // PRODUCT
+#endif // !PRODUCT
 
 void G1CollectedHeap::g1_unimplemented() {
   // Unimplemented();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -167,16 +167,11 @@
   friend class G1MarkSweep;
 
 private:
-  enum SomePrivateConstants {
-    VeryLargeInBytes = HeapRegion::GrainBytes/2,
-    VeryLargeInWords = VeryLargeInBytes/HeapWordSize,
-    MinHeapDeltaBytes = 10 * HeapRegion::GrainBytes,      // FIXME
-    NumAPIs = HeapRegion::MaxAge
-  };
-
   // The one and only G1CollectedHeap, so static functions can find it.
   static G1CollectedHeap* _g1h;
 
+  static size_t _humongous_object_threshold_in_words;
+
   // Storage for the G1 heap (excludes the permanent generation).
   VirtualSpace _g1_storage;
   MemRegion    _g1_reserved;
@@ -697,7 +692,7 @@
 
   // Reserved (g1 only; super method includes perm), capacity and the used
   // portion in bytes.
-  size_t g1_reserved_obj_bytes() { return _g1_reserved.byte_size(); }
+  size_t g1_reserved_obj_bytes() const { return _g1_reserved.byte_size(); }
   virtual size_t capacity() const;
   virtual size_t used() const;
   // This should be called when we're not holding the heap lock. The
@@ -859,7 +854,7 @@
     return _g1_committed;
   }
 
-  NOT_PRODUCT( bool is_in_closed_subset(const void* p) const; )
+  NOT_PRODUCT(bool is_in_closed_subset(const void* p) const;)
 
   // Dirty card table entries covering a list of young regions.
   void dirtyCardsForYoungRegions(CardTableModRefBS* ct_bs, HeapRegion* list);
@@ -997,11 +992,50 @@
 
   // Can a compiler initialize a new object without store barriers?
   // This permission only extends from the creation of a new object
-  // via a TLAB up to the first subsequent safepoint.
+  // via a TLAB up to the first subsequent safepoint. If such permission
+  // is granted for this heap type, the compiler promises to call
+  // defer_store_barrier() below on any slow path allocation of
+  // a new object for which such initializing store barriers will
+  // have been elided. G1, like CMS, allows this, but should be
+  // ready to provide a compensating write barrier as necessary
+  // if that storage came out of a non-young region. The efficiency
+  // of this implementation depends crucially on being able to
+  // answer very efficiently in constant time whether a piece of
+  // storage in the heap comes from a young region or not.
+  // See ReduceInitialCardMarks.
   virtual bool can_elide_tlab_store_barriers() const {
-    // Since G1's TLAB's may, on occasion, come from non-young regions
-    // as well. (Is there a flag controlling that? XXX)
-    return false;
+    // 6920090: Temporarily disabled, because of lingering
+    // instabilities related to RICM with G1. In the
+    // interim, the option ReduceInitialCardMarksForG1
+    // below is left solely as a debugging device at least
+    // until 6920109 fixes the instabilities.
+    return ReduceInitialCardMarksForG1;
+  }
+
+  virtual bool card_mark_must_follow_store() const {
+    return true;
+  }
+
+  bool is_in_young(oop obj) {
+    HeapRegion* hr = heap_region_containing(obj);
+    return hr != NULL && hr->is_young();
+  }
+
+  // We don't need barriers for initializing stores to objects
+  // in the young gen: for the SATB pre-barrier, there is no
+  // pre-value that needs to be remembered; for the remembered-set
+  // update logging post-barrier, we don't maintain remembered set
+  // information for young gen objects. Note that non-generational
+  // G1 does not have any "young" objects, should not elide
+  // the rs logging barrier and so should always answer false below.
+  // However, non-generational G1 (-XX:-G1Gen) appears to have
+  // bit-rotted so was not tested below.
+  virtual bool can_elide_initializing_store_barrier(oop new_obj) {
+    // Re 6920090, 6920109 above.
+    assert(ReduceInitialCardMarksForG1, "Else cannot be here");
+    assert(G1Gen || !is_in_young(new_obj),
+           "Non-generational G1 should never return true below");
+    return is_in_young(new_obj);
   }
 
   // Can a compiler elide a store barrier when it writes
@@ -1021,7 +1055,7 @@
 
   // Returns "true" iff the given word_size is "very large".
   static bool isHumongous(size_t word_size) {
-    return word_size >= VeryLargeInWords;
+    return word_size >= _humongous_object_threshold_in_words;
   }
 
   // Update mod union table with the set of dirty cards.
@@ -1589,7 +1623,7 @@
   template <class T> void push_on_queue(T* ref) {
     assert(ref != NULL, "invariant");
     assert(has_partial_array_mask(ref) ||
-           _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(ref)), "invariant");
+           _g1h->is_in_g1_reserved(oopDesc::load_decode_heap_oop(ref)), "invariant");
 #ifdef ASSERT
     if (has_partial_array_mask(ref)) {
       oop p = clear_partial_array_mask(ref);
@@ -1610,9 +1644,9 @@
       assert((oop*)ref != NULL, "pop_local() returned true");
       assert(UseCompressedOops || !ref.is_narrow(), "Error");
       assert(has_partial_array_mask((oop*)ref) ||
-             _g1h->obj_in_cs(ref.is_narrow() ? oopDesc::load_decode_heap_oop((narrowOop*)ref)
-                                             : oopDesc::load_decode_heap_oop((oop*)ref)),
-             "invariant");
+             _g1h->is_in_g1_reserved(ref.is_narrow() ? oopDesc::load_decode_heap_oop((narrowOop*)ref)
+                                                     : oopDesc::load_decode_heap_oop((oop*)ref)),
+              "invariant");
       IF_G1_DETAILED_STATS(note_pop());
     } else {
       StarTask null_task;
@@ -1625,9 +1659,9 @@
     assert((oop*)new_ref != NULL, "pop() from a local non-empty stack");
     assert(UseCompressedOops || !new_ref.is_narrow(), "Error");
     assert(has_partial_array_mask((oop*)new_ref) ||
-           _g1h->obj_in_cs(new_ref.is_narrow() ? oopDesc::load_decode_heap_oop((narrowOop*)new_ref)
-                                               : oopDesc::load_decode_heap_oop((oop*)new_ref)),
-             "invariant");
+           _g1h->is_in_g1_reserved(new_ref.is_narrow() ? oopDesc::load_decode_heap_oop((narrowOop*)new_ref)
+                                                       : oopDesc::load_decode_heap_oop((oop*)new_ref)),
+           "invariant");
     ref = new_ref;
   }
 
@@ -1791,12 +1825,12 @@
           assert(UseCompressedOops, "Error");
           narrowOop* p = (narrowOop*)ref_to_scan;
           assert(!has_partial_array_mask(p) &&
-                 _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "sanity");
+                 _g1h->is_in_g1_reserved(oopDesc::load_decode_heap_oop(p)), "sanity");
           deal_with_reference(p);
         } else {
           oop* p = (oop*)ref_to_scan;
-          assert((has_partial_array_mask(p) && _g1h->obj_in_cs(clear_partial_array_mask(p))) ||
-                 _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "sanity");
+          assert((has_partial_array_mask(p) && _g1h->is_in_g1_reserved(clear_partial_array_mask(p))) ||
+                 _g1h->is_in_g1_reserved(oopDesc::load_decode_heap_oop(p)), "sanity");
           deal_with_reference(p);
         }
       }
@@ -1810,12 +1844,12 @@
             assert(UseCompressedOops, "Error");
             narrowOop* p = (narrowOop*)ref_to_scan;
             assert(!has_partial_array_mask(p) &&
-                   _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "sanity");
+                    _g1h->is_in_g1_reserved(oopDesc::load_decode_heap_oop(p)), "sanity");
             deal_with_reference(p);
           } else {
             oop* p = (oop*)ref_to_scan;
             assert((has_partial_array_mask(p) && _g1h->obj_in_cs(clear_partial_array_mask(p))) ||
-                  _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "sanity");
+                   _g1h->is_in_g1_reserved(oopDesc::load_decode_heap_oop(p)), "sanity");
             deal_with_reference(p);
           }
         }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -201,6 +201,12 @@
   _survivors_age_table(true)
 
 {
+  // Set up the region size and associated fields. Given that the
+  // policy is created before the heap, we have to set this up here,
+  // so it's done as soon as possible.
+  HeapRegion::setup_heap_region_size(Arguments::min_heap_size());
+  HeapRegionRemSet::setup_remset_size();
+
   _recent_prev_end_times_for_all_gcs_sec->add(os::elapsedTime());
   _prev_collection_pause_end_ms = os::elapsedTime() * 1000.0;
 
@@ -264,14 +270,10 @@
   _concurrent_mark_cleanup_times_ms->add(0.20);
   _tenuring_threshold = MaxTenuringThreshold;
 
-  if (G1UseSurvivorSpaces) {
-    // if G1FixedSurvivorSpaceSize is 0 which means the size is not
-    // fixed, then _max_survivor_regions will be calculated at
-    // calculate_young_list_target_config during initialization
-    _max_survivor_regions = G1FixedSurvivorSpaceSize / HeapRegion::GrainBytes;
-  } else {
-    _max_survivor_regions = 0;
-  }
+  // if G1FixedSurvivorSpaceSize is 0 which means the size is not
+  // fixed, then _max_survivor_regions will be calculated at
+  // calculate_young_list_target_config during initialization
+  _max_survivor_regions = G1FixedSurvivorSpaceSize / HeapRegion::GrainBytes;
 
   initialize_all();
 }
@@ -290,28 +292,54 @@
   CollectorPolicy::initialize_flags();
 }
 
+// The easiest way to deal with the parsing of the NewSize /
+// MaxNewSize / etc. parameteres is to re-use the code in the
+// TwoGenerationCollectorPolicy class. This is similar to what
+// ParallelScavenge does with its GenerationSizer class (see
+// ParallelScavengeHeap::initialize()). We might change this in the
+// future, but it's a good start.
+class G1YoungGenSizer : public TwoGenerationCollectorPolicy {
+  size_t size_to_region_num(size_t byte_size) {
+    return MAX2((size_t) 1, byte_size / HeapRegion::GrainBytes);
+  }
+
+public:
+  G1YoungGenSizer() {
+    initialize_flags();
+    initialize_size_info();
+  }
+
+  size_t min_young_region_num() {
+    return size_to_region_num(_min_gen0_size);
+  }
+  size_t initial_young_region_num() {
+    return size_to_region_num(_initial_gen0_size);
+  }
+  size_t max_young_region_num() {
+    return size_to_region_num(_max_gen0_size);
+  }
+};
+
 void G1CollectorPolicy::init() {
   // Set aside an initial future to_space.
   _g1 = G1CollectedHeap::heap();
-  size_t regions = Universe::heap()->capacity() / HeapRegion::GrainBytes;
 
   assert(Heap_lock->owned_by_self(), "Locking discipline.");
 
-  if (G1SteadyStateUsed < 50) {
-    vm_exit_during_initialization("G1SteadyStateUsed must be at least 50%.");
-  }
-
   initialize_gc_policy_counters();
 
   if (G1Gen) {
     _in_young_gc_mode = true;
 
-    if (G1YoungGenSize == 0) {
+    G1YoungGenSizer sizer;
+    size_t initial_region_num = sizer.initial_young_region_num();
+
+    if (UseAdaptiveSizePolicy) {
       set_adaptive_young_list_length(true);
       _young_list_fixed_length = 0;
     } else {
       set_adaptive_young_list_length(false);
-      _young_list_fixed_length = (G1YoungGenSize / HeapRegion::GrainBytes);
+      _young_list_fixed_length = initial_region_num;
     }
      _free_regions_at_end_of_collection = _g1->free_regions();
      _scan_only_regions_at_end_of_collection = 0;
@@ -449,7 +477,7 @@
   guarantee( adaptive_young_list_length(), "pre-condition" );
 
   double start_time_sec = os::elapsedTime();
-  size_t min_reserve_perc = MAX2((size_t)2, (size_t)G1MinReservePercent);
+  size_t min_reserve_perc = MAX2((size_t)2, (size_t)G1ReservePercent);
   min_reserve_perc = MIN2((size_t) 50, min_reserve_perc);
   size_t reserve_regions =
     (size_t) ((double) min_reserve_perc * (double) _g1->n_regions() / 100.0);
@@ -993,8 +1021,6 @@
   double full_gc_time_sec = end_sec - _cur_collection_start_sec;
   double full_gc_time_ms = full_gc_time_sec * 1000.0;
 
-  checkpoint_conc_overhead();
-
   _all_full_gc_times_ms->add(full_gc_time_ms);
 
   update_recent_gc_times(end_sec, full_gc_time_ms);
@@ -1106,10 +1132,7 @@
   size_t short_lived_so_length = _young_list_so_prefix_length;
   _short_lived_surv_rate_group->record_scan_only_prefix(short_lived_so_length);
   tag_scan_only(short_lived_so_length);
-
-  if (G1UseSurvivorSpaces) {
-    _survivors_age_table.clear();
-  }
+  _survivors_age_table.clear();
 
   assert( verify_young_ages(), "region age verification" );
 }
@@ -1164,7 +1187,6 @@
   double end_time_sec = os::elapsedTime();
   double elapsed_time_ms = (end_time_sec - _mark_init_start_sec) * 1000.0;
   _concurrent_mark_init_times_ms->add(elapsed_time_ms);
-  checkpoint_conc_overhead();
   record_concurrent_mark_init_end_pre(elapsed_time_ms);
 
   _mmu_tracker->add_pause(_mark_init_start_sec, end_time_sec, true);
@@ -1178,7 +1200,6 @@
 void G1CollectorPolicy::record_concurrent_mark_remark_end() {
   double end_time_sec = os::elapsedTime();
   double elapsed_time_ms = (end_time_sec - _mark_remark_start_sec)*1000.0;
-  checkpoint_conc_overhead();
   _concurrent_mark_remark_times_ms->add(elapsed_time_ms);
   _cur_mark_stop_world_time_ms += elapsed_time_ms;
   _prev_collection_pause_end_ms += elapsed_time_ms;
@@ -1210,7 +1231,6 @@
 
 // The important thing about this is that it includes "os::elapsedTime".
 void G1CollectorPolicy::record_concurrent_mark_cleanup_end_work2() {
-  checkpoint_conc_overhead();
   double end_time_sec = os::elapsedTime();
   double elapsed_time_ms = (end_time_sec - _mark_cleanup_start_sec)*1000.0;
   _concurrent_mark_cleanup_times_ms->add(elapsed_time_ms);
@@ -1425,15 +1445,13 @@
   }
 #endif // PRODUCT
 
-  checkpoint_conc_overhead();
-
   if (in_young_gc_mode()) {
     last_pause_included_initial_mark = _should_initiate_conc_mark;
     if (last_pause_included_initial_mark)
       record_concurrent_mark_init_end_pre(0.0);
 
     size_t min_used_targ =
-      (_g1->capacity() / 100) * (G1SteadyStateUsed - G1SteadyStateUsedDelta);
+      (_g1->capacity() / 100) * InitiatingHeapOccupancyPercent;
 
     if (cur_used_bytes > min_used_targ) {
       if (cur_used_bytes <= _prev_collection_pause_used_at_end_bytes) {
@@ -1518,7 +1536,30 @@
       (end_time_sec - _recent_prev_end_times_for_all_gcs_sec->oldest()) * 1000.0;
     update_recent_gc_times(end_time_sec, elapsed_ms);
     _recent_avg_pause_time_ratio = _recent_gc_times_ms->sum()/interval_ms;
-    assert(recent_avg_pause_time_ratio() < 1.00, "All GC?");
+    if (recent_avg_pause_time_ratio() < 0.0 ||
+        (recent_avg_pause_time_ratio() - 1.0 > 0.0)) {
+#ifndef PRODUCT
+      // Dump info to allow post-facto debugging
+      gclog_or_tty->print_cr("recent_avg_pause_time_ratio() out of bounds");
+      gclog_or_tty->print_cr("-------------------------------------------");
+      gclog_or_tty->print_cr("Recent GC Times (ms):");
+      _recent_gc_times_ms->dump();
+      gclog_or_tty->print_cr("(End Time=%3.3f) Recent GC End Times (s):", end_time_sec);
+      _recent_prev_end_times_for_all_gcs_sec->dump();
+      gclog_or_tty->print_cr("GC = %3.3f, Interval = %3.3f, Ratio = %3.3f",
+                             _recent_gc_times_ms->sum(), interval_ms, recent_avg_pause_time_ratio());
+      // In debug mode, terminate the JVM if the user wants to debug at this point.
+      assert(!G1FailOnFPError, "Debugging data for CR 6898948 has been dumped above");
+#endif  // !PRODUCT
+      // Clip ratio between 0.0 and 1.0, and continue. This will be fixed in
+      // CR 6902692 by redoing the manner in which the ratio is incrementally computed.
+      if (_recent_avg_pause_time_ratio < 0.0) {
+        _recent_avg_pause_time_ratio = 0.0;
+      } else {
+        assert(_recent_avg_pause_time_ratio - 1.0 > 0.0, "Ctl-point invariant");
+        _recent_avg_pause_time_ratio = 1.0;
+      }
+    }
   }
 
   if (G1PolicyVerbose > 1) {
@@ -1893,6 +1934,10 @@
   calculate_young_list_min_length();
   calculate_young_list_target_config();
 
+  // Note that _mmu_tracker->max_gc_time() returns the time in seconds.
+  double update_rs_time_goal_ms = _mmu_tracker->max_gc_time() * MILLIUNITS * G1RSetUpdatingPauseTimePercent / 100.0;
+  adjust_concurrent_refinement(update_rs_time, update_rs_processed_buffers, update_rs_time_goal_ms);
+
   // </NEW PREDICTION>
 
   _target_pause_time_ms = -1.0;
@@ -1900,6 +1945,47 @@
 
 // <NEW PREDICTION>
 
+void G1CollectorPolicy::adjust_concurrent_refinement(double update_rs_time,
+                                                     double update_rs_processed_buffers,
+                                                     double goal_ms) {
+  DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+  ConcurrentG1Refine *cg1r = G1CollectedHeap::heap()->concurrent_g1_refine();
+
+  if (G1UseAdaptiveConcRefinement) {
+    const int k_gy = 3, k_gr = 6;
+    const double inc_k = 1.1, dec_k = 0.9;
+
+    int g = cg1r->green_zone();
+    if (update_rs_time > goal_ms) {
+      g = (int)(g * dec_k);  // Can become 0, that's OK. That would mean a mutator-only processing.
+    } else {
+      if (update_rs_time < goal_ms && update_rs_processed_buffers > g) {
+        g = (int)MAX2(g * inc_k, g + 1.0);
+      }
+    }
+    // Change the refinement threads params
+    cg1r->set_green_zone(g);
+    cg1r->set_yellow_zone(g * k_gy);
+    cg1r->set_red_zone(g * k_gr);
+    cg1r->reinitialize_threads();
+
+    int processing_threshold_delta = MAX2((int)(cg1r->green_zone() * sigma()), 1);
+    int processing_threshold = MIN2(cg1r->green_zone() + processing_threshold_delta,
+                                    cg1r->yellow_zone());
+    // Change the barrier params
+    dcqs.set_process_completed_threshold(processing_threshold);
+    dcqs.set_max_completed_queue(cg1r->red_zone());
+  }
+
+  int curr_queue_size = dcqs.completed_buffers_num();
+  if (curr_queue_size >= cg1r->yellow_zone()) {
+    dcqs.set_completed_queue_padding(curr_queue_size);
+  } else {
+    dcqs.set_completed_queue_padding(0);
+  }
+  dcqs.notify_if_necessary();
+}
+
 double
 G1CollectorPolicy::
 predict_young_collection_elapsed_time_ms(size_t adjustment) {
@@ -2525,19 +2611,6 @@
 }
 #endif // PRODUCT
 
-void
-G1CollectorPolicy::checkpoint_conc_overhead() {
-  double conc_overhead = 0.0;
-  if (G1AccountConcurrentOverhead)
-    conc_overhead = COTracker::totalPredConcOverhead();
-  _mmu_tracker->update_conc_overhead(conc_overhead);
-#if 0
-  gclog_or_tty->print(" CO %1.4lf TARGET %1.4lf",
-             conc_overhead, _mmu_tracker->max_gc_time());
-#endif
-}
-
-
 size_t G1CollectorPolicy::max_regions(int purpose) {
   switch (purpose) {
     case GCAllocForSurvived:
@@ -2553,9 +2626,6 @@
 // Calculates survivor space parameters.
 void G1CollectorPolicy::calculate_survivors_policy()
 {
-  if (!G1UseSurvivorSpaces) {
-    return;
-  }
   if (G1FixedSurvivorSpaceSize == 0) {
     _max_survivor_regions = _young_list_target_length / SurvivorRatio;
   } else {
@@ -2574,13 +2644,6 @@
 G1CollectorPolicy_BestRegionsFirst::should_do_collection_pause(size_t
                                                                word_size) {
   assert(_g1->regions_accounted_for(), "Region leakage!");
-  // Initiate a pause when we reach the steady-state "used" target.
-  size_t used_hard = (_g1->capacity() / 100) * G1SteadyStateUsed;
-  size_t used_soft =
-   MAX2((_g1->capacity() / 100) * (G1SteadyStateUsed - G1SteadyStateUsedDelta),
-        used_hard/2);
-  size_t used = _g1->used();
-
   double max_pause_time_ms = _mmu_tracker->max_gc_time() * 1000.0;
 
   size_t young_list_length = _g1->young_list_length();
@@ -2813,7 +2876,7 @@
 // estimate of the number of live bytes.
 void G1CollectorPolicy::
 add_to_collection_set(HeapRegion* hr) {
-  if (G1PrintRegions) {
+  if (G1PrintHeapRegions) {
     gclog_or_tty->print_cr("added region to cset %d:["PTR_FORMAT", "PTR_FORMAT"], "
                   "top "PTR_FORMAT", young %s",
                   hr->hrs_index(), hr->bottom(), hr->end(),
@@ -2839,8 +2902,15 @@
   double non_young_start_time_sec;
   start_recording_regions();
 
-  guarantee(_target_pause_time_ms > -1.0,
+  guarantee(_target_pause_time_ms > -1.0
+            NOT_PRODUCT(|| Universe::heap()->gc_cause() == GCCause::_scavenge_alot),
             "_target_pause_time_ms should have been set!");
+#ifndef PRODUCT
+  if (_target_pause_time_ms <= -1.0) {
+    assert(ScavengeALot && Universe::heap()->gc_cause() == GCCause::_scavenge_alot, "Error");
+    _target_pause_time_ms = _mmu_tracker->max_gc_time() * 1000.0;
+  }
+#endif
   assert(_collection_set == NULL, "Precondition");
 
   double base_time_ms = predict_base_elapsed_time_ms(_pending_cards);
@@ -2986,7 +3056,3 @@
   G1CollectorPolicy::record_collection_pause_end(abandoned);
   assert(assertMarkedBytesDataOK(), "Marked regions not OK at pause end.");
 }
-
-// Local Variables: ***
-// c-indentation-style: gnu ***
-// End: ***
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -92,9 +92,7 @@
   int _parallel_gc_threads;
 
   enum SomePrivateConstants {
-    NumPrevPausesForHeuristics = 10,
-    NumPrevGCsForHeuristics = 10,
-    NumAPIs = HeapRegion::MaxAge
+    NumPrevPausesForHeuristics = 10
   };
 
   G1MMUTracker* _mmu_tracker;
@@ -318,6 +316,10 @@
   bool verify_young_ages(HeapRegion* head, SurvRateGroup *surv_rate_group);
 #endif // PRODUCT
 
+  void adjust_concurrent_refinement(double update_rs_time,
+                                    double update_rs_processed_buffers,
+                                    double goal_ms);
+
 protected:
   double _pause_time_target_ms;
   double _recorded_young_cset_choice_time_ms;
@@ -981,8 +983,6 @@
   void set_should_initiate_conc_mark()  { _should_initiate_conc_mark = true; }
   void unset_should_initiate_conc_mark(){ _should_initiate_conc_mark = false; }
 
-  void checkpoint_conc_overhead();
-
   // If an expansion would be appropriate, because recent GC overhead had
   // exceeded the desired limit, return an amount to expand by.
   virtual size_t expansion_amount();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
--- a/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 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
@@ -37,21 +37,7 @@
 
 G1MMUTracker::G1MMUTracker(double time_slice, double max_gc_time) :
   _time_slice(time_slice),
-  _max_gc_time(max_gc_time),
-  _conc_overhead_time_sec(0.0) { }
-
-void
-G1MMUTracker::update_conc_overhead(double conc_overhead) {
-  double conc_overhead_time_sec = _time_slice * conc_overhead;
-  if (conc_overhead_time_sec > 0.9 * _max_gc_time) {
-    // We are screwed, as we only seem to have <10% of the soft
-    // real-time goal available for pauses. Let's admit defeat and
-    // allow something more generous as a pause target.
-    conc_overhead_time_sec = 0.75 * _max_gc_time;
-  }
-
-  _conc_overhead_time_sec = conc_overhead_time_sec;
-}
+  _max_gc_time(max_gc_time) { }
 
 G1MMUTrackerQueue::G1MMUTrackerQueue(double time_slice, double max_gc_time) :
   G1MMUTracker(time_slice, max_gc_time),
@@ -100,12 +86,22 @@
     //   increase the array size (:-)
     //   remove the oldest entry (this might allow more GC time for
     //     the time slice than what's allowed)
-    //   concolidate the two entries with the minimum gap between them
-    //     (this mighte allow less GC time than what's allowed)
-    guarantee(0, "array full, currently we can't recover");
+    //   consolidate the two entries with the minimum gap between them
+    //     (this might allow less GC time than what's allowed)
+    guarantee(NOT_PRODUCT(ScavengeALot ||) G1UseFixedWindowMMUTracker,
+              "array full, currently we can't recover unless +G1UseFixedWindowMMUTracker");
+    // In the case where ScavengeALot is true, such overflow is not
+    // uncommon; in such cases, we can, without much loss of precision
+    // or performance (we are GC'ing most of the time anyway!),
+    // simply overwrite the oldest entry in the tracker: this
+    // is also the behaviour when G1UseFixedWindowMMUTracker is enabled.
+    _head_index = trim_index(_head_index + 1);
+    assert(_head_index == _tail_index, "Because we have a full circular buffer");
+    _tail_index = trim_index(_tail_index + 1);
+  } else {
+    _head_index = trim_index(_head_index + 1);
+    ++_no_entries;
   }
-  _head_index = trim_index(_head_index + 1);
-  ++_no_entries;
   _array[_head_index] = G1MMUTrackerQueueElem(start, end);
 }
 
@@ -128,7 +124,7 @@
 
   while( 1 ) {
     double gc_time =
-      calculate_gc_time(current_time + target_time) + _conc_overhead_time_sec;
+      calculate_gc_time(current_time + target_time);
     double diff = target_time + gc_time - _max_gc_time;
     if (!is_double_leq_0(diff)) {
       target_time -= diff;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1MMUTracker.hpp
--- a/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -33,19 +33,15 @@
   double          _time_slice;
   double          _max_gc_time; // this is per time slice
 
-  double          _conc_overhead_time_sec;
-
 public:
   G1MMUTracker(double time_slice, double max_gc_time);
 
-  void update_conc_overhead(double conc_overhead);
-
   virtual void add_pause(double start, double end, bool gc_thread) = 0;
   virtual double longest_pause(double current_time) = 0;
   virtual double when_sec(double current_time, double pause_time) = 0;
 
   double max_gc_time() {
-    return _max_gc_time - _conc_overhead_time_sec;
+    return _max_gc_time;
   }
 
   inline bool now_max_gc(double current_time) {
@@ -103,7 +99,10 @@
   // The array is of fixed size and I don't think we'll need more than
   // two or three entries with the current behaviour of G1 pauses.
   // If the array is full, an easy fix is to look for the pauses with
-  // the shortest gap between them and concolidate them.
+  // the shortest gap between them and consolidate them.
+  // For now, we have taken the expedient alternative of forgetting
+  // the oldest entry in the event that +G1UseFixedWindowMMUTracker, thus
+  // potentially violating MMU specs for some time thereafter.
 
   G1MMUTrackerQueueElem _array[QueueLength];
   int                   _head_index;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
--- a/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -102,9 +102,14 @@
   GenMarkSweep::_marking_stack =
     new (ResourceObj::C_HEAP) GrowableArray<oop>(4000, true);
 
-  size_t size = SystemDictionary::number_of_classes() * 2;
+  int size = SystemDictionary::number_of_classes() * 2;
   GenMarkSweep::_revisit_klass_stack =
-    new (ResourceObj::C_HEAP) GrowableArray<Klass*>((int)size, true);
+    new (ResourceObj::C_HEAP) GrowableArray<Klass*>(size, true);
+  // (#klass/k)^2 for k ~ 10 appears a better fit, but this will have to do
+  // for now until we have a chance to work out a more optimal setting.
+  GenMarkSweep::_revisit_mdo_stack =
+    new (ResourceObj::C_HEAP) GrowableArray<DataLayout*>(size*2, true);
+
 }
 
 void G1MarkSweep::mark_sweep_phase1(bool& marked_for_unloading,
@@ -116,9 +121,11 @@
 
   SharedHeap* sh = SharedHeap::heap();
 
-  sh->process_strong_roots(true,  // Collecting permanent generation.
+  sh->process_strong_roots(true,  // activeate StrongRootsScope
+                           true,  // Collecting permanent generation.
                            SharedHeap::SO_SystemClasses,
                            &GenMarkSweep::follow_root_closure,
+                           &GenMarkSweep::follow_code_root_closure,
                            &GenMarkSweep::follow_root_closure);
 
   // Process reference objects found during marking
@@ -139,13 +146,18 @@
   CodeCache::do_unloading(&GenMarkSweep::is_alive,
                                    &GenMarkSweep::keep_alive,
                                    purged_class);
-           GenMarkSweep::follow_stack();
+  GenMarkSweep::follow_stack();
 
   // Update subklass/sibling/implementor links of live klasses
   GenMarkSweep::follow_weak_klass_links();
   assert(GenMarkSweep::_marking_stack->is_empty(),
          "stack should be empty by now");
 
+  // Visit memoized MDO's and clear any unmarked weak refs
+  GenMarkSweep::follow_mdo_weak_refs();
+  assert(GenMarkSweep::_marking_stack->is_empty(), "just drained");
+
+
   // Visit symbol and interned string tables and delete unmarked oops
   SymbolTable::unlink(&GenMarkSweep::is_alive);
   StringTable::unlink(&GenMarkSweep::is_alive);
@@ -276,9 +288,11 @@
 
   SharedHeap* sh = SharedHeap::heap();
 
-  sh->process_strong_roots(true,  // Collecting permanent generation.
+  sh->process_strong_roots(true,  // activate StrongRootsScope
+                           true,  // Collecting permanent generation.
                            SharedHeap::SO_AllClasses,
                            &GenMarkSweep::adjust_root_pointer_closure,
+                           NULL,  // do not touch code cache here
                            &GenMarkSweep::adjust_pointer_closure);
 
   g1h->ref_processor()->weak_oops_do(&GenMarkSweep::adjust_root_pointer_closure);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1OopClosures.hpp
--- a/src/share/vm/gc_implementation/g1/g1OopClosures.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1OopClosures.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -53,6 +53,15 @@
   bool apply_to_weak_ref_discovered_field() { return true; }
 };
 
+class G1ParPushHeapRSClosure : public G1ParClosureSuper {
+public:
+  G1ParPushHeapRSClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
+    G1ParClosureSuper(g1, par_scan_state) { }
+  template <class T> void do_oop_nv(T* p);
+  virtual void do_oop(oop* p)          { do_oop_nv(p); }
+  virtual void do_oop(narrowOop* p)    { do_oop_nv(p); }
+};
+
 class G1ParScanClosure : public G1ParClosureSuper {
 public:
   G1ParScanClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
@@ -100,7 +109,7 @@
 };
 
 template<bool do_gen_barrier, G1Barrier barrier,
-         bool do_mark_forwardee, bool skip_cset_test>
+         bool do_mark_forwardee>
 class G1ParCopyClosure : public G1ParCopyHelper {
   G1ParScanClosure _scanner;
   template <class T> void do_oop_work(T* p);
@@ -116,12 +125,13 @@
   virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
 };
 
-typedef G1ParCopyClosure<false, G1BarrierNone, false, false> G1ParScanExtRootClosure;
-typedef G1ParCopyClosure<true,  G1BarrierNone, false, false> G1ParScanPermClosure;
-typedef G1ParCopyClosure<false, G1BarrierRS,   false, false> G1ParScanHeapRSClosure;
-typedef G1ParCopyClosure<false, G1BarrierNone, true,  false> G1ParScanAndMarkExtRootClosure;
-typedef G1ParCopyClosure<true,  G1BarrierNone, true,  false> G1ParScanAndMarkPermClosure;
-typedef G1ParCopyClosure<false, G1BarrierRS,   true,  false> G1ParScanAndMarkHeapRSClosure;
+typedef G1ParCopyClosure<false, G1BarrierNone, false> G1ParScanExtRootClosure;
+typedef G1ParCopyClosure<true,  G1BarrierNone, false> G1ParScanPermClosure;
+typedef G1ParCopyClosure<false, G1BarrierRS,   false> G1ParScanHeapRSClosure;
+typedef G1ParCopyClosure<false, G1BarrierNone, true> G1ParScanAndMarkExtRootClosure;
+typedef G1ParCopyClosure<true,  G1BarrierNone, true> G1ParScanAndMarkPermClosure;
+typedef G1ParCopyClosure<false, G1BarrierRS,   true> G1ParScanAndMarkHeapRSClosure;
+
 // This is the only case when we set skip_cset_test. Basically, this
 // closure is (should?) only be called directly while we're draining
 // the overflow and task queues. In that case we know that the
@@ -132,7 +142,7 @@
 // We need a separate closure to handle references during evacuation
 // failure processing, as we cannot asume that the reference already
 // points into the collection set (like G1ParScanHeapEvacClosure does).
-typedef G1ParCopyClosure<false, G1BarrierEvac, false, false> G1ParScanHeapEvacFailureClosure;
+typedef G1ParCopyClosure<false, G1BarrierEvac, false> G1ParScanHeapEvacFailureClosure;
 
 class FilterIntoCSClosure: public OopClosure {
   G1CollectedHeap* _g1;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
--- a/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -104,3 +104,16 @@
     }
   }
 }
+
+template <class T> inline void G1ParPushHeapRSClosure::do_oop_nv(T* p) {
+  T heap_oop = oopDesc::load_heap_oop(p);
+
+  if (!oopDesc::is_null(heap_oop)) {
+    oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+    if (_g1->in_cset_fast_test(obj)) {
+      Prefetch::write(obj->mark_addr(), 0);
+      Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
+      _par_scan_state->push_on_queue(p);
+    }
+  }
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1RemSet.cpp
--- a/src/share/vm/gc_implementation/g1/g1RemSet.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1RemSet.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -155,8 +155,8 @@
   G1BlockOffsetSharedArray* _bot_shared;
   CardTableModRefBS *_ct_bs;
   int _worker_i;
+  int _block_size;
   bool _try_claimed;
-  size_t _min_skip_distance, _max_skip_distance;
 public:
   ScanRSClosure(OopsInHeapRegionClosure* oc, int worker_i) :
     _oc(oc),
@@ -168,8 +168,7 @@
     _g1h = G1CollectedHeap::heap();
     _bot_shared = _g1h->bot_shared();
     _ct_bs = (CardTableModRefBS*) (_g1h->barrier_set());
-    _min_skip_distance = 16;
-    _max_skip_distance = 2 * _g1h->n_par_threads() * _min_skip_distance;
+    _block_size = MAX2<int>(G1RSetScanBlockSize, 1);
   }
 
   void set_try_claimed() { _try_claimed = true; }
@@ -225,12 +224,15 @@
     HeapRegionRemSetIterator* iter = _g1h->rem_set_iterator(_worker_i);
     hrrs->init_iterator(iter);
     size_t card_index;
-    size_t skip_distance = 0, current_card = 0, jump_to_card = 0;
-    while (iter->has_next(card_index)) {
-      if (current_card < jump_to_card) {
-        ++current_card;
-        continue;
+
+    // We claim cards in block so as to recude the contention. The block size is determined by
+    // the G1RSetScanBlockSize parameter.
+    size_t jump_to_card = hrrs->iter_claimed_next(_block_size);
+    for (size_t current_card = 0; iter->has_next(card_index); current_card++) {
+      if (current_card >= jump_to_card + _block_size) {
+        jump_to_card = hrrs->iter_claimed_next(_block_size);
       }
+      if (current_card < jump_to_card) continue;
       HeapWord* card_start = _g1h->bot_shared()->address_for_index(card_index);
 #if 0
       gclog_or_tty->print("Rem set iteration yielded card [" PTR_FORMAT ", " PTR_FORMAT ").\n",
@@ -247,22 +249,14 @@
 
        // If the card is dirty, then we will scan it during updateRS.
       if (!card_region->in_collection_set() && !_ct_bs->is_card_dirty(card_index)) {
-          if (!_ct_bs->is_card_claimed(card_index) && _ct_bs->claim_card(card_index)) {
-            scanCard(card_index, card_region);
-          } else if (_try_claimed) {
-            if (jump_to_card == 0 || jump_to_card != current_card) {
-              // We did some useful work in the previous iteration.
-              // Decrease the distance.
-              skip_distance = MAX2(skip_distance >> 1, _min_skip_distance);
-            } else {
-              // Previous iteration resulted in a claim failure.
-              // Increase the distance.
-              skip_distance = MIN2(skip_distance << 1, _max_skip_distance);
-            }
-            jump_to_card = current_card + skip_distance;
-          }
+        // We make the card as "claimed" lazily (so races are possible but they're benign),
+        // which reduces the number of duplicate scans (the rsets of the regions in the cset
+        // can intersect).
+        if (!_ct_bs->is_card_claimed(card_index)) {
+          _ct_bs->set_card_claimed(card_index);
+          scanCard(card_index, card_region);
+        }
       }
-      ++current_card;
     }
     if (!_try_claimed) {
       hrrs->set_iter_complete();
@@ -299,30 +293,18 @@
   double rs_time_start = os::elapsedTime();
   HeapRegion *startRegion = calculateStartRegion(worker_i);
 
-  BufferingOopsInHeapRegionClosure boc(oc);
-  ScanRSClosure scanRScl(&boc, worker_i);
+  ScanRSClosure scanRScl(oc, worker_i);
   _g1->collection_set_iterate_from(startRegion, &scanRScl);
   scanRScl.set_try_claimed();
   _g1->collection_set_iterate_from(startRegion, &scanRScl);
 
-  boc.done();
-  double closure_app_time_sec = boc.closure_app_seconds();
-  double scan_rs_time_sec = (os::elapsedTime() - rs_time_start) -
-    closure_app_time_sec;
-  double closure_app_time_ms = closure_app_time_sec * 1000.0;
+  double scan_rs_time_sec = os::elapsedTime() - rs_time_start;
 
   assert( _cards_scanned != NULL, "invariant" );
   _cards_scanned[worker_i] = scanRScl.cards_done();
 
   _g1p->record_scan_rs_start_time(worker_i, rs_time_start * 1000.0);
   _g1p->record_scan_rs_time(worker_i, scan_rs_time_sec * 1000.0);
-
-  double scan_new_refs_time_ms = _g1p->get_scan_new_refs_time(worker_i);
-  if (scan_new_refs_time_ms > 0.0) {
-    closure_app_time_ms += scan_new_refs_time_ms;
-  }
-
-  _g1p->record_obj_copy_time(worker_i, closure_app_time_ms);
 }
 
 void HRInto_G1RemSet::updateRS(int worker_i) {
@@ -449,9 +431,8 @@
       oc->do_oop(p);
     }
   }
-  _g1p->record_scan_new_refs_time(worker_i,
-                                  (os::elapsedTime() - scan_new_refs_start_sec)
-                                  * 1000.0);
+  double scan_new_refs_time_ms = (os::elapsedTime() - scan_new_refs_start_sec) * 1000.0;
+  _g1p->record_scan_new_refs_time(worker_i, scan_new_refs_time_ms);
 }
 
 void HRInto_G1RemSet::cleanupHRRS() {
@@ -486,7 +467,7 @@
     // and they are causing failures. When we resolve said race
     // conditions, we'll revert back to parallel remembered set
     // updating and scanning. See CRs 6677707 and 6677708.
-    if (G1ParallelRSetUpdatingEnabled || (worker_i == 0)) {
+    if (G1UseParallelRSetUpdating || (worker_i == 0)) {
       updateRS(worker_i);
       scanNewRefsRS(oc, worker_i);
     } else {
@@ -495,7 +476,7 @@
       _g1p->record_update_rs_time(worker_i, 0.0);
       _g1p->record_scan_new_refs_time(worker_i, 0.0);
     }
-    if (G1ParallelRSetScanningEnabled || (worker_i == 0)) {
+    if (G1UseParallelRSetScanning || (worker_i == 0)) {
       scanRS(oc, worker_i);
     } else {
       _g1p->record_scan_rs_start_time(worker_i, os::elapsedTime() * 1000.0);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1_globals.hpp
--- a/src/share/vm/gc_implementation/g1/g1_globals.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1_globals.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -37,13 +37,6 @@
   develop(intx, G1MarkingOverheadPercent, 0,                                \
           "Overhead of concurrent marking")                                 \
                                                                             \
-  develop(bool, G1AccountConcurrentOverhead, false,                         \
-          "Whether soft real-time compliance in G1 will take into account"  \
-          "concurrent overhead")                                            \
-                                                                            \
-  product(intx, G1YoungGenSize, 0,                                          \
-          "Size of the G1 young generation, 0 is the adaptive policy")      \
-                                                                            \
   develop(bool, G1Gen, true,                                                \
           "If true, it will enable the generational G1")                    \
                                                                             \
@@ -59,8 +52,14 @@
   develop(intx, G1MarkingVerboseLevel, 0,                                   \
           "Level (0-4) of verboseness of the marking code")                 \
                                                                             \
-  develop(bool, G1VerifyConcMarkPrintReachable, false,                      \
-          "If conc mark verification fails, print reachable objects")       \
+  develop(bool, G1PrintReachableAtInitialMark, false,                       \
+          "Reachable object dump at the initial mark pause")                \
+                                                                            \
+  develop(bool, G1VerifyDuringGCPrintReachable, false,                      \
+          "If conc mark verification fails, dump reachable objects")        \
+                                                                            \
+  develop(ccstr, G1PrintReachableBaseFile, NULL,                            \
+          "The base file name for the reachable object dumps")              \
                                                                             \
   develop(bool, G1TraceMarkStackOverflow, false,                            \
           "If true, extra debugging code for CM restart for ovflw.")        \
@@ -68,7 +67,7 @@
   develop(intx, G1PausesBtwnConcMark, -1,                                   \
           "If positive, fixed number of pauses between conc markings")      \
                                                                             \
-  diagnostic(bool, G1SummarizeConcurrentMark, false,                        \
+  diagnostic(bool, G1SummarizeConcMark, false,                              \
           "Summarize concurrent mark info")                                 \
                                                                             \
   diagnostic(bool, G1SummarizeRSetStats, false,                             \
@@ -83,48 +82,25 @@
   diagnostic(bool, G1SummarizeZFStats, false,                               \
           "Summarize zero-filling info")                                    \
                                                                             \
-  develop(bool, G1TraceConcurrentRefinement, false,                         \
+  diagnostic(bool, G1TraceConcRefinement, false,                            \
           "Trace G1 concurrent refinement")                                 \
                                                                             \
-  product(intx, G1MarkStackSize, 2 * 1024 * 1024,                           \
-          "Size of the mark stack for concurrent marking.")                 \
-                                                                            \
   product(intx, G1MarkRegionStackSize, 1024 * 1024,                         \
           "Size of the region stack for concurrent marking.")               \
                                                                             \
-  develop(bool, G1ConcRefine, true,                                         \
-          "If true, run concurrent rem set refinement for G1")              \
-                                                                            \
-  develop(intx, G1ConcRefineTargTraversals, 4,                              \
-          "Number of concurrent refinement we try to achieve")              \
-                                                                            \
-  develop(intx, G1ConcRefineInitialDelta, 4,                                \
-          "Number of heap regions of alloc ahead of starting collection "   \
-          "pause to start concurrent refinement (initially)")               \
-                                                                            \
-  develop(bool, G1SmoothConcRefine, true,                                   \
-          "Attempts to smooth out the overhead of concurrent refinement")   \
-                                                                            \
   develop(bool, G1ConcZeroFill, true,                                       \
           "If true, run concurrent zero-filling thread")                    \
                                                                             \
   develop(intx, G1ConcZFMaxRegions, 1,                                      \
           "Stop zero-filling when # of zf'd regions reaches")               \
                                                                             \
-  product(intx, G1SteadyStateUsed, 90,                                      \
-          "If non-0, try to maintain 'used' at this pct (of max)")          \
-                                                                            \
-  product(intx, G1SteadyStateUsedDelta, 30,                                 \
-          "If G1SteadyStateUsed is non-0, then do pause this number of "    \
-          "of percentage points earlier if no marking is in progress.")     \
-                                                                            \
   develop(bool, G1SATBBarrierPrintNullPreVals, false,                       \
           "If true, count frac of ptr writes with null pre-vals.")          \
                                                                             \
-  product(intx, G1SATBLogBufferSize, 1*K,                                   \
+  product(intx, G1SATBBufferSize, 1*K,                                      \
           "Number of entries in an SATB log buffer.")                       \
                                                                             \
-  product(intx, G1SATBProcessCompletedThreshold, 20,                        \
+  develop(intx, G1SATBProcessCompletedThreshold, 20,                        \
           "Number of completed buffers that triggers log processing.")      \
                                                                             \
   develop(intx, G1ExtraRegionSurvRate, 33,                                  \
@@ -138,7 +114,7 @@
   develop(bool, G1SATBPrintStubs, false,                                    \
           "If true, print generated stubs for the SATB barrier")            \
                                                                             \
-  product(intx, G1ExpandByPercentOfAvailable, 20,                           \
+  experimental(intx, G1ExpandByPercentOfAvailable, 20,                      \
           "When expanding, % of uncommitted space to claim.")               \
                                                                             \
   develop(bool, G1RSBarrierRegionFilter, true,                              \
@@ -176,13 +152,38 @@
   product(intx, G1UpdateBufferSize, 256,                                    \
           "Size of an update buffer")                                       \
                                                                             \
-  product(intx, G1UpdateBufferQueueProcessingThreshold, 5,                  \
+  product(intx, G1ConcRefinementYellowZone, 0,                              \
           "Number of enqueued update buffers that will "                    \
-          "trigger concurrent processing")                                  \
+          "trigger concurrent processing. Will be selected ergonomically "  \
+          "by default.")                                                    \
+                                                                            \
+  product(intx, G1ConcRefinementRedZone, 0,                                 \
+          "Maximum number of enqueued update buffers before mutator "       \
+          "threads start processing new ones instead of enqueueing them. "  \
+          "Will be selected ergonomically by default. Zero will disable "   \
+          "concurrent processing.")                                         \
+                                                                            \
+  product(intx, G1ConcRefinementGreenZone, 0,                               \
+          "The number of update buffers that are left in the queue by the " \
+          "concurrent processing threads. Will be selected ergonomically "  \
+          "by default.")                                                    \
                                                                             \
-  product(intx, G1UpdateBufferQueueMaxLength, 30,                           \
-          "Maximum number of enqueued update buffers before mutator "       \
-          "threads start processing new ones instead of enqueueing them")   \
+  product(intx, G1ConcRefinementServiceIntervalMillis, 300,                 \
+          "The last concurrent refinement thread wakes up every "           \
+          "specified number of milliseconds to do miscellaneous work.")     \
+                                                                            \
+  product(intx, G1ConcRefinementThresholdStep, 0,                           \
+          "Each time the rset update queue increases by this amount "       \
+          "activate the next refinement thread if available. "              \
+          "Will be selected ergonomically by default.")                     \
+                                                                            \
+  product(intx, G1RSetUpdatingPauseTimePercent, 10,                         \
+          "A target percentage of time that is allowed to be spend on "     \
+          "process RS update buffers during the collection pause.")         \
+                                                                            \
+  product(bool, G1UseAdaptiveConcRefinement, true,                          \
+          "Select green, yellow and red zones adaptively to meet the "      \
+          "the pause requirements.")                                        \
                                                                             \
   develop(intx, G1ConcRSLogCacheSize, 10,                                   \
           "Log base 2 of the length of conc RS hot-card cache.")            \
@@ -193,8 +194,20 @@
   develop(bool, G1PrintOopAppls, false,                                     \
           "When true, print applications of closures to external locs.")    \
                                                                             \
-  develop(intx, G1LogRSRegionEntries, 7,                                    \
-          "Log_2 of max number of regions for which we keep bitmaps.")      \
+  develop(intx, G1RSetRegionEntriesBase, 256,                               \
+          "Max number of regions in a fine-grain table per MB.")            \
+                                                                            \
+  product(intx, G1RSetRegionEntries, 0,                                     \
+          "Max number of regions for which we keep bitmaps."                \
+          "Will be set ergonomically by default")                           \
+                                                                            \
+  develop(intx, G1RSetSparseRegionEntriesBase, 4,                           \
+          "Max number of entries per region in a sparse table "             \
+          "per MB.")                                                        \
+                                                                            \
+  product(intx, G1RSetSparseRegionEntries, 0,                               \
+          "Max number of entries per region in a sparse table."             \
+          "Will be set ergonomically by default.")                          \
                                                                             \
   develop(bool, G1RecordHRRSOops, false,                                    \
           "When true, record recent calls to rem set operations.")          \
@@ -219,15 +232,15 @@
           "the number of regions for which we'll print a surv rate "        \
           "summary.")                                                       \
                                                                             \
-  product(bool, G1UseScanOnlyPrefix, false,                                 \
+  develop(bool, G1UseScanOnlyPrefix, false,                                 \
           "It determines whether the system will calculate an optimum "     \
           "scan-only set.")                                                 \
                                                                             \
-  product(intx, G1MinReservePercent, 10,                                    \
+  product(intx, G1ReservePercent, 10,                                       \
           "It determines the minimum reserve we should have in the heap "   \
           "to minimize the probability of promotion failure.")              \
                                                                             \
-  diagnostic(bool, G1PrintRegions, false,                                   \
+  diagnostic(bool, G1PrintHeapRegions, false,                               \
           "If set G1 will print information on which regions are being "    \
           "allocated and which are reclaimed.")                             \
                                                                             \
@@ -237,8 +250,9 @@
   develop(bool, G1HRRSFlushLogBuffersOnVerify, false,                       \
           "Forces flushing of log buffers before verification.")            \
                                                                             \
-  product(bool, G1UseSurvivorSpaces, true,                                  \
-          "When true, use survivor space.")                                 \
+  develop(bool, G1FailOnFPError, false,                                     \
+          "When set, G1 will fail when it encounters an FP 'error', "       \
+          "so as to allow debugging")                                       \
                                                                             \
   develop(bool, G1FixedTenuringThreshold, false,                            \
           "When set, G1 will not adjust the tenuring threshold")            \
@@ -250,20 +264,37 @@
           "If non-0 is the size of the G1 survivor space, "                 \
           "otherwise SurvivorRatio is used to determine the size")          \
                                                                             \
-  experimental(bool, G1ParallelRSetUpdatingEnabled, false,                  \
+  product(bool, G1UseFixedWindowMMUTracker, false,                          \
+          "If the MMU tracker's memory is full, forget the oldest entry")   \
+                                                                            \
+  product(uintx, G1HeapRegionSize, 0,                                       \
+          "Size of the G1 regions.")                                        \
+                                                                            \
+  experimental(bool, G1UseParallelRSetUpdating, false,                      \
           "Enables the parallelization of remembered set updating "         \
           "during evacuation pauses")                                       \
                                                                             \
-  experimental(bool, G1ParallelRSetScanningEnabled, false,                  \
+  experimental(bool, G1UseParallelRSetScanning, false,                      \
           "Enables the parallelization of remembered set scanning "         \
           "during evacuation pauses")                                       \
                                                                             \
-  product(uintx, G1ParallelRSetThreads, 0,                                  \
+  product(uintx, G1ConcRefinementThreads, 0,                                \
           "If non-0 is the number of parallel rem set update threads, "     \
           "otherwise the value is determined ergonomically.")               \
                                                                             \
   develop(intx, G1CardCountCacheExpandThreshold, 16,                        \
           "Expand the card count cache if the number of collisions for "    \
-          "a particular entry exceeds this value.")
+          "a particular entry exceeds this value.")                         \
+                                                                            \
+  develop(bool, G1VerifyCTCleanup, false,                                   \
+          "Verify card table cleanup.")                                     \
+                                                                            \
+  product(uintx, G1RSetScanBlockSize, 64,                                   \
+          "Size of a work unit of cards claimed by a worker thread"         \
+          "during RSet scanning.")                                          \
+                                                                            \
+  develop(bool, ReduceInitialCardMarksForG1, false,                         \
+          "When ReduceInitialCardMarks is true, this flag setting "         \
+          " controls whether G1 allows the RICM optimization")
 
 G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG)
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp
--- a/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -33,11 +33,12 @@
 };
 
 template<bool do_gen_barrier, G1Barrier barrier,
-         bool do_mark_forwardee, bool skip_cset_test>
+         bool do_mark_forwardee>
 class G1ParCopyClosure;
 class G1ParScanClosure;
+class G1ParPushHeapRSClosure;
 
-typedef G1ParCopyClosure<false, G1BarrierEvac, false, true> G1ParScanHeapEvacClosure;
+typedef G1ParCopyClosure<false, G1BarrierEvac, false> G1ParScanHeapEvacClosure;
 
 class FilterIntoCSClosure;
 class FilterOutOfRegionClosure;
@@ -51,6 +52,7 @@
 #define FURTHER_SPECIALIZED_OOP_OOP_ITERATE_CLOSURES(f) \
       f(G1ParScanHeapEvacClosure,_nv)                   \
       f(G1ParScanClosure,_nv)                           \
+      f(G1ParPushHeapRSClosure,_nv)                     \
       f(FilterIntoCSClosure,_nv)                        \
       f(FilterOutOfRegionClosure,_nv)                   \
       f(FilterInHeapRegionAndIntoCSClosure,_nv)         \
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/heapRegion.cpp
--- a/src/share/vm/gc_implementation/g1/heapRegion.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -25,6 +25,12 @@
 #include "incls/_precompiled.incl"
 #include "incls/_heapRegion.cpp.incl"
 
+int HeapRegion::LogOfHRGrainBytes = 0;
+int HeapRegion::LogOfHRGrainWords = 0;
+int HeapRegion::GrainBytes        = 0;
+int HeapRegion::GrainWords        = 0;
+int HeapRegion::CardsPerRegion    = 0;
+
 HeapRegionDCTOC::HeapRegionDCTOC(G1CollectedHeap* g1,
                                  HeapRegion* hr, OopClosure* cl,
                                  CardTableModRefBS::PrecisionStyle precision,
@@ -231,6 +237,73 @@
   }
 }
 
+// Minimum region size; we won't go lower than that.
+// We might want to decrease this in the future, to deal with small
+// heaps a bit more efficiently.
+#define MIN_REGION_SIZE  (      1024 * 1024 )
+
+// Maximum region size; we don't go higher than that. There's a good
+// reason for having an upper bound. We don't want regions to get too
+// large, otherwise cleanup's effectiveness would decrease as there
+// will be fewer opportunities to find totally empty regions after
+// marking.
+#define MAX_REGION_SIZE  ( 32 * 1024 * 1024 )
+
+// The automatic region size calculation will try to have around this
+// many regions in the heap (based on the min heap size).
+#define TARGET_REGION_NUMBER          2048
+
+void HeapRegion::setup_heap_region_size(uintx min_heap_size) {
+  // region_size in bytes
+  uintx region_size = G1HeapRegionSize;
+  if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
+    // We base the automatic calculation on the min heap size. This
+    // can be problematic if the spread between min and max is quite
+    // wide, imagine -Xms128m -Xmx32g. But, if we decided it based on
+    // the max size, the region size might be way too large for the
+    // min size. Either way, some users might have to set the region
+    // size manually for some -Xms / -Xmx combos.
+
+    region_size = MAX2(min_heap_size / TARGET_REGION_NUMBER,
+                       (uintx) MIN_REGION_SIZE);
+  }
+
+  int region_size_log = log2_long((jlong) region_size);
+  // Recalculate the region size to make sure it's a power of
+  // 2. This means that region_size is the largest power of 2 that's
+  // <= what we've calculated so far.
+  region_size = 1 << region_size_log;
+
+  // Now make sure that we don't go over or under our limits.
+  if (region_size < MIN_REGION_SIZE) {
+    region_size = MIN_REGION_SIZE;
+  } else if (region_size > MAX_REGION_SIZE) {
+    region_size = MAX_REGION_SIZE;
+  }
+
+  // And recalculate the log.
+  region_size_log = log2_long((jlong) region_size);
+
+  // Now, set up the globals.
+  guarantee(LogOfHRGrainBytes == 0, "we should only set it once");
+  LogOfHRGrainBytes = region_size_log;
+
+  guarantee(LogOfHRGrainWords == 0, "we should only set it once");
+  LogOfHRGrainWords = LogOfHRGrainBytes - LogHeapWordSize;
+
+  guarantee(GrainBytes == 0, "we should only set it once");
+  // The cast to int is safe, given that we've bounded region_size by
+  // MIN_REGION_SIZE and MAX_REGION_SIZE.
+  GrainBytes = (int) region_size;
+
+  guarantee(GrainWords == 0, "we should only set it once");
+  GrainWords = GrainBytes >> LogHeapWordSize;
+  guarantee(1 << LogOfHRGrainWords == GrainWords, "sanity");
+
+  guarantee(CardsPerRegion == 0, "we should only set it once");
+  CardsPerRegion = GrainBytes >> CardTableModRefBS::card_shift;
+}
+
 void HeapRegion::reset_after_compaction() {
   G1OffsetTableContigSpace::reset_after_compaction();
   // After a compaction the mark bitmap is invalid, so we must
@@ -649,12 +722,13 @@
     st->print(" F");
   else
     st->print("  ");
-  st->print(" %d", _gc_time_stamp);
+  st->print(" %5d", _gc_time_stamp);
   G1OffsetTableContigSpace::print_on(st);
 }
 
 void HeapRegion::verify(bool allow_dirty) const {
-  verify(allow_dirty, /* use_prev_marking */ true);
+  bool dummy = false;
+  verify(allow_dirty, /* use_prev_marking */ true, /* failures */ &dummy);
 }
 
 #define OBJ_SAMPLE_INTERVAL 0
@@ -663,8 +737,11 @@
 // This really ought to be commoned up into OffsetTableContigSpace somehow.
 // We would need a mechanism to make that code skip dead objects.
 
-void HeapRegion::verify(bool allow_dirty, bool use_prev_marking) const {
+void HeapRegion::verify(bool allow_dirty,
+                        bool use_prev_marking,
+                        bool* failures) const {
   G1CollectedHeap* g1 = G1CollectedHeap::heap();
+  *failures = false;
   HeapWord* p = bottom();
   HeapWord* prev_p = NULL;
   int objs = 0;
@@ -673,8 +750,14 @@
   while (p < top()) {
     size_t size = oop(p)->size();
     if (blocks == BLOCK_SAMPLE_INTERVAL) {
-      guarantee(p == block_start_const(p + (size/2)),
-                "check offset computation");
+      HeapWord* res = block_start_const(p + (size/2));
+      if (p != res) {
+        gclog_or_tty->print_cr("offset computation 1 for "PTR_FORMAT" and "
+                               SIZE_FORMAT" returned "PTR_FORMAT,
+                               p, size, res);
+        *failures = true;
+        return;
+      }
       blocks = 0;
     } else {
       blocks++;
@@ -682,11 +765,34 @@
     if (objs == OBJ_SAMPLE_INTERVAL) {
       oop obj = oop(p);
       if (!g1->is_obj_dead_cond(obj, this, use_prev_marking)) {
-        obj->verify();
-        vl_cl.set_containing_obj(obj);
-        obj->oop_iterate(&vl_cl);
-        if (G1MaxVerifyFailures >= 0
-            && vl_cl.n_failures() >= G1MaxVerifyFailures) break;
+        if (obj->is_oop()) {
+          klassOop klass = obj->klass();
+          if (!klass->is_perm()) {
+            gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
+                                   "not in perm", klass, obj);
+            *failures = true;
+            return;
+          } else if (!klass->is_klass()) {
+            gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
+                                   "not a klass", klass, obj);
+            *failures = true;
+            return;
+          } else {
+            vl_cl.set_containing_obj(obj);
+            obj->oop_iterate(&vl_cl);
+            if (vl_cl.failures()) {
+              *failures = true;
+            }
+            if (G1MaxVerifyFailures >= 0 &&
+                vl_cl.n_failures() >= G1MaxVerifyFailures) {
+              return;
+            }
+          }
+        } else {
+          gclog_or_tty->print_cr(PTR_FORMAT" no an oop", obj);
+          *failures = true;
+          return;
+        }
       }
       objs = 0;
     } else {
@@ -698,21 +804,22 @@
   HeapWord* rend = end();
   HeapWord* rtop = top();
   if (rtop < rend) {
-    guarantee(block_start_const(rtop + (rend - rtop) / 2) == rtop,
-              "check offset computation");
-  }
-  if (vl_cl.failures()) {
-    gclog_or_tty->print_cr("Heap:");
-    G1CollectedHeap::heap()->print_on(gclog_or_tty, true /* extended */);
-    gclog_or_tty->print_cr("");
+    HeapWord* res = block_start_const(rtop + (rend - rtop) / 2);
+    if (res != rtop) {
+        gclog_or_tty->print_cr("offset computation 2 for "PTR_FORMAT" and "
+                               PTR_FORMAT" returned "PTR_FORMAT,
+                               rtop, rend, res);
+        *failures = true;
+        return;
+    }
   }
-  if (VerifyDuringGC &&
-      G1VerifyConcMarkPrintReachable &&
-      vl_cl.failures()) {
-    g1->concurrent_mark()->print_prev_bitmap_reachable();
+
+  if (p != top()) {
+    gclog_or_tty->print_cr("end of last object "PTR_FORMAT" "
+                           "does not match top "PTR_FORMAT, p, top());
+    *failures = true;
+    return;
   }
-  guarantee(!vl_cl.failures(), "region verification failed");
-  guarantee(p == top(), "end of last object must match end of space");
 }
 
 // G1OffsetTableContigSpace code; copied from space.cpp.  Hope this can go
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/heapRegion.hpp
--- a/src/share/vm/gc_implementation/g1/heapRegion.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -297,15 +297,24 @@
   HeapRegion(G1BlockOffsetSharedArray* sharedOffsetArray,
              MemRegion mr, bool is_zeroed);
 
-  enum SomePublicConstants {
-    // HeapRegions are GrainBytes-aligned
-    // and have sizes that are multiples of GrainBytes.
-    LogOfHRGrainBytes = 20,
-    LogOfHRGrainWords = LogOfHRGrainBytes - LogHeapWordSize,
-    GrainBytes = 1 << LogOfHRGrainBytes,
-    GrainWords = 1 <<LogOfHRGrainWords,
-    MaxAge = 2, NoOfAges = MaxAge+1
-  };
+  static int LogOfHRGrainBytes;
+  static int LogOfHRGrainWords;
+  // The normal type of these should be size_t. However, they used to
+  // be members of an enum before and they are assumed by the
+  // compilers to be ints. To avoid going and fixing all their uses,
+  // I'm declaring them as ints. I'm not anticipating heap region
+  // sizes to reach anywhere near 2g, so using an int here is safe.
+  static int GrainBytes;
+  static int GrainWords;
+  static int CardsPerRegion;
+
+  // It sets up the heap region size (GrainBytes / GrainWords), as
+  // well as other related fields that are based on the heap region
+  // size (LogOfHRGrainBytes / LogOfHRGrainWords /
+  // CardsPerRegion). All those fields are considered constant
+  // throughout the JVM's execution, therefore they should only be set
+  // up once during initialization time.
+  static void setup_heap_region_size(uintx min_heap_size);
 
   enum ClaimValues {
     InitialClaimValue     = 0,
@@ -560,13 +569,8 @@
   // ever evacuated into this region.  If we evacuate, allocate, and
   // then evacuate we are in deep doodoo.
   void note_end_of_copying() {
-    assert(top() >= _next_top_at_mark_start,
-           "Increase only");
-    // Survivor regions will be scanned on the start of concurrent
-    // marking.
-    if (!is_survivor()) {
-      _next_top_at_mark_start = top();
-    }
+    assert(top() >= _next_top_at_mark_start, "Increase only");
+    _next_top_at_mark_start = top();
   }
 
   // Returns "false" iff no object in the region was allocated when the
@@ -789,7 +793,7 @@
   // use_prev_marking == true. Currently, there is only one case where
   // this is called with use_prev_marking == false, which is to verify
   // the "next" marking information at the end of remark.
-  void verify(bool allow_dirty, bool use_prev_marking) const;
+  void verify(bool allow_dirty, bool use_prev_marking, bool *failures) const;
 
   // Override; it uses the "prev" marking information
   virtual void verify(bool allow_dirty) const;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
--- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -57,10 +57,6 @@
 
 #endif // _MSC_VER
 
-  enum SomePrivateConstants {
-    CardsPerRegion = HeapRegion::GrainBytes >> CardTableModRefBS::card_shift
-  };
-
 protected:
   // We need access in order to union things into the base table.
   BitMap* bm() { return &_bm; }
@@ -76,7 +72,7 @@
 #if PRT_COUNT_OCCUPIED
     _occupied(0),
 #endif
-    _bm(CardsPerRegion, false /* in-resource-area */)
+    _bm(HeapRegion::CardsPerRegion, false /* in-resource-area */)
   {}
 
   static void free(PerRegionTable* prt) {
@@ -144,7 +140,8 @@
       CardIdx_t from_card = (CardIdx_t)
           hw_offset >> (CardTableModRefBS::card_shift - LogHeapWordSize);
 
-      assert(0 <= from_card && from_card < CardsPerRegion, "Must be in range.");
+      assert(0 <= from_card && from_card < HeapRegion::CardsPerRegion,
+             "Must be in range.");
       add_card_work(from_card, par);
     }
   }
@@ -261,42 +258,6 @@
     ReserveParTableExpansion = 1
   };
 
-  void par_expand() {
-    int n = HeapRegionRemSet::num_par_rem_sets()-1;
-    if (n <= 0) return;
-    if (_par_tables == NULL) {
-      PerRegionTable* res =
-        (PerRegionTable*)
-        Atomic::cmpxchg_ptr((PerRegionTable*)ReserveParTableExpansion,
-                            &_par_tables, NULL);
-      if (res != NULL) return;
-      // Otherwise, we reserved the right to do the expansion.
-
-      PerRegionTable** ptables = NEW_C_HEAP_ARRAY(PerRegionTable*, n);
-      for (int i = 0; i < n; i++) {
-        PerRegionTable* ptable = PerRegionTable::alloc(hr());
-        ptables[i] = ptable;
-      }
-      // Here we do not need an atomic.
-      _par_tables = ptables;
-#if COUNT_PAR_EXPANDS
-      print_par_expand();
-#endif
-      // We must put this table on the expanded list.
-      PosParPRT* exp_head = _par_expanded_list;
-      while (true) {
-        set_next_par_expanded(exp_head);
-        PosParPRT* res =
-          (PosParPRT*)
-          Atomic::cmpxchg_ptr(this, &_par_expanded_list, exp_head);
-        if (res == exp_head) return;
-        // Otherwise.
-        exp_head = res;
-      }
-      ShouldNotReachHere();
-    }
-  }
-
   void par_contract() {
     assert(_par_tables != NULL, "Precondition.");
     int n = HeapRegionRemSet::num_par_rem_sets()-1;
@@ -394,13 +355,49 @@
   void set_next(PosParPRT* nxt) { _next = nxt; }
   PosParPRT** next_addr() { return &_next; }
 
+  bool should_expand(int tid) {
+    return par_tables() == NULL && tid > 0 && hr()->is_gc_alloc_region();
+  }
+
+  void par_expand() {
+    int n = HeapRegionRemSet::num_par_rem_sets()-1;
+    if (n <= 0) return;
+    if (_par_tables == NULL) {
+      PerRegionTable* res =
+        (PerRegionTable*)
+        Atomic::cmpxchg_ptr((PerRegionTable*)ReserveParTableExpansion,
+                            &_par_tables, NULL);
+      if (res != NULL) return;
+      // Otherwise, we reserved the right to do the expansion.
+
+      PerRegionTable** ptables = NEW_C_HEAP_ARRAY(PerRegionTable*, n);
+      for (int i = 0; i < n; i++) {
+        PerRegionTable* ptable = PerRegionTable::alloc(hr());
+        ptables[i] = ptable;
+      }
+      // Here we do not need an atomic.
+      _par_tables = ptables;
+#if COUNT_PAR_EXPANDS
+      print_par_expand();
+#endif
+      // We must put this table on the expanded list.
+      PosParPRT* exp_head = _par_expanded_list;
+      while (true) {
+        set_next_par_expanded(exp_head);
+        PosParPRT* res =
+          (PosParPRT*)
+          Atomic::cmpxchg_ptr(this, &_par_expanded_list, exp_head);
+        if (res == exp_head) return;
+        // Otherwise.
+        exp_head = res;
+      }
+      ShouldNotReachHere();
+    }
+  }
+
   void add_reference(OopOrNarrowOopStar from, int tid) {
     // Expand if necessary.
     PerRegionTable** pt = par_tables();
-    if (par_tables() == NULL && tid > 0 && hr()->is_gc_alloc_region()) {
-      par_expand();
-      pt = par_tables();
-    }
     if (pt != NULL) {
       // We always have to assume that mods to table 0 are in parallel,
       // because of the claiming scheme in parallel expansion.  A thread
@@ -508,12 +505,13 @@
   typedef PosParPRT* PosParPRTPtr;
   if (_max_fine_entries == 0) {
     assert(_mod_max_fine_entries_mask == 0, "Both or none.");
-    _max_fine_entries = (size_t)(1 << G1LogRSRegionEntries);
+    size_t max_entries_log = (size_t)log2_long((jlong)G1RSetRegionEntries);
+    _max_fine_entries = (size_t)(1 << max_entries_log);
     _mod_max_fine_entries_mask = _max_fine_entries - 1;
 #if SAMPLE_FOR_EVICTION
     assert(_fine_eviction_sample_size == 0
            && _fine_eviction_stride == 0, "All init at same time.");
-    _fine_eviction_sample_size = MAX2((size_t)4, (size_t)G1LogRSRegionEntries);
+    _fine_eviction_sample_size = MAX2((size_t)4, max_entries_log);
     _fine_eviction_stride = _max_fine_entries / _fine_eviction_sample_size;
 #endif
   }
@@ -631,7 +629,7 @@
         uintptr_t(from_hr->bottom())
           >> CardTableModRefBS::card_shift;
       CardIdx_t card_index = from_card - from_hr_bot_card_index;
-      assert(0 <= card_index && card_index < PosParPRT::CardsPerRegion,
+      assert(0 <= card_index && card_index < HeapRegion::CardsPerRegion,
              "Must be in range.");
       if (G1HRRSUseSparseTable &&
           _sparse_table.add_card(from_hrs_ind, card_index)) {
@@ -658,13 +656,6 @@
 #endif
       }
 
-      // Otherwise, transfer from sparse to fine-grain.
-      CardIdx_t cards[SparsePRTEntry::CardsPerEntry];
-      if (G1HRRSUseSparseTable) {
-        bool res = _sparse_table.get_cards(from_hrs_ind, &cards[0]);
-        assert(res, "There should have been an entry");
-      }
-
       if (_n_fine_entries == _max_fine_entries) {
         prt = delete_region_table();
       } else {
@@ -679,10 +670,12 @@
       _fine_grain_regions[ind] = prt;
       _n_fine_entries++;
 
-      // Add in the cards from the sparse table.
       if (G1HRRSUseSparseTable) {
-        for (int i = 0; i < SparsePRTEntry::CardsPerEntry; i++) {
-          CardIdx_t c = cards[i];
+        // Transfer from sparse to fine-grain.
+        SparsePRTEntry *sprt_entry = _sparse_table.get_entry(from_hrs_ind);
+        assert(sprt_entry != NULL, "There should have been an entry");
+        for (int i = 0; i < SparsePRTEntry::cards_num(); i++) {
+          CardIdx_t c = sprt_entry->card(i);
           if (c != SparsePRTEntry::NullEntry) {
             prt->add_card(c);
           }
@@ -699,7 +692,21 @@
   // OtherRegionsTable for why this is OK.
   assert(prt != NULL, "Inv");
 
-  prt->add_reference(from, tid);
+  if (prt->should_expand(tid)) {
+    MutexLockerEx x(&_m, Mutex::_no_safepoint_check_flag);
+    HeapRegion* prt_hr = prt->hr();
+    if (prt_hr == from_hr) {
+      // Make sure the table still corresponds to the same region
+      prt->par_expand();
+      prt->add_reference(from, tid);
+    }
+    // else: The table has been concurrently coarsened, evicted, and
+    // the table data structure re-used for another table. So, we
+    // don't need to add the reference any more given that the table
+    // has been coarsened and the whole region will be scanned anyway.
+  } else {
+    prt->add_reference(from, tid);
+  }
   if (G1RecordHRRSOops) {
     HeapRegionRemSet::record(hr(), from);
 #if HRRS_VERBOSE
@@ -922,7 +929,7 @@
 }
 
 size_t OtherRegionsTable::occ_coarse() const {
-  return (_n_coarse_entries * PosParPRT::CardsPerRegion);
+  return (_n_coarse_entries * HeapRegion::CardsPerRegion);
 }
 
 size_t OtherRegionsTable::occ_sparse() const {
@@ -1049,7 +1056,8 @@
       uintptr_t(hr->bottom()) >> CardTableModRefBS::card_shift;
     assert(from_card >= hr_bot_card_index, "Inv");
     CardIdx_t card_index = from_card - hr_bot_card_index;
-    assert(0 <= card_index && card_index < PosParPRT::CardsPerRegion, "Must be in range.");
+    assert(0 <= card_index && card_index < HeapRegion::CardsPerRegion,
+           "Must be in range.");
     return _sparse_table.contains_card(hr_ind, card_index);
   }
 
@@ -1072,6 +1080,19 @@
 {}
 
 
+void HeapRegionRemSet::setup_remset_size() {
+  // Setup sparse and fine-grain tables sizes.
+  // table_size = base * (log(region_size / 1M) + 1)
+  int region_size_log_mb = MAX2((int)HeapRegion::LogOfHRGrainBytes - (int)LOG_M, 0);
+  if (FLAG_IS_DEFAULT(G1RSetSparseRegionEntries)) {
+    G1RSetSparseRegionEntries = G1RSetSparseRegionEntriesBase * (region_size_log_mb + 1);
+  }
+  if (FLAG_IS_DEFAULT(G1RSetRegionEntries)) {
+    G1RSetRegionEntries = G1RSetRegionEntriesBase * (region_size_log_mb + 1);
+  }
+  guarantee(G1RSetSparseRegionEntries > 0 && G1RSetRegionEntries > 0 , "Sanity");
+}
+
 void HeapRegionRemSet::init_for_par_iteration() {
   _iter_state = Unclaimed;
 }
@@ -1176,7 +1197,7 @@
   _is = Sparse;
   // Set these values so that we increment to the first region.
   _coarse_cur_region_index = -1;
-  _coarse_cur_region_cur_card = (PosParPRT::CardsPerRegion-1);;
+  _coarse_cur_region_cur_card = (HeapRegion::CardsPerRegion-1);;
 
   _cur_region_cur_card = 0;
 
@@ -1195,7 +1216,7 @@
   // Go to the next card.
   _coarse_cur_region_cur_card++;
   // Was the last the last card in the current region?
-  if (_coarse_cur_region_cur_card == PosParPRT::CardsPerRegion) {
+  if (_coarse_cur_region_cur_card == HeapRegion::CardsPerRegion) {
     // Yes: find the next region.  This may leave _coarse_cur_region_index
     // Set to the last index, in which case there are no more coarse
     // regions.
@@ -1232,7 +1253,7 @@
       _fine_cur_prt->_bm.get_next_one_offset(_cur_region_cur_card + 1);
   }
   while (!fine_has_next()) {
-    if (_cur_region_cur_card == PosParPRT::CardsPerRegion) {
+    if (_cur_region_cur_card == (size_t) HeapRegion::CardsPerRegion) {
       _cur_region_cur_card = 0;
       _fine_cur_prt = _fine_cur_prt->next();
     }
@@ -1255,7 +1276,7 @@
 bool HeapRegionRemSetIterator::fine_has_next() {
   return
     _fine_cur_prt != NULL &&
-    _cur_region_cur_card < PosParPRT::CardsPerRegion;
+    _cur_region_cur_card < (size_t) HeapRegion::CardsPerRegion;
 }
 
 bool HeapRegionRemSetIterator::has_next(size_t& card_index) {
@@ -1387,7 +1408,7 @@
   os::sleep(Thread::current(), (jlong)5000, false);
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
 
-  // Run with "-XX:G1LogRSRegionEntries=2", so that 1 and 5 end up in same
+  // Run with "-XX:G1LogRSetRegionEntries=2", so that 1 and 5 end up in same
   // hash bucket.
   HeapRegion* hr0 = g1h->region_at(0);
   HeapRegion* hr1 = g1h->region_at(1);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
--- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -187,7 +187,8 @@
   void clear_outgoing_entries();
 
   enum ParIterState { Unclaimed, Claimed, Complete };
-  ParIterState _iter_state;
+  volatile ParIterState _iter_state;
+  volatile jlong _iter_claimed;
 
   // Unused unless G1RecordHRRSOops is true.
 
@@ -209,6 +210,7 @@
                    HeapRegion* hr);
 
   static int num_par_rem_sets();
+  static void setup_remset_size();
 
   HeapRegion* hr() const {
     return _other_regions.hr();
@@ -272,6 +274,19 @@
   // Returns "true" iff the region's iteration is complete.
   bool iter_is_complete();
 
+  // Support for claiming blocks of cards during iteration
+  void set_iter_claimed(size_t x) { _iter_claimed = (jlong)x; }
+  size_t iter_claimed() const { return (size_t)_iter_claimed; }
+  // Claim the next block of cards
+  size_t iter_claimed_next(size_t step) {
+    size_t current, next;
+    do {
+      current = iter_claimed();
+      next = current + step;
+    } while (Atomic::cmpxchg((jlong)next, &_iter_claimed, (jlong)current) != (jlong)current);
+    return current;
+  }
+
   // Initialize the given iterator to iterate over this rem set.
   void init_iterator(HeapRegionRemSetIterator* iter) const;
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/heapRegionSeq.cpp
--- a/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -302,9 +302,9 @@
     if (cur->isHumongous()) {
       return MemRegion(last_start, end);
     }
-    cur->reset_zero_fill();
     assert(cur == _regions.top(), "Should be top");
     if (!cur->is_empty()) break;
+    cur->reset_zero_fill();
     shrink_bytes -= cur->capacity();
     num_regions_deleted++;
     _regions.pop();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/ptrQueue.cpp
--- a/src/share/vm/gc_implementation/g1/ptrQueue.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/ptrQueue.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -64,8 +64,8 @@
   while (_index == 0) {
     handle_zero_index();
   }
+
   assert(_index > 0, "postcondition");
-
   _index -= oopSize;
   _buf[byte_index_to_index((int)_index)] = ptr;
   assert(0 <= _index && _index <= _sz, "Invariant.");
@@ -73,7 +73,12 @@
 
 void PtrQueue::locking_enqueue_completed_buffer(void** buf) {
   assert(_lock->owned_by_self(), "Required.");
+
+  // We have to unlock _lock (which may be Shared_DirtyCardQ_lock) before
+  // we acquire DirtyCardQ_CBL_mon inside enqeue_complete_buffer as they
+  // have the same rank and we may get the "possible deadlock" message
   _lock->unlock();
+
   qset()->enqueue_complete_buffer(buf);
   // We must relock only because the caller will unlock, for the normal
   // case.
@@ -99,94 +104,139 @@
   assert(_sz > 0, "Didn't set a buffer size.");
   MutexLockerEx x(_fl_owner->_fl_lock, Mutex::_no_safepoint_check_flag);
   if (_fl_owner->_buf_free_list != NULL) {
-    void** res = _fl_owner->_buf_free_list;
-    _fl_owner->_buf_free_list = (void**)_fl_owner->_buf_free_list[0];
+    void** res = BufferNode::make_buffer_from_node(_fl_owner->_buf_free_list);
+    _fl_owner->_buf_free_list = _fl_owner->_buf_free_list->next();
     _fl_owner->_buf_free_list_sz--;
-    // Just override the next pointer with NULL, just in case we scan this part
-    // of the buffer.
-    res[0] = NULL;
     return res;
   } else {
-    return NEW_C_HEAP_ARRAY(void*, _sz);
+    // Allocate space for the BufferNode in front of the buffer.
+    char *b =  NEW_C_HEAP_ARRAY(char, _sz + BufferNode::aligned_size());
+    return BufferNode::make_buffer_from_block(b);
   }
 }
 
 void PtrQueueSet::deallocate_buffer(void** buf) {
   assert(_sz > 0, "Didn't set a buffer size.");
   MutexLockerEx x(_fl_owner->_fl_lock, Mutex::_no_safepoint_check_flag);
-  buf[0] = (void*)_fl_owner->_buf_free_list;
-  _fl_owner->_buf_free_list = buf;
+  BufferNode *node = BufferNode::make_node_from_buffer(buf);
+  node->set_next(_fl_owner->_buf_free_list);
+  _fl_owner->_buf_free_list = node;
   _fl_owner->_buf_free_list_sz++;
 }
 
 void PtrQueueSet::reduce_free_list() {
+  assert(_fl_owner == this, "Free list reduction is allowed only for the owner");
   // For now we'll adopt the strategy of deleting half.
   MutexLockerEx x(_fl_lock, Mutex::_no_safepoint_check_flag);
   size_t n = _buf_free_list_sz / 2;
   while (n > 0) {
     assert(_buf_free_list != NULL, "_buf_free_list_sz must be wrong.");
-    void** head = _buf_free_list;
-    _buf_free_list = (void**)_buf_free_list[0];
-    FREE_C_HEAP_ARRAY(void*,head);
+    void* b = BufferNode::make_block_from_node(_buf_free_list);
+    _buf_free_list = _buf_free_list->next();
+    FREE_C_HEAP_ARRAY(char, b);
+    _buf_free_list_sz --;
     n--;
   }
 }
 
-void PtrQueueSet::enqueue_complete_buffer(void** buf, size_t index, bool ignore_max_completed) {
-  // I use explicit locking here because there's a bailout in the middle.
-  _cbl_mon->lock_without_safepoint_check();
+void PtrQueue::handle_zero_index() {
+  assert(0 == _index, "Precondition.");
+  // This thread records the full buffer and allocates a new one (while
+  // holding the lock if there is one).
+  if (_buf != NULL) {
+    if (_lock) {
+      assert(_lock->owned_by_self(), "Required.");
+
+      // The current PtrQ may be the shared dirty card queue and
+      // may be being manipulated by more than one worker thread
+      // during a pause. Since the enqueuing of the completed
+      // buffer unlocks the Shared_DirtyCardQ_lock more than one
+      // worker thread can 'race' on reading the shared queue attributes
+      // (_buf and _index) and multiple threads can call into this
+      // routine for the same buffer. This will cause the completed
+      // buffer to be added to the CBL multiple times.
 
-  Thread* thread = Thread::current();
-  assert( ignore_max_completed ||
-          thread->is_Java_thread() ||
-          SafepointSynchronize::is_at_safepoint(),
-          "invariant" );
-  ignore_max_completed = ignore_max_completed || !thread->is_Java_thread();
+      // We "claim" the current buffer by caching value of _buf in
+      // a local and clearing the field while holding _lock. When
+      // _lock is released (while enqueueing the completed buffer)
+      // the thread that acquires _lock will skip this code,
+      // preventing the subsequent the multiple enqueue, and
+      // install a newly allocated buffer below.
+
+      void** buf = _buf;   // local pointer to completed buffer
+      _buf = NULL;         // clear shared _buf field
+
+      locking_enqueue_completed_buffer(buf);  // enqueue completed buffer
+
+      // While the current thread was enqueuing the buffer another thread
+      // may have a allocated a new buffer and inserted it into this pointer
+      // queue. If that happens then we just return so that the current
+      // thread doesn't overwrite the buffer allocated by the other thread
+      // and potentially losing some dirtied cards.
 
-  if (!ignore_max_completed && _max_completed_queue > 0 &&
-      _n_completed_buffers >= (size_t) _max_completed_queue) {
-    _cbl_mon->unlock();
-    bool b = mut_process_buffer(buf);
-    if (b) {
-      deallocate_buffer(buf);
-      return;
+      if (_buf != NULL) return;
+    } else {
+      if (qset()->process_or_enqueue_complete_buffer(_buf)) {
+        // Recycle the buffer. No allocation.
+        _sz = qset()->buffer_size();
+        _index = _sz;
+        return;
+      }
     }
+  }
+  // Reallocate the buffer
+  _buf = qset()->allocate_buffer();
+  _sz = qset()->buffer_size();
+  _index = _sz;
+  assert(0 <= _index && _index <= _sz, "Invariant.");
+}
 
-    // Otherwise, go ahead and enqueue the buffer.  Must reaquire the lock.
-    _cbl_mon->lock_without_safepoint_check();
+bool PtrQueueSet::process_or_enqueue_complete_buffer(void** buf) {
+  if (Thread::current()->is_Java_thread()) {
+    // We don't lock. It is fine to be epsilon-precise here.
+    if (_max_completed_queue == 0 || _max_completed_queue > 0 &&
+        _n_completed_buffers >= _max_completed_queue + _completed_queue_padding) {
+      bool b = mut_process_buffer(buf);
+      if (b) {
+        // True here means that the buffer hasn't been deallocated and the caller may reuse it.
+        return true;
+      }
+    }
   }
+  // The buffer will be enqueued. The caller will have to get a new one.
+  enqueue_complete_buffer(buf);
+  return false;
+}
 
-  // Here we still hold the _cbl_mon.
-  CompletedBufferNode* cbn = new CompletedBufferNode;
-  cbn->buf = buf;
-  cbn->next = NULL;
-  cbn->index = index;
+void PtrQueueSet::enqueue_complete_buffer(void** buf, size_t index) {
+  MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag);
+  BufferNode* cbn = BufferNode::new_from_buffer(buf);
+  cbn->set_index(index);
   if (_completed_buffers_tail == NULL) {
     assert(_completed_buffers_head == NULL, "Well-formedness");
     _completed_buffers_head = cbn;
     _completed_buffers_tail = cbn;
   } else {
-    _completed_buffers_tail->next = cbn;
+    _completed_buffers_tail->set_next(cbn);
     _completed_buffers_tail = cbn;
   }
   _n_completed_buffers++;
 
-  if (!_process_completed &&
+  if (!_process_completed && _process_completed_threshold >= 0 &&
       _n_completed_buffers >= _process_completed_threshold) {
     _process_completed = true;
     if (_notify_when_complete)
-      _cbl_mon->notify_all();
+      _cbl_mon->notify();
   }
   debug_only(assert_completed_buffer_list_len_correct_locked());
-  _cbl_mon->unlock();
 }
 
 int PtrQueueSet::completed_buffers_list_length() {
   int n = 0;
-  CompletedBufferNode* cbn = _completed_buffers_head;
+  BufferNode* cbn = _completed_buffers_head;
   while (cbn != NULL) {
     n++;
-    cbn = cbn->next;
+    cbn = cbn->next();
   }
   return n;
 }
@@ -197,7 +247,7 @@
 }
 
 void PtrQueueSet::assert_completed_buffer_list_len_correct_locked() {
-  guarantee((size_t)completed_buffers_list_length() ==  _n_completed_buffers,
+  guarantee(completed_buffers_list_length() ==  _n_completed_buffers,
             "Completed buffer length is wrong.");
 }
 
@@ -206,12 +256,8 @@
   _sz = sz * oopSize;
 }
 
-void PtrQueueSet::set_process_completed_threshold(size_t sz) {
-  _process_completed_threshold = sz;
-}
-
-// Merge lists of buffers. Notify waiting threads if the length of the list
-// exceeds threshold. The source queue is emptied as a result. The queues
+// Merge lists of buffers. Notify the processing threads.
+// The source queue is emptied as a result. The queues
 // must share the monitor.
 void PtrQueueSet::merge_bufferlists(PtrQueueSet *src) {
   assert(_cbl_mon == src->_cbl_mon, "Should share the same lock");
@@ -223,7 +269,7 @@
   } else {
     assert(_completed_buffers_head != NULL, "Well formedness");
     if (src->_completed_buffers_head != NULL) {
-      _completed_buffers_tail->next = src->_completed_buffers_head;
+      _completed_buffers_tail->set_next(src->_completed_buffers_head);
       _completed_buffers_tail = src->_completed_buffers_tail;
     }
   }
@@ -236,31 +282,13 @@
   assert(_completed_buffers_head == NULL && _completed_buffers_tail == NULL ||
          _completed_buffers_head != NULL && _completed_buffers_tail != NULL,
          "Sanity");
-
-  if (!_process_completed &&
-      _n_completed_buffers >= _process_completed_threshold) {
-    _process_completed = true;
-    if (_notify_when_complete)
-      _cbl_mon->notify_all();
-  }
 }
 
-// Merge free lists of the two queues. The free list of the source
-// queue is emptied as a result. The queues must share the same
-// mutex that guards free lists.
-void PtrQueueSet::merge_freelists(PtrQueueSet* src) {
-  assert(_fl_lock == src->_fl_lock, "Should share the same lock");
-  MutexLockerEx x(_fl_lock, Mutex::_no_safepoint_check_flag);
-  if (_buf_free_list != NULL) {
-    void **p = _buf_free_list;
-    while (*p != NULL) {
-      p = (void**)*p;
-    }
-    *p = src->_buf_free_list;
-  } else {
-    _buf_free_list = src->_buf_free_list;
+void PtrQueueSet::notify_if_necessary() {
+  MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag);
+  if (_n_completed_buffers >= _process_completed_threshold || _max_completed_queue == 0) {
+    _process_completed = true;
+    if (_notify_when_complete)
+      _cbl_mon->notify();
   }
-  _buf_free_list_sz += src->_buf_free_list_sz;
-  src->_buf_free_list = NULL;
-  src->_buf_free_list_sz = 0;
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/ptrQueue.hpp
--- a/src/share/vm/gc_implementation/g1/ptrQueue.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/ptrQueue.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -27,8 +27,10 @@
 // the addresses of modified old-generation objects.  This type supports
 // this operation.
 
+// The definition of placement operator new(size_t, void*) in the <new>.
+#include <new>
+
 class PtrQueueSet;
-
 class PtrQueue VALUE_OBJ_CLASS_SPEC {
 
 protected:
@@ -77,7 +79,7 @@
     else enqueue_known_active(ptr);
   }
 
-  inline void handle_zero_index();
+  void handle_zero_index();
   void locking_enqueue_completed_buffer(void** buf);
 
   void enqueue_known_active(void* ptr);
@@ -126,34 +128,65 @@
 
 };
 
+class BufferNode {
+  size_t _index;
+  BufferNode* _next;
+public:
+  BufferNode() : _index(0), _next(NULL) { }
+  BufferNode* next() const     { return _next;  }
+  void set_next(BufferNode* n) { _next = n;     }
+  size_t index() const         { return _index; }
+  void set_index(size_t i)     { _index = i;    }
+
+  // Align the size of the structure to the size of the pointer
+  static size_t aligned_size() {
+    static const size_t alignment = round_to(sizeof(BufferNode), sizeof(void*));
+    return alignment;
+  }
+
+  // BufferNode is allocated before the buffer.
+  // The chunk of memory that holds both of them is a block.
+
+  // Produce a new BufferNode given a buffer.
+  static BufferNode* new_from_buffer(void** buf) {
+    return new (make_block_from_buffer(buf)) BufferNode;
+  }
+
+  // The following are the required conversion routines:
+  static BufferNode* make_node_from_buffer(void** buf) {
+    return (BufferNode*)make_block_from_buffer(buf);
+  }
+  static void** make_buffer_from_node(BufferNode *node) {
+    return make_buffer_from_block(node);
+  }
+  static void* make_block_from_node(BufferNode *node) {
+    return (void*)node;
+  }
+  static void** make_buffer_from_block(void* p) {
+    return (void**)((char*)p + aligned_size());
+  }
+  static void* make_block_from_buffer(void** p) {
+    return (void*)((char*)p - aligned_size());
+  }
+};
+
 // A PtrQueueSet represents resources common to a set of pointer queues.
 // In particular, the individual queues allocate buffers from this shared
 // set, and return completed buffers to the set.
 // All these variables are are protected by the TLOQ_CBL_mon. XXX ???
 class PtrQueueSet VALUE_OBJ_CLASS_SPEC {
-
 protected:
-
-  class CompletedBufferNode: public CHeapObj {
-  public:
-    void** buf;
-    size_t index;
-    CompletedBufferNode* next;
-    CompletedBufferNode() : buf(NULL),
-      index(0), next(NULL){ }
-  };
-
   Monitor* _cbl_mon;  // Protects the fields below.
-  CompletedBufferNode* _completed_buffers_head;
-  CompletedBufferNode* _completed_buffers_tail;
-  size_t _n_completed_buffers;
-  size_t _process_completed_threshold;
+  BufferNode* _completed_buffers_head;
+  BufferNode* _completed_buffers_tail;
+  int _n_completed_buffers;
+  int _process_completed_threshold;
   volatile bool _process_completed;
 
   // This (and the interpretation of the first element as a "next"
   // pointer) are protected by the TLOQ_FL_lock.
   Mutex* _fl_lock;
-  void** _buf_free_list;
+  BufferNode* _buf_free_list;
   size_t _buf_free_list_sz;
   // Queue set can share a freelist. The _fl_owner variable
   // specifies the owner. It is set to "this" by default.
@@ -170,6 +203,7 @@
   // Maximum number of elements allowed on completed queue: after that,
   // enqueuer does the work itself.  Zero indicates no maximum.
   int _max_completed_queue;
+  int _completed_queue_padding;
 
   int completed_buffers_list_length();
   void assert_completed_buffer_list_len_correct_locked();
@@ -191,9 +225,12 @@
   // Because of init-order concerns, we can't pass these as constructor
   // arguments.
   void initialize(Monitor* cbl_mon, Mutex* fl_lock,
-                  int max_completed_queue = 0,
+                  int process_completed_threshold,
+                  int max_completed_queue,
                   PtrQueueSet *fl_owner = NULL) {
     _max_completed_queue = max_completed_queue;
+    _process_completed_threshold = process_completed_threshold;
+    _completed_queue_padding = 0;
     assert(cbl_mon != NULL && fl_lock != NULL, "Init order issue?");
     _cbl_mon = cbl_mon;
     _fl_lock = fl_lock;
@@ -208,14 +245,17 @@
   void deallocate_buffer(void** buf);
 
   // Declares that "buf" is a complete buffer.
-  void enqueue_complete_buffer(void** buf, size_t index = 0,
-                               bool ignore_max_completed = false);
+  void enqueue_complete_buffer(void** buf, size_t index = 0);
+
+  // To be invoked by the mutator.
+  bool process_or_enqueue_complete_buffer(void** buf);
 
   bool completed_buffers_exist_dirty() {
     return _n_completed_buffers > 0;
   }
 
   bool process_completed_buffers() { return _process_completed; }
+  void set_process_completed(bool x) { _process_completed = x; }
 
   bool active() { return _all_active; }
 
@@ -226,15 +266,24 @@
   // Get the buffer size.
   size_t buffer_size() { return _sz; }
 
-  // Set the number of completed buffers that triggers log processing.
-  void set_process_completed_threshold(size_t sz);
+  // Get/Set the number of completed buffers that triggers log processing.
+  void set_process_completed_threshold(int sz) { _process_completed_threshold = sz; }
+  int process_completed_threshold() const { return _process_completed_threshold; }
 
   // Must only be called at a safe point.  Indicates that the buffer free
   // list size may be reduced, if that is deemed desirable.
   void reduce_free_list();
 
-  size_t completed_buffers_num() { return _n_completed_buffers; }
+  int completed_buffers_num() { return _n_completed_buffers; }
 
   void merge_bufferlists(PtrQueueSet* src);
-  void merge_freelists(PtrQueueSet* src);
+
+  void set_max_completed_queue(int m) { _max_completed_queue = m; }
+  int max_completed_queue() { return _max_completed_queue; }
+
+  void set_completed_queue_padding(int padding) { _completed_queue_padding = padding; }
+  int completed_queue_padding() { return _completed_queue_padding; }
+
+  // Notify the consumer if the number of buffers crossed the threshold
+  void notify_if_necessary();
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/ptrQueue.inline.hpp
--- a/src/share/vm/gc_implementation/g1/ptrQueue.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * 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
- * 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.
- *
- */
-
-void PtrQueue::handle_zero_index() {
-  assert(0 == _index, "Precondition.");
-  // This thread records the full buffer and allocates a new one (while
-  // holding the lock if there is one).
-  void** buf = _buf;
-  _buf = qset()->allocate_buffer();
-  _sz = qset()->buffer_size();
-  _index = _sz;
-  assert(0 <= _index && _index <= _sz, "Invariant.");
-  if (buf != NULL) {
-    if (_lock) {
-      locking_enqueue_completed_buffer(buf);
-    } else {
-      qset()->enqueue_complete_buffer(buf);
-    }
-  }
-}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/satbQueue.cpp
--- a/src/share/vm/gc_implementation/g1/satbQueue.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/satbQueue.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -67,9 +67,9 @@
 {}
 
 void SATBMarkQueueSet::initialize(Monitor* cbl_mon, Mutex* fl_lock,
-                                  int max_completed_queue,
+                                  int process_completed_threshold,
                                   Mutex* lock) {
-  PtrQueueSet::initialize(cbl_mon, fl_lock, max_completed_queue);
+  PtrQueueSet::initialize(cbl_mon, fl_lock, process_completed_threshold, -1);
   _shared_satb_queue.set_lock(lock);
   if (ParallelGCThreads > 0) {
     _par_closures = NEW_C_HEAP_ARRAY(ObjectClosure*, ParallelGCThreads);
@@ -122,12 +122,12 @@
 
 bool SATBMarkQueueSet::apply_closure_to_completed_buffer_work(bool par,
                                                               int worker) {
-  CompletedBufferNode* nd = NULL;
+  BufferNode* nd = NULL;
   {
     MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag);
     if (_completed_buffers_head != NULL) {
       nd = _completed_buffers_head;
-      _completed_buffers_head = nd->next;
+      _completed_buffers_head = nd->next();
       if (_completed_buffers_head == NULL) _completed_buffers_tail = NULL;
       _n_completed_buffers--;
       if (_n_completed_buffers == 0) _process_completed = false;
@@ -135,9 +135,9 @@
   }
   ObjectClosure* cl = (par ? _par_closures[worker] : _closure);
   if (nd != NULL) {
-    ObjPtrQueue::apply_closure_to_buffer(cl, nd->buf, 0, _sz);
-    deallocate_buffer(nd->buf);
-    delete nd;
+    void **buf = BufferNode::make_buffer_from_node(nd);
+    ObjPtrQueue::apply_closure_to_buffer(cl, buf, 0, _sz);
+    deallocate_buffer(buf);
     return true;
   } else {
     return false;
@@ -145,13 +145,13 @@
 }
 
 void SATBMarkQueueSet::abandon_partial_marking() {
-  CompletedBufferNode* buffers_to_delete = NULL;
+  BufferNode* buffers_to_delete = NULL;
   {
     MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag);
     while (_completed_buffers_head != NULL) {
-      CompletedBufferNode* nd = _completed_buffers_head;
-      _completed_buffers_head = nd->next;
-      nd->next = buffers_to_delete;
+      BufferNode* nd = _completed_buffers_head;
+      _completed_buffers_head = nd->next();
+      nd->set_next(buffers_to_delete);
       buffers_to_delete = nd;
     }
     _completed_buffers_tail = NULL;
@@ -159,10 +159,9 @@
     DEBUG_ONLY(assert_completed_buffer_list_len_correct_locked());
   }
   while (buffers_to_delete != NULL) {
-    CompletedBufferNode* nd = buffers_to_delete;
-    buffers_to_delete = nd->next;
-    deallocate_buffer(nd->buf);
-    delete nd;
+    BufferNode* nd = buffers_to_delete;
+    buffers_to_delete = nd->next();
+    deallocate_buffer(BufferNode::make_buffer_from_node(nd));
   }
   assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint.");
   // So we can safely manipulate these queues.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/satbQueue.hpp
--- a/src/share/vm/gc_implementation/g1/satbQueue.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/satbQueue.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -60,8 +60,8 @@
   SATBMarkQueueSet();
 
   void initialize(Monitor* cbl_mon, Mutex* fl_lock,
-                  int max_completed_queue = 0,
-                  Mutex* lock = NULL);
+                  int process_completed_threshold,
+                  Mutex* lock);
 
   static void handle_zero_index_for_thread(JavaThread* t);
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/sparsePRT.cpp
--- a/src/share/vm/gc_implementation/g1/sparsePRT.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/sparsePRT.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -27,7 +27,7 @@
 
 #define SPARSE_PRT_VERBOSE 0
 
-#define UNROLL_CARD_LOOPS 1
+#define UNROLL_CARD_LOOPS  1
 
 void SparsePRT::init_iterator(SparsePRTIter* sprt_iter) {
     sprt_iter->init(this);
@@ -36,27 +36,32 @@
 void SparsePRTEntry::init(RegionIdx_t region_ind) {
   _region_ind = region_ind;
   _next_index = NullEntry;
+
 #if UNROLL_CARD_LOOPS
-  assert(CardsPerEntry == 4, "Assumption.  If changes, un-unroll.");
-  _cards[0] = NullEntry;
-  _cards[1] = NullEntry;
-  _cards[2] = NullEntry;
-  _cards[3] = NullEntry;
+  assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
+  for (int i = 0; i < cards_num(); i += UnrollFactor) {
+    _cards[i] = NullEntry;
+    _cards[i + 1] = NullEntry;
+    _cards[i + 2] = NullEntry;
+    _cards[i + 3] = NullEntry;
+  }
 #else
-  for (int i = 0; i < CardsPerEntry; i++)
+  for (int i = 0; i < cards_num(); i++)
     _cards[i] = NullEntry;
 #endif
 }
 
 bool SparsePRTEntry::contains_card(CardIdx_t card_index) const {
 #if UNROLL_CARD_LOOPS
-  assert(CardsPerEntry == 4, "Assumption.  If changes, un-unroll.");
-  if (_cards[0] == card_index) return true;
-  if (_cards[1] == card_index) return true;
-  if (_cards[2] == card_index) return true;
-  if (_cards[3] == card_index) return true;
+  assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
+  for (int i = 0; i < cards_num(); i += UnrollFactor) {
+    if (_cards[i] == card_index ||
+        _cards[i + 1] == card_index ||
+        _cards[i + 2] == card_index ||
+        _cards[i + 3] == card_index) return true;
+  }
 #else
-  for (int i = 0; i < CardsPerEntry; i++) {
+  for (int i = 0; i < cards_num(); i++) {
     if (_cards[i] == card_index) return true;
   }
 #endif
@@ -67,14 +72,16 @@
 int SparsePRTEntry::num_valid_cards() const {
   int sum = 0;
 #if UNROLL_CARD_LOOPS
-  assert(CardsPerEntry == 4, "Assumption.  If changes, un-unroll.");
-  if (_cards[0] != NullEntry) sum++;
-  if (_cards[1] != NullEntry) sum++;
-  if (_cards[2] != NullEntry) sum++;
-  if (_cards[3] != NullEntry) sum++;
+  assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
+  for (int i = 0; i < cards_num(); i += UnrollFactor) {
+    sum += (_cards[i] != NullEntry);
+    sum += (_cards[i + 1] != NullEntry);
+    sum += (_cards[i + 2] != NullEntry);
+    sum += (_cards[i + 3] != NullEntry);
+  }
 #else
-  for (int i = 0; i < CardsPerEntry; i++) {
-    if (_cards[i] != NulLEntry) sum++;
+  for (int i = 0; i < cards_num(); i++) {
+    sum += (_cards[i] != NullEntry);
   }
 #endif
   // Otherwise, we're full.
@@ -83,27 +90,27 @@
 
 SparsePRTEntry::AddCardResult SparsePRTEntry::add_card(CardIdx_t card_index) {
 #if UNROLL_CARD_LOOPS
-  assert(CardsPerEntry == 4, "Assumption.  If changes, un-unroll.");
-  CardIdx_t c = _cards[0];
-  if (c == card_index) return found;
-  if (c == NullEntry) { _cards[0] = card_index; return added; }
-  c = _cards[1];
-  if (c == card_index) return found;
-  if (c == NullEntry) { _cards[1] = card_index; return added; }
-  c = _cards[2];
-  if (c == card_index) return found;
-  if (c == NullEntry) { _cards[2] = card_index; return added; }
-  c = _cards[3];
-  if (c == card_index) return found;
-  if (c == NullEntry) { _cards[3] = card_index; return added; }
+  assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
+  CardIdx_t c;
+  for (int i = 0; i < cards_num(); i += UnrollFactor) {
+    c = _cards[i];
+    if (c == card_index) return found;
+    if (c == NullEntry) { _cards[i] = card_index; return added; }
+    c = _cards[i + 1];
+    if (c == card_index) return found;
+    if (c == NullEntry) { _cards[i + 1] = card_index; return added; }
+    c = _cards[i + 2];
+    if (c == card_index) return found;
+    if (c == NullEntry) { _cards[i + 2] = card_index; return added; }
+    c = _cards[i + 3];
+    if (c == card_index) return found;
+    if (c == NullEntry) { _cards[i + 3] = card_index; return added; }
+  }
 #else
-  for (int i = 0; i < CardsPerEntry; i++) {
+  for (int i = 0; i < cards_num(); i++) {
     CardIdx_t c = _cards[i];
     if (c == card_index) return found;
-    if (c == NullEntry) {
-      _cards[i] = card_index;
-      return added;
-    }
+    if (c == NullEntry) { _cards[i] = card_index; return added; }
   }
 #endif
   // Otherwise, we're full.
@@ -112,13 +119,15 @@
 
 void SparsePRTEntry::copy_cards(CardIdx_t* cards) const {
 #if UNROLL_CARD_LOOPS
-  assert(CardsPerEntry == 4, "Assumption.  If changes, un-unroll.");
-  cards[0] = _cards[0];
-  cards[1] = _cards[1];
-  cards[2] = _cards[2];
-  cards[3] = _cards[3];
+  assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
+  for (int i = 0; i < cards_num(); i += UnrollFactor) {
+    cards[i] = _cards[i];
+    cards[i + 1] = _cards[i + 1];
+    cards[i + 2] = _cards[i + 2];
+    cards[i + 3] = _cards[i + 3];
+  }
 #else
-  for (int i = 0; i < CardsPerEntry; i++) {
+  for (int i = 0; i < cards_num(); i++) {
     cards[i] = _cards[i];
   }
 #endif
@@ -133,9 +142,8 @@
 RSHashTable::RSHashTable(size_t capacity) :
   _capacity(capacity), _capacity_mask(capacity-1),
   _occupied_entries(0), _occupied_cards(0),
-  _entries(NEW_C_HEAP_ARRAY(SparsePRTEntry, capacity)),
+  _entries((SparsePRTEntry*)NEW_C_HEAP_ARRAY(char, SparsePRTEntry::size() * capacity)),
   _buckets(NEW_C_HEAP_ARRAY(int, capacity)),
-  _next_deleted(NULL), _deleted(false),
   _free_list(NullEntry), _free_region(0)
 {
   clear();
@@ -162,8 +170,8 @@
                 "_capacity too large");
 
   // This will put -1 == NullEntry in the key field of all entries.
-  memset(_entries, -1, _capacity * sizeof(SparsePRTEntry));
-  memset(_buckets, -1, _capacity * sizeof(int));
+  memset(_entries, NullEntry, _capacity * SparsePRTEntry::size());
+  memset(_buckets, NullEntry, _capacity * sizeof(int));
   _free_list = NullEntry;
   _free_region = 0;
 }
@@ -176,8 +184,8 @@
   if (res == SparsePRTEntry::added) _occupied_cards++;
 #if SPARSE_PRT_VERBOSE
   gclog_or_tty->print_cr("       after add_card[%d]: valid-cards = %d.",
-                pointer_delta(e, _entries, sizeof(SparsePRTEntry)),
-                e->num_valid_cards());
+                         pointer_delta(e, _entries, SparsePRTEntry::size()),
+                         e->num_valid_cards());
 #endif
   assert(e->num_valid_cards() > 0, "Postcondition");
   return res != SparsePRTEntry::overflow;
@@ -200,6 +208,22 @@
   return true;
 }
 
+SparsePRTEntry* RSHashTable::get_entry(RegionIdx_t region_ind) {
+  int ind = (int) (region_ind & capacity_mask());
+  int cur_ind = _buckets[ind];
+  SparsePRTEntry* cur;
+  while (cur_ind != NullEntry &&
+         (cur = entry(cur_ind))->r_ind() != region_ind) {
+    cur_ind = cur->next_index();
+  }
+
+  if (cur_ind == NullEntry) return NULL;
+  // Otherwise...
+  assert(cur->r_ind() == region_ind, "Postcondition of loop + test above.");
+  assert(cur->num_valid_cards() > 0, "Inv");
+  return cur;
+}
+
 bool RSHashTable::delete_entry(RegionIdx_t region_ind) {
   int ind = (int) (region_ind & capacity_mask());
   int* prev_loc = &_buckets[ind];
@@ -226,20 +250,8 @@
   int ind = (int) (region_ind & capacity_mask());
   int cur_ind = _buckets[ind];
   SparsePRTEntry* cur;
-  // XXX
-  // int k = 0;
   while (cur_ind != NullEntry &&
          (cur = entry(cur_ind))->r_ind() != region_ind) {
-    /*
-    k++;
-    if (k > 10) {
-      gclog_or_tty->print_cr("RSHashTable::entry_for_region_ind(%d): "
-                    "k = %d, cur_ind = %d.", region_ind, k, cur_ind);
-      if (k >= 1000) {
-        while (1) ;
-      }
-    }
-    */
     cur_ind = cur->next_index();
   }
 
@@ -296,40 +308,6 @@
   assert(e2->num_valid_cards() > 0, "Postcondition.");
 }
 
-RSHashTable* RSHashTable::_head_deleted_list = NULL;
-
-void RSHashTable::add_to_deleted_list(RSHashTable* rsht) {
-  assert(!rsht->deleted(), "Should delete only once.");
-  rsht->set_deleted(true);
-  RSHashTable* hd = _head_deleted_list;
-  while (true) {
-    rsht->_next_deleted = hd;
-    RSHashTable* res =
-      (RSHashTable*)
-      Atomic::cmpxchg_ptr(rsht, &_head_deleted_list, hd);
-    if (res == hd) return;
-    else hd = res;
-  }
-}
-
-RSHashTable* RSHashTable::get_from_deleted_list() {
-  RSHashTable* hd = _head_deleted_list;
-  while (hd != NULL) {
-    RSHashTable* next = hd->next_deleted();
-    RSHashTable* res =
-      (RSHashTable*)
-      Atomic::cmpxchg_ptr(next, &_head_deleted_list, hd);
-    if (res == hd) {
-      hd->set_next_deleted(NULL);
-      hd->set_deleted(false);
-      return hd;
-    } else {
-      hd = res;
-    }
-  }
-  return NULL;
-}
-
 CardIdx_t /* RSHashTable:: */ RSHashTableIter::find_first_card_in_list() {
   CardIdx_t res;
   while (_bl_ind != RSHashTable::NullEntry) {
@@ -347,14 +325,14 @@
 size_t /* RSHashTable:: */ RSHashTableIter::compute_card_ind(CardIdx_t ci) {
   return
     _heap_bot_card_ind
-    + (_rsht->entry(_bl_ind)->r_ind() * CardsPerRegion)
+    + (_rsht->entry(_bl_ind)->r_ind() * HeapRegion::CardsPerRegion)
     + ci;
 }
 
 bool /* RSHashTable:: */ RSHashTableIter::has_next(size_t& card_index) {
   _card_ind++;
   CardIdx_t ci;
-  if (_card_ind < SparsePRTEntry::CardsPerEntry &&
+  if (_card_ind < SparsePRTEntry::cards_num() &&
       ((ci = _rsht->entry(_bl_ind)->card(_card_ind)) !=
        SparsePRTEntry::NullEntry)) {
     card_index = compute_card_ind(ci);
@@ -394,7 +372,7 @@
 
 size_t RSHashTable::mem_size() const {
   return sizeof(this) +
-    capacity() * (sizeof(SparsePRTEntry) + sizeof(int));
+    capacity() * (SparsePRTEntry::size() + sizeof(int));
 }
 
 // ----------------------------------------------------------------------
@@ -442,15 +420,6 @@
     sprt->cleanup();
     sprt = get_from_expanded_list();
   }
-  // Now delete all deleted RSHashTables.
-  RSHashTable* rsht = RSHashTable::get_from_deleted_list();
-  while (rsht != NULL) {
-#if SPARSE_PRT_VERBOSE
-    gclog_or_tty->print_cr("About to delete RSHT " PTR_FORMAT ".", rsht);
-#endif
-    delete rsht;
-    rsht = RSHashTable::get_from_deleted_list();
-  }
 }
 
 
@@ -490,6 +459,10 @@
   return _next->get_cards(region_id, cards);
 }
 
+SparsePRTEntry* SparsePRT::get_entry(RegionIdx_t region_id) {
+  return _next->get_entry(region_id);
+}
+
 bool SparsePRT::delete_entry(RegionIdx_t region_id) {
   return _next->delete_entry(region_id);
 }
@@ -511,8 +484,10 @@
 }
 
 void SparsePRT::cleanup() {
-  // Make sure that the current and next tables agree.  (Another mechanism
-  // takes care of deleting now-unused tables.)
+  // Make sure that the current and next tables agree.
+  if (_cur != _next) {
+    delete _cur;
+  }
   _cur = _next;
   set_expanded(false);
 }
@@ -535,7 +510,8 @@
       _next->add_entry(e);
     }
   }
-  if (last != _cur)
-    RSHashTable::add_to_deleted_list(last);
+  if (last != _cur) {
+    delete last;
+  }
   add_to_expanded_list(this);
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/sparsePRT.hpp
--- a/src/share/vm/gc_implementation/g1/sparsePRT.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/sparsePRT.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -32,21 +32,28 @@
 // insertions only enqueue old versions for deletions, but do not delete
 // old versions synchronously.
 
-
 class SparsePRTEntry: public CHeapObj {
 public:
-
   enum SomePublicConstants {
-    CardsPerEntry =  4,
-    NullEntry     = -1
+    NullEntry     = -1,
+    UnrollFactor  =  4
   };
-
 private:
   RegionIdx_t _region_ind;
   int         _next_index;
-  CardIdx_t   _cards[CardsPerEntry];
-
+  CardIdx_t   _cards[1];
+  // WARNING: Don't put any data members beyond this line. Card array has, in fact, variable length.
+  // It should always be the last data member.
 public:
+  // Returns the size of the entry, used for entry allocation.
+  static size_t size() { return sizeof(SparsePRTEntry) + sizeof(CardIdx_t) * (cards_num() - 1); }
+  // Returns the size of the card array.
+  static int cards_num() {
+    // The number of cards should be a multiple of 4, because that's our current
+    // unrolling factor.
+    static const int s = MAX2<int>(G1RSetSparseRegionEntries & ~(UnrollFactor - 1), UnrollFactor);
+    return s;
+  }
 
   // Set the region_ind to the given value, and delete all cards.
   inline void init(RegionIdx_t region_ind);
@@ -102,13 +109,6 @@
   int  _free_region;
   int  _free_list;
 
-  static RSHashTable* _head_deleted_list;
-  RSHashTable* _next_deleted;
-  RSHashTable* next_deleted() { return _next_deleted; }
-  void set_next_deleted(RSHashTable* rsht) { _next_deleted = rsht; }
-  bool _deleted;
-  void set_deleted(bool b) { _deleted = b; }
-
   // Requires that the caller hold a lock preventing parallel modifying
   // operations, and that the the table be less than completely full.  If
   // an entry for "region_ind" is already in the table, finds it and
@@ -141,12 +141,15 @@
   bool add_card(RegionIdx_t region_id, CardIdx_t card_index);
 
   bool get_cards(RegionIdx_t region_id, CardIdx_t* cards);
+
   bool delete_entry(RegionIdx_t region_id);
 
   bool contains_card(RegionIdx_t region_id, CardIdx_t card_index) const;
 
   void add_entry(SparsePRTEntry* e);
 
+  SparsePRTEntry* get_entry(RegionIdx_t region_id);
+
   void clear();
 
   size_t capacity() const      { return _capacity;       }
@@ -154,28 +157,20 @@
   size_t occupied_entries() const { return _occupied_entries; }
   size_t occupied_cards() const   { return _occupied_cards;   }
   size_t mem_size() const;
-  bool deleted() { return _deleted; }
 
-  SparsePRTEntry* entry(int i) const { return &_entries[i]; }
+  SparsePRTEntry* entry(int i) const { return (SparsePRTEntry*)((char*)_entries + SparsePRTEntry::size() * i); }
 
   void print();
-
-  static void add_to_deleted_list(RSHashTable* rsht);
-  static RSHashTable* get_from_deleted_list();
 };
 
 // ValueObj because will be embedded in HRRS iterator.
 class RSHashTableIter VALUE_OBJ_CLASS_SPEC {
   int _tbl_ind;         // [-1, 0.._rsht->_capacity)
   int _bl_ind;          // [-1, 0.._rsht->_capacity)
-  short _card_ind;      // [0..CardsPerEntry)
+  short _card_ind;      // [0..SparsePRTEntry::cards_num())
   RSHashTable* _rsht;
   size_t _heap_bot_card_ind;
 
-  enum SomePrivateConstants {
-    CardsPerRegion = HeapRegion::GrainBytes >> CardTableModRefBS::card_shift
-  };
-
   // If the bucket list pointed to by _bl_ind contains a card, sets
   // _bl_ind to the index of that entry, and returns the card.
   // Otherwise, returns SparseEntry::NullEntry.
@@ -191,7 +186,7 @@
   RSHashTableIter(size_t heap_bot_card_ind) :
     _tbl_ind(RSHashTable::NullEntry),
     _bl_ind(RSHashTable::NullEntry),
-    _card_ind((SparsePRTEntry::CardsPerEntry-1)),
+    _card_ind((SparsePRTEntry::cards_num() - 1)),
     _rsht(NULL),
     _heap_bot_card_ind(heap_bot_card_ind)
   {}
@@ -200,7 +195,7 @@
     _rsht = rsht;
     _tbl_ind = -1; // So that first increment gets to 0.
     _bl_ind = RSHashTable::NullEntry;
-    _card_ind = (SparsePRTEntry::CardsPerEntry-1);
+    _card_ind = (SparsePRTEntry::cards_num() - 1);
   }
 
   bool has_next(size_t& card_index);
@@ -256,9 +251,13 @@
 
   // If the table hold an entry for "region_ind",  Copies its
   // cards into "cards", which must be an array of length at least
-  // "CardsPerEntry", and returns "true"; otherwise, returns "false".
+  // "SparePRTEntry::cards_num()", and returns "true"; otherwise,
+  // returns "false".
   bool get_cards(RegionIdx_t region_ind, CardIdx_t* cards);
 
+  // Return the pointer to the entry associated with the given region.
+  SparsePRTEntry* get_entry(RegionIdx_t region_ind);
+
   // If there is an entry for "region_ind", removes it and return "true";
   // otherwise returns "false."
   bool delete_entry(RegionIdx_t region_ind);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
--- a/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -42,7 +42,7 @@
 void VM_G1IncCollectionPause::doit() {
   JvmtiGCForAllocationMarker jgcm;
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
-  GCCauseSetter x(g1h, GCCause::_g1_inc_collection_pause);
+  GCCauseSetter x(g1h, _gc_cause);
   g1h->do_collection_pause_at_safepoint();
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/g1/vm_operations_g1.hpp
--- a/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -68,8 +68,9 @@
 
 class VM_G1IncCollectionPause: public VM_GC_Operation {
  public:
-  VM_G1IncCollectionPause(int gc_count_before) :
-    VM_GC_Operation(gc_count_before) {}
+  VM_G1IncCollectionPause(int gc_count_before,
+                          GCCause::Cause gc_cause = GCCause::_g1_inc_collection_pause) :
+    VM_GC_Operation(gc_count_before) { _gc_cause = gc_cause; }
   virtual VMOp_Type type() const { return VMOp_G1IncCollectionPause; }
   virtual void doit();
   virtual const char* name() const {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
--- a/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	Thu Mar 25 16:54:59 2010 -0700
@@ -145,6 +145,7 @@
 concurrentMarkSweepGeneration.cpp       globals_extension.hpp
 concurrentMarkSweepGeneration.cpp       handles.inline.hpp
 concurrentMarkSweepGeneration.cpp       isGCActiveMark.hpp
+concurrentMarkSweepGeneration.cpp       iterator.hpp
 concurrentMarkSweepGeneration.cpp       java.hpp
 concurrentMarkSweepGeneration.cpp       jvmtiExport.hpp
 concurrentMarkSweepGeneration.cpp       oop.inline.hpp
@@ -220,6 +221,7 @@
 freeList.cpp                            globals.hpp
 freeList.cpp                            mutex.hpp
 freeList.cpp                            sharedHeap.hpp
+freeList.cpp                            vmThread.hpp
 
 freeList.hpp                            allocationStats.hpp
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/includeDB_gc_g1
--- a/src/share/vm/gc_implementation/includeDB_gc_g1	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/includeDB_gc_g1	Thu Mar 25 16:54:59 2010 -0700
@@ -64,14 +64,12 @@
 concurrentG1RefineThread.cpp		resourceArea.hpp
 
 concurrentG1RefineThread.hpp		concurrentGCThread.hpp
-concurrentG1RefineThread.hpp		coTracker.hpp
 
 concurrentMark.cpp			concurrentMark.hpp
 concurrentMark.cpp			concurrentMarkThread.inline.hpp
 concurrentMark.cpp			g1CollectedHeap.inline.hpp
 concurrentMark.cpp                      g1CollectorPolicy.hpp
 concurrentMark.cpp                      g1RemSet.hpp
-concurrentMark.cpp		        gcOverheadReporter.hpp
 concurrentMark.cpp		        genOopClosures.inline.hpp
 concurrentMark.cpp                      heapRegionRemSet.hpp
 concurrentMark.cpp                      heapRegionSeq.inline.hpp
@@ -82,7 +80,6 @@
 concurrentMark.cpp			resourceArea.hpp
 concurrentMark.cpp			symbolTable.hpp
 
-concurrentMark.hpp			coTracker.hpp
 concurrentMark.hpp			heapRegion.hpp
 concurrentMark.hpp			taskqueue.hpp
 
@@ -107,13 +104,11 @@
 concurrentZFThread.cpp			space.inline.hpp
 
 concurrentZFThread.hpp			concurrentGCThread.hpp
-concurrentZFThread.hpp			coTracker.hpp
 
 dirtyCardQueue.cpp                      atomic.hpp
 dirtyCardQueue.cpp                      dirtyCardQueue.hpp
 dirtyCardQueue.cpp			heapRegionRemSet.hpp
 dirtyCardQueue.cpp                      mutexLocker.hpp
-dirtyCardQueue.cpp                      ptrQueue.inline.hpp
 dirtyCardQueue.cpp                      safepoint.hpp
 dirtyCardQueue.cpp                      thread.hpp
 dirtyCardQueue.cpp                      thread_<os_family>.inline.hpp
@@ -147,7 +142,6 @@
 g1CollectedHeap.cpp                     g1OopClosures.inline.hpp
 g1CollectedHeap.cpp                     genOopClosures.inline.hpp
 g1CollectedHeap.cpp                     gcLocker.inline.hpp
-g1CollectedHeap.cpp                     gcOverheadReporter.hpp
 g1CollectedHeap.cpp                     generationSpec.hpp
 g1CollectedHeap.cpp                     heapRegionRemSet.hpp
 g1CollectedHeap.cpp                     heapRegionSeq.inline.hpp
@@ -170,6 +164,7 @@
 g1CollectedHeap.inline.hpp              heapRegionSeq.hpp
 g1CollectedHeap.inline.hpp		taskqueue.hpp
 
+g1CollectorPolicy.cpp			arguments.hpp
 g1CollectorPolicy.cpp			concurrentG1Refine.hpp
 g1CollectorPolicy.cpp			concurrentMark.hpp
 g1CollectorPolicy.cpp			concurrentMarkThread.inline.hpp
@@ -226,6 +221,15 @@
 g1MarkSweep.hpp                         timer.hpp
 g1MarkSweep.hpp                         universe.hpp
 
+g1MemoryPool.cpp                        heapRegion.hpp
+g1MemoryPool.cpp                        g1CollectedHeap.inline.hpp
+g1MemoryPool.cpp                        g1CollectedHeap.hpp
+g1MemoryPool.cpp                        g1CollectorPolicy.hpp
+g1MemoryPool.cpp                        g1MemoryPool.hpp
+
+g1MemoryPool.hpp                        memoryUsage.hpp
+g1MemoryPool.hpp                        memoryPool.hpp
+
 g1OopClosures.inline.hpp		concurrentMark.hpp
 g1OopClosures.inline.hpp		g1OopClosures.hpp
 g1OopClosures.inline.hpp		g1CollectedHeap.hpp
@@ -307,12 +311,13 @@
 
 klass.hpp				g1OopClosures.hpp
 
+memoryService.cpp                       g1MemoryPool.hpp
+
 ptrQueue.cpp                            allocation.hpp
 ptrQueue.cpp                            allocation.inline.hpp
 ptrQueue.cpp                            mutex.hpp
 ptrQueue.cpp                            mutexLocker.hpp
 ptrQueue.cpp                            ptrQueue.hpp
-ptrQueue.cpp                            ptrQueue.inline.hpp
 ptrQueue.cpp                            thread_<os_family>.inline.hpp
 
 ptrQueue.hpp                            allocation.hpp
@@ -322,7 +327,6 @@
 
 satbQueue.cpp                           allocation.inline.hpp
 satbQueue.cpp                           mutexLocker.hpp
-satbQueue.cpp                           ptrQueue.inline.hpp
 satbQueue.cpp                           satbQueue.hpp
 satbQueue.cpp                           sharedHeap.hpp
 satbQueue.cpp                           thread.hpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
--- a/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	Thu Mar 25 16:54:59 2010 -0700
@@ -253,10 +253,11 @@
 psParallelCompact.cpp			gcLocker.inline.hpp
 psParallelCompact.cpp                   gcTaskManager.hpp
 psParallelCompact.cpp			isGCActiveMark.hpp
+psParallelCompact.cpp			management.hpp
+psParallelCompact.cpp			memoryService.hpp
+psParallelCompact.cpp			methodDataOop.hpp
 psParallelCompact.cpp			oop.inline.hpp
 psParallelCompact.cpp			oop.pcgc.inline.hpp
-psParallelCompact.cpp			memoryService.hpp
-psParallelCompact.cpp			management.hpp
 psParallelCompact.cpp			parallelScavengeHeap.inline.hpp
 psParallelCompact.cpp			pcTasks.hpp
 psParallelCompact.cpp			psMarkSweep.hpp
@@ -372,6 +373,7 @@
 psScavenge.inline.hpp                   psPromotionManager.hpp
 psScavenge.inline.hpp                   psScavenge.hpp
 
+pcTasks.cpp                             codeCache.hpp
 pcTasks.cpp                             collectedHeap.hpp
 pcTasks.cpp                             fprofiler.hpp
 pcTasks.cpp                             jniHandles.hpp
@@ -391,6 +393,7 @@
 pcTasks.hpp				psTasks.hpp
 
 psTasks.cpp                             cardTableExtension.hpp
+psTasks.cpp                             codeCache.hpp
 psTasks.cpp                             fprofiler.hpp
 psTasks.cpp                             gcTaskManager.hpp
 psTasks.cpp                             iterator.hpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/includeDB_gc_serial
--- a/src/share/vm/gc_implementation/includeDB_gc_serial	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/includeDB_gc_serial	Thu Mar 25 16:54:59 2010 -0700
@@ -71,6 +71,7 @@
 gcUtil.hpp                              allocation.hpp
 gcUtil.hpp                              debug.hpp
 gcUtil.hpp                              globalDefinitions.hpp
+gcUtil.hpp                              ostream.hpp
 gcUtil.hpp				timer.hpp
 
 generationCounters.cpp                  generationCounters.hpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/includeDB_gc_shared
--- a/src/share/vm/gc_implementation/includeDB_gc_shared	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/includeDB_gc_shared	Thu Mar 25 16:54:59 2010 -0700
@@ -35,12 +35,6 @@
 
 concurrentGCThread.hpp                  thread.hpp
 
-coTracker.hpp                           globalDefinitions.hpp
-coTracker.hpp                           numberSeq.hpp
-
-coTracker.cpp                           coTracker.hpp
-coTracker.cpp                           os.hpp
-
 allocationStats.cpp                     allocationStats.hpp
 allocationStats.cpp                     ostream.hpp
 
@@ -54,13 +48,6 @@
 gcAdaptivePolicyCounters.cpp            resourceArea.hpp
 gcAdaptivePolicyCounters.cpp            gcAdaptivePolicyCounters.hpp
 
-gcOverheadReporter.cpp                  allocation.inline.hpp
-gcOverheadReporter.cpp                  concurrentGCThread.hpp
-gcOverheadReporter.cpp                  coTracker.hpp
-gcOverheadReporter.cpp                  gcOverheadReporter.hpp
-gcOverheadReporter.cpp                  ostream.hpp
-gcOverheadReporter.cpp                  thread_<os_family>.inline.hpp
-
 gSpaceCounters.cpp                      generation.hpp
 gSpaceCounters.cpp                      resourceArea.hpp
 gSpaceCounters.cpp                      gSpaceCounters.hpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
--- a/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -50,6 +50,7 @@
                       work_queue_set_, &term_),
   _is_alive_closure(gen_), _scan_weak_ref_closure(gen_, this),
   _keep_alive_closure(&_scan_weak_ref_closure),
+  _promotion_failure_size(0),
   _pushes(0), _pops(0), _steals(0), _steal_attempts(0), _term_attempts(0),
   _strong_roots_time(0.0), _term_time(0.0)
 {
@@ -249,6 +250,16 @@
   }
 }
 
+void ParScanThreadState::print_and_clear_promotion_failure_size() {
+  if (_promotion_failure_size != 0) {
+    if (PrintPromotionFailure) {
+      gclog_or_tty->print(" (%d: promotion failure size = " SIZE_FORMAT ") ",
+        _thread_num, _promotion_failure_size);
+    }
+    _promotion_failure_size = 0;
+  }
+}
+
 class ParScanThreadStateSet: private ResourceArray {
 public:
   // Initializes states for the specified number of threads;
@@ -260,11 +271,11 @@
                         GrowableArray<oop>**    overflow_stacks_,
                         size_t                  desired_plab_sz,
                         ParallelTaskTerminator& term);
-  inline ParScanThreadState& thread_sate(int i);
+  inline ParScanThreadState& thread_state(int i);
   int pushes() { return _pushes; }
   int pops()   { return _pops; }
   int steals() { return _steals; }
-  void reset();
+  void reset(bool promotion_failed);
   void flush();
 private:
   ParallelTaskTerminator& _term;
@@ -295,22 +306,31 @@
   }
 }
 
-inline ParScanThreadState& ParScanThreadStateSet::thread_sate(int i)
+inline ParScanThreadState& ParScanThreadStateSet::thread_state(int i)
 {
   assert(i >= 0 && i < length(), "sanity check!");
   return ((ParScanThreadState*)_data)[i];
 }
 
 
-void ParScanThreadStateSet::reset()
+void ParScanThreadStateSet::reset(bool promotion_failed)
 {
   _term.reset_for_reuse();
+  if (promotion_failed) {
+    for (int i = 0; i < length(); ++i) {
+      thread_state(i).print_and_clear_promotion_failure_size();
+    }
+  }
 }
 
 void ParScanThreadStateSet::flush()
 {
+  // Work in this loop should be kept as lightweight as
+  // possible since this might otherwise become a bottleneck
+  // to scaling. Should we add heavy-weight work into this
+  // loop, consider parallelizing the loop into the worker threads.
   for (int i = 0; i < length(); ++i) {
-    ParScanThreadState& par_scan_state = thread_sate(i);
+    ParScanThreadState& par_scan_state = thread_state(i);
 
     // Flush stats related to To-space PLAB activity and
     // retire the last buffer.
@@ -362,6 +382,14 @@
       }
     }
   }
+  if (UseConcMarkSweepGC && ParallelGCThreads > 0) {
+    // We need to call this even when ResizeOldPLAB is disabled
+    // so as to avoid breaking some asserts. While we may be able
+    // to avoid this by reorganizing the code a bit, I am loathe
+    // to do that unless we find cases where ergo leads to bad
+    // performance.
+    CFLS_LAB::compute_desired_plab_size();
+  }
 }
 
 ParScanClosure::ParScanClosure(ParNewGeneration* g,
@@ -475,17 +503,19 @@
 
   Generation* old_gen = gch->next_gen(_gen);
 
-  ParScanThreadState& par_scan_state = _state_set->thread_sate(i);
+  ParScanThreadState& par_scan_state = _state_set->thread_state(i);
   par_scan_state.set_young_old_boundary(_young_old_boundary);
 
   par_scan_state.start_strong_roots();
   gch->gen_process_strong_roots(_gen->level(),
-                                true, // Process younger gens, if any,
-                                      // as strong roots.
-                                false,// not collecting perm generation.
+                                true,  // Process younger gens, if any,
+                                       // as strong roots.
+                                false, // no scope; this is parallel code
+                                false, // not collecting perm generation.
                                 SharedHeap::SO_AllClasses,
-                                &par_scan_state.older_gen_closure(),
-                                &par_scan_state.to_space_root_closure());
+                                &par_scan_state.to_space_root_closure(),
+                                true,   // walk *all* scavengable nmethods
+                                &par_scan_state.older_gen_closure());
   par_scan_state.end_strong_roots();
 
   // "evacuate followers".
@@ -657,7 +687,7 @@
 {
   ResourceMark rm;
   HandleMark hm;
-  ParScanThreadState& par_scan_state = _state_set.thread_sate(i);
+  ParScanThreadState& par_scan_state = _state_set.thread_state(i);
   par_scan_state.set_young_old_boundary(_young_old_boundary);
   _task.work(i, par_scan_state.is_alive_closure(),
              par_scan_state.keep_alive_closure(),
@@ -691,7 +721,7 @@
   ParNewRefProcTaskProxy rp_task(task, _generation, *_generation.next_gen(),
                                  _generation.reserved().end(), _state_set);
   workers->run_task(&rp_task);
-  _state_set.reset();
+  _state_set.reset(_generation.promotion_failed());
 }
 
 void ParNewRefProcTaskExecutor::execute(EnqueueTask& task)
@@ -799,18 +829,19 @@
   ParNewGenTask tsk(this, _next_gen, reserved().end(), &thread_state_set);
   int n_workers = workers->total_workers();
   gch->set_par_threads(n_workers);
-  gch->change_strong_roots_parity();
   gch->rem_set()->prepare_for_younger_refs_iterate(true);
   // It turns out that even when we're using 1 thread, doing the work in a
   // separate thread causes wide variance in run times.  We can't help this
   // in the multi-threaded case, but we special-case n=1 here to get
   // repeatable measurements of the 1-thread overhead of the parallel code.
   if (n_workers > 1) {
+    GenCollectedHeap::StrongRootsScope srs(gch);
     workers->run_task(&tsk);
   } else {
+    GenCollectedHeap::StrongRootsScope srs(gch);
     tsk.work(0);
   }
-  thread_state_set.reset();
+  thread_state_set.reset(promotion_failed());
 
   if (PAR_STATS_ENABLED && ParallelGCVerbose) {
     gclog_or_tty->print("Thread totals:\n"
@@ -879,6 +910,8 @@
     swap_spaces();  // Make life simpler for CMS || rescan; see 6483690.
     from()->set_next_compaction_space(to());
     gch->set_incremental_collection_will_fail();
+    // Inform the next generation that a promotion failure occurred.
+    _next_gen->promotion_failure_occurred();
 
     // Reset the PromotionFailureALot counters.
     NOT_PRODUCT(Universe::heap()->reset_promotion_should_fail();)
@@ -1026,6 +1059,8 @@
       new_obj = old;
 
       preserve_mark_if_necessary(old, m);
+      // Log the size of the maiden promotion failure
+      par_scan_state->log_promotion_failure(sz);
     }
 
     old->forward_to(new_obj);
@@ -1147,6 +1182,8 @@
       failed_to_promote = true;
 
       preserve_mark_if_necessary(old, m);
+      // Log the size of the maiden promotion failure
+      par_scan_state->log_promotion_failure(sz);
     }
   } else {
     // Is in to-space; do copying ourselves.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parNew/parNewGeneration.hpp
--- a/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -97,6 +97,9 @@
   int _pushes, _pops, _steals, _steal_attempts, _term_attempts;
   int _overflow_pushes, _overflow_refills, _overflow_refill_objs;
 
+  // Stats for promotion failure
+  size_t _promotion_failure_size;
+
   // Timing numbers.
   double _start;
   double _start_strong_roots;
@@ -169,6 +172,15 @@
   // Undo the most recent allocation ("obj", of "word_sz").
   void undo_alloc_in_to_space(HeapWord* obj, size_t word_sz);
 
+  // Promotion failure stats
+  size_t promotion_failure_size() { return promotion_failure_size(); }
+  void log_promotion_failure(size_t sz) {
+    if (_promotion_failure_size == 0) {
+      _promotion_failure_size = sz;
+    }
+  }
+  void print_and_clear_promotion_failure_size();
+
   int pushes() { return _pushes; }
   int pops()   { return _pops; }
   int steals() { return _steals; }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -51,6 +51,8 @@
 }
 
 jint ParallelScavengeHeap::initialize() {
+  CollectedHeap::pre_initialize();
+
   // Cannot be initialized until after the flags are parsed
   GenerationSizer flag_parser;
 
@@ -314,41 +316,6 @@
   return false;
 }
 
-// Static method
-bool ParallelScavengeHeap::is_in_young(oop* p) {
-  ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
-  assert(heap->kind() == CollectedHeap::ParallelScavengeHeap,
-                                            "Must be ParallelScavengeHeap");
-
-  PSYoungGen* young_gen = heap->young_gen();
-
-  if (young_gen->is_in_reserved(p)) {
-    return true;
-  }
-
-  return false;
-}
-
-// Static method
-bool ParallelScavengeHeap::is_in_old_or_perm(oop* p) {
-  ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
-  assert(heap->kind() == CollectedHeap::ParallelScavengeHeap,
-                                            "Must be ParallelScavengeHeap");
-
-  PSOldGen* old_gen = heap->old_gen();
-  PSPermGen* perm_gen = heap->perm_gen();
-
-  if (old_gen->is_in_reserved(p)) {
-    return true;
-  }
-
-  if (perm_gen->is_in_reserved(p)) {
-    return true;
-  }
-
-  return false;
-}
-
 // There are two levels of allocation policy here.
 //
 // When an allocation request fails, the requesting thread must invoke a VM
@@ -752,10 +719,6 @@
   return young_gen()->allocate(size, true);
 }
 
-void ParallelScavengeHeap::fill_all_tlabs(bool retire) {
-  CollectedHeap::fill_all_tlabs(retire);
-}
-
 void ParallelScavengeHeap::accumulate_statistics_all_tlabs() {
   CollectedHeap::accumulate_statistics_all_tlabs();
 }
@@ -764,6 +727,13 @@
   CollectedHeap::resize_all_tlabs();
 }
 
+bool ParallelScavengeHeap::can_elide_initializing_store_barrier(oop new_obj) {
+  // We don't need barriers for stores to objects in the
+  // young gen and, a fortiori, for initializing stores to
+  // objects therein.
+  return is_in_young(new_obj);
+}
+
 // This method is used by System.gc() and JVMTI.
 void ParallelScavengeHeap::collect(GCCause::Cause cause) {
   assert(!Heap_lock->owned_by_self(),
@@ -962,6 +932,14 @@
   _old_gen->resize(desired_free_space);
 }
 
+ParallelScavengeHeap::ParStrongRootsScope::ParStrongRootsScope() {
+  // nothing particular
+}
+
+ParallelScavengeHeap::ParStrongRootsScope::~ParStrongRootsScope() {
+  // nothing particular
+}
+
 #ifndef PRODUCT
 void ParallelScavengeHeap::record_gen_tops_before_GC() {
   if (ZapUnusedHeapArea) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -54,7 +54,6 @@
  protected:
   static inline size_t total_invocations();
   HeapWord* allocate_new_tlab(size_t size);
-  void fill_all_tlabs(bool retire);
 
  public:
   ParallelScavengeHeap() : CollectedHeap() {
@@ -129,8 +128,8 @@
     return perm_gen()->is_in(p);
   }
 
-  static bool is_in_young(oop *p);        // reserved part
-  static bool is_in_old_or_perm(oop *p);  // reserved part
+  inline bool is_in_young(oop p);        // reserved part
+  inline bool is_in_old_or_perm(oop p);  // reserved part
 
   // Memory allocation.   "gc_time_limit_was_exceeded" will
   // be set to true if the adaptive size policy determine that
@@ -191,6 +190,14 @@
     return true;
   }
 
+  virtual bool card_mark_must_follow_store() const {
+    return false;
+  }
+
+  // Return true if we don't we need a store barrier for
+  // initializing stores to an object at this address.
+  virtual bool can_elide_initializing_store_barrier(oop new_obj);
+
   // Can a compiler elide a store barrier when it writes
   // a permanent oop into the heap?  Applies when the compiler
   // is storing x to the heap, where x->is_perm() is true.
@@ -234,6 +241,13 @@
 
   // Mangle the unused parts of all spaces in the heap
   void gen_mangle_unused_area() PRODUCT_RETURN;
+
+  // Call these in sequential code around the processing of strong roots.
+  class ParStrongRootsScope : public MarkingCodeBlobClosure::MarkScope {
+  public:
+    ParStrongRootsScope();
+    ~ParStrongRootsScope();
+  };
 };
 
 inline size_t ParallelScavengeHeap::set_alignment(size_t& var, size_t val)
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -41,3 +41,11 @@
     PSMarkSweep::invoke(maximum_compaction);
   }
 }
+
+inline bool ParallelScavengeHeap::is_in_young(oop p) {
+  return young_gen()->is_in_reserved(p);
+}
+
+inline bool ParallelScavengeHeap::is_in_old_or_perm(oop p) {
+  return old_gen()->is_in_reserved(p) || perm_gen()->is_in_reserved(p);
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 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
@@ -39,12 +39,13 @@
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(which);
   PSParallelCompact::MarkAndPushClosure mark_and_push_closure(cm);
+  CodeBlobToOopClosure mark_and_push_in_blobs(&mark_and_push_closure, /*do_marking=*/ true);
 
   if (_java_thread != NULL)
-    _java_thread->oops_do(&mark_and_push_closure);
+    _java_thread->oops_do(&mark_and_push_closure, &mark_and_push_in_blobs);
 
   if (_vm_thread != NULL)
-    _vm_thread->oops_do(&mark_and_push_closure);
+    _vm_thread->oops_do(&mark_and_push_closure, &mark_and_push_in_blobs);
 
   // Do the real work
   cm->drain_marking_stacks(&mark_and_push_closure);
@@ -58,9 +59,8 @@
     PrintGCDetails && TraceParallelOldGCTasks, true, gclog_or_tty));
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(which);
-  // cm->allocate_stacks();
   assert(cm->stacks_have_been_allocated(),
-    "Stack space has not been allocated");
+         "Stack space has not been allocated");
   PSParallelCompact::MarkAndPushClosure mark_and_push_closure(cm);
 
   switch (_root_type) {
@@ -79,7 +79,8 @@
     case threads:
     {
       ResourceMark rm;
-      Threads::oops_do(&mark_and_push_closure);
+      CodeBlobToOopClosure each_active_code_blob(&mark_and_push_closure, /*do_marking=*/ true);
+      Threads::oops_do(&mark_and_push_closure, &each_active_code_blob);
     }
     break;
 
@@ -107,6 +108,11 @@
       vmSymbols::oops_do(&mark_and_push_closure);
       break;
 
+    case code_cache:
+      // Do not treat nmethods as strong roots for mark/sweep, since we can unload them.
+      //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(&mark_and_push_closure));
+      break;
+
     default:
       fatal("Unknown root type");
   }
@@ -129,9 +135,8 @@
     PrintGCDetails && TraceParallelOldGCTasks, true, gclog_or_tty));
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(which);
-  // cm->allocate_stacks();
   assert(cm->stacks_have_been_allocated(),
-    "Stack space has not been allocated");
+         "Stack space has not been allocated");
   PSParallelCompact::MarkAndPushClosure mark_and_push_closure(cm);
   PSParallelCompact::FollowStackClosure follow_stack_closure(cm);
   _rp_task.work(_work_id, *PSParallelCompact::is_alive_closure(),
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -92,7 +92,8 @@
     jvmti                 = 7,
     system_dictionary     = 8,
     vm_symbols            = 9,
-    reference_processing  = 10
+    reference_processing  = 10,
+    code_cache            = 11
   };
  private:
   RootType _root_type;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 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
@@ -61,12 +61,16 @@
   int size =
     (SystemDictionary::number_of_classes() * 2) * 2 / ParallelGCThreads;
   _revisit_klass_stack = new (ResourceObj::C_HEAP) GrowableArray<Klass*>(size, true);
+  // From some experiments (#klass/k)^2 for k = 10 seems a better fit, but this will
+  // have to do for now until we are able to investigate a more optimal setting.
+  _revisit_mdo_stack = new (ResourceObj::C_HEAP) GrowableArray<DataLayout*>(size*2, true);
 
 }
 
 ParCompactionManager::~ParCompactionManager() {
   delete _overflow_stack;
   delete _revisit_klass_stack;
+  delete _revisit_mdo_stack;
   // _manager_array and _stack_array are statics
   // shared with all instances of ParCompactionManager
   // should not be deallocated.
@@ -195,6 +199,7 @@
 void ParCompactionManager::reset() {
   for(uint i=0; i<ParallelGCThreads+1; i++) {
     manager_array(i)->revisit_klass_stack()->clear();
+    manager_array(i)->revisit_mdo_stack()->clear();
   }
 }
 
@@ -296,6 +301,7 @@
 
 #ifdef ASSERT
 bool ParCompactionManager::stacks_have_been_allocated() {
-  return (revisit_klass_stack()->data_addr() != NULL);
+  return (revisit_klass_stack()->data_addr() != NULL &&
+          revisit_mdo_stack()->data_addr() != NULL);
 }
 #endif
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 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
@@ -93,6 +93,7 @@
 
 #if 1  // does this happen enough to need a per thread stack?
   GrowableArray<Klass*>*        _revisit_klass_stack;
+  GrowableArray<DataLayout*>*   _revisit_mdo_stack;
 #endif
   static ParMarkBitMap* _mark_bitmap;
 
@@ -154,6 +155,7 @@
 #if 1
   // Probably stays as a growable array
   GrowableArray<Klass*>* revisit_klass_stack() { return _revisit_klass_stack; }
+  GrowableArray<DataLayout*>* revisit_mdo_stack() { return _revisit_mdo_stack; }
 #endif
 
   // Save oop for later processing.  Must not fail.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -51,7 +51,7 @@
 
     cname = PerfDataManager::counter_name(name_space(), "oldCapacity");
     _old_capacity = PerfDataManager::create_variable(SUN_GC, cname,
-      PerfData::U_Bytes, (jlong) Arguments::initial_heap_size(), CHECK);
+      PerfData::U_Bytes, (jlong) InitialHeapSize, CHECK);
 
     cname = PerfDataManager::counter_name(name_space(), "boundaryMoved");
     _boundary_moved = PerfDataManager::create_variable(SUN_GC, cname,
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -482,6 +482,9 @@
 
   int size = SystemDictionary::number_of_classes() * 2;
   _revisit_klass_stack = new (ResourceObj::C_HEAP) GrowableArray<Klass*>(size, true);
+  // (#klass/k)^2, for k ~ 10 appears a better setting, but this will have to do for
+  // now until we investigate a more optimal setting.
+  _revisit_mdo_stack   = new (ResourceObj::C_HEAP) GrowableArray<DataLayout*>(size*2, true);
 }
 
 
@@ -495,6 +498,7 @@
 
   delete _marking_stack;
   delete _revisit_klass_stack;
+  delete _revisit_mdo_stack;
 }
 
 void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
@@ -507,16 +511,22 @@
   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
 
   // General strong roots.
-  Universe::oops_do(mark_and_push_closure());
-  ReferenceProcessor::oops_do(mark_and_push_closure());
-  JNIHandles::oops_do(mark_and_push_closure());   // Global (strong) JNI handles
-  Threads::oops_do(mark_and_push_closure());
-  ObjectSynchronizer::oops_do(mark_and_push_closure());
-  FlatProfiler::oops_do(mark_and_push_closure());
-  Management::oops_do(mark_and_push_closure());
-  JvmtiExport::oops_do(mark_and_push_closure());
-  SystemDictionary::always_strong_oops_do(mark_and_push_closure());
-  vmSymbols::oops_do(mark_and_push_closure());
+  {
+    ParallelScavengeHeap::ParStrongRootsScope psrs;
+    Universe::oops_do(mark_and_push_closure());
+    ReferenceProcessor::oops_do(mark_and_push_closure());
+    JNIHandles::oops_do(mark_and_push_closure());   // Global (strong) JNI handles
+    CodeBlobToOopClosure each_active_code_blob(mark_and_push_closure(), /*do_marking=*/ true);
+    Threads::oops_do(mark_and_push_closure(), &each_active_code_blob);
+    ObjectSynchronizer::oops_do(mark_and_push_closure());
+    FlatProfiler::oops_do(mark_and_push_closure());
+    Management::oops_do(mark_and_push_closure());
+    JvmtiExport::oops_do(mark_and_push_closure());
+    SystemDictionary::always_strong_oops_do(mark_and_push_closure());
+    vmSymbols::oops_do(mark_and_push_closure());
+    // Do not treat nmethods as strong roots for mark/sweep, since we can unload them.
+    //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(mark_and_push_closure()));
+  }
 
   // Flush marking stack.
   follow_stack();
@@ -540,6 +550,10 @@
   follow_weak_klass_links();
   assert(_marking_stack->is_empty(), "just drained");
 
+  // Visit memoized mdo's and clear unmarked weak refs
+  follow_mdo_weak_refs();
+  assert(_marking_stack->is_empty(), "just drained");
+
   // Visit symbol and interned string tables and delete unmarked oops
   SymbolTable::unlink(is_alive_closure());
   StringTable::unlink(is_alive_closure());
@@ -609,7 +623,7 @@
   Universe::oops_do(adjust_root_pointer_closure());
   ReferenceProcessor::oops_do(adjust_root_pointer_closure());
   JNIHandles::oops_do(adjust_root_pointer_closure());   // Global (strong) JNI handles
-  Threads::oops_do(adjust_root_pointer_closure());
+  Threads::oops_do(adjust_root_pointer_closure(), NULL);
   ObjectSynchronizer::oops_do(adjust_root_pointer_closure());
   FlatProfiler::oops_do(adjust_root_pointer_closure());
   Management::oops_do(adjust_root_pointer_closure());
@@ -617,6 +631,7 @@
   // SO_AllClasses
   SystemDictionary::oops_do(adjust_root_pointer_closure());
   vmSymbols::oops_do(adjust_root_pointer_closure());
+  //CodeCache::scavenge_root_nmethods_oops_do(adjust_root_pointer_closure());
 
   // Now adjust pointers in remaining weak roots.  (All of which should
   // have been cleared if they pointed to non-surviving objects.)
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -2322,6 +2322,7 @@
 
   {
     TraceTime tm_m("par mark", print_phases(), true, gclog_or_tty);
+    ParallelScavengeHeap::ParStrongRootsScope psrs;
 
     GCTaskQueue* q = GCTaskQueue::create();
 
@@ -2335,6 +2336,7 @@
     q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::system_dictionary));
     q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::jvmti));
     q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::vm_symbols));
+    q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::code_cache));
 
     if (parallel_gc_threads > 1) {
       for (uint j = 0; j < parallel_gc_threads; j++) {
@@ -2378,7 +2380,10 @@
 
   // Update subklass/sibling/implementor links of live klasses
   // revisit_klass_stack is used in follow_weak_klass_links().
-  follow_weak_klass_links(cm);
+  follow_weak_klass_links();
+
+  // Revisit memoized MDO's and clear any unmarked weak refs
+  follow_mdo_weak_refs();
 
   // Visit symbol and interned string tables and delete unmarked oops
   SymbolTable::unlink(is_alive_closure());
@@ -2405,7 +2410,7 @@
   Universe::oops_do(adjust_root_pointer_closure());
   ReferenceProcessor::oops_do(adjust_root_pointer_closure());
   JNIHandles::oops_do(adjust_root_pointer_closure());   // Global (strong) JNI handles
-  Threads::oops_do(adjust_root_pointer_closure());
+  Threads::oops_do(adjust_root_pointer_closure(), NULL);
   ObjectSynchronizer::oops_do(adjust_root_pointer_closure());
   FlatProfiler::oops_do(adjust_root_pointer_closure());
   Management::oops_do(adjust_root_pointer_closure());
@@ -2721,17 +2726,25 @@
 }
 
 void
-PSParallelCompact::follow_weak_klass_links(ParCompactionManager* serial_cm) {
+PSParallelCompact::follow_weak_klass_links() {
   // All klasses on the revisit stack are marked at this point.
   // Update and follow all subklass, sibling and implementor links.
-  for (uint i = 0; i < ParallelGCThreads+1; i++) {
+  if (PrintRevisitStats) {
+    gclog_or_tty->print_cr("#classes in system dictionary = %d", SystemDictionary::number_of_classes());
+  }
+  for (uint i = 0; i < ParallelGCThreads + 1; i++) {
     ParCompactionManager* cm = ParCompactionManager::manager_array(i);
     KeepAliveClosure keep_alive_closure(cm);
-    for (int i = 0; i < cm->revisit_klass_stack()->length(); i++) {
-      cm->revisit_klass_stack()->at(i)->follow_weak_klass_links(
+    int length = cm->revisit_klass_stack()->length();
+    if (PrintRevisitStats) {
+      gclog_or_tty->print_cr("Revisit klass stack[%d] length = %d", i, length);
+    }
+    for (int j = 0; j < length; j++) {
+      cm->revisit_klass_stack()->at(j)->follow_weak_klass_links(
         is_alive_closure(),
         &keep_alive_closure);
     }
+    // revisit_klass_stack is cleared in reset()
     follow_stack(cm);
   }
 }
@@ -2741,6 +2754,33 @@
   cm->revisit_klass_stack()->push(k);
 }
 
+void PSParallelCompact::revisit_mdo(ParCompactionManager* cm, DataLayout* p) {
+  cm->revisit_mdo_stack()->push(p);
+}
+
+void PSParallelCompact::follow_mdo_weak_refs() {
+  // All strongly reachable oops have been marked at this point;
+  // we can visit and clear any weak references from MDO's which
+  // we memoized during the strong marking phase.
+  if (PrintRevisitStats) {
+    gclog_or_tty->print_cr("#classes in system dictionary = %d", SystemDictionary::number_of_classes());
+  }
+  for (uint i = 0; i < ParallelGCThreads + 1; i++) {
+    ParCompactionManager* cm = ParCompactionManager::manager_array(i);
+    GrowableArray<DataLayout*>* rms = cm->revisit_mdo_stack();
+    int length = rms->length();
+    if (PrintRevisitStats) {
+      gclog_or_tty->print_cr("Revisit MDO stack[%d] length = %d", i, length);
+    }
+    for (int j = 0; j < length; j++) {
+      rms->at(j)->follow_weak_refs(is_alive_closure());
+    }
+    // revisit_mdo_stack is cleared in reset()
+    follow_stack(cm);
+  }
+}
+
+
 #ifdef VALIDATE_MARK_SWEEP
 
 void PSParallelCompact::track_adjusted_pointer(void* p, bool isroot) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -799,8 +799,7 @@
     FollowRootClosure(ParCompactionManager* cm) : _compaction_manager(cm) { }
     virtual void do_oop(oop* p);
     virtual void do_oop(narrowOop* p);
-    virtual const bool do_nmethods() const { return true; }
-  };
+ };
 
   class FollowStackClosure: public VoidClosure {
    private:
@@ -817,6 +816,8 @@
     AdjustPointerClosure(bool is_root) : _is_root(is_root) { }
     virtual void do_oop(oop* p);
     virtual void do_oop(narrowOop* p);
+    // do not walk from thread stacks to the code cache on this phase
+    virtual void do_code_blob(CodeBlob* cb) const { }
   };
 
   // Closure for verifying update of pointers.  Does not
@@ -901,7 +902,8 @@
   static void marking_phase(ParCompactionManager* cm,
                             bool maximum_heap_compaction);
   static void follow_stack(ParCompactionManager* cm);
-  static void follow_weak_klass_links(ParCompactionManager* cm);
+  static void follow_weak_klass_links();
+  static void follow_mdo_weak_refs();
 
   template <class T> static inline void adjust_pointer(T* p, bool is_root);
   static void adjust_root_pointer(oop* p) { adjust_pointer(p, true); }
@@ -1062,7 +1064,6 @@
     MarkAndPushClosure(ParCompactionManager* cm) : _compaction_manager(cm) { }
     virtual void do_oop(oop* p);
     virtual void do_oop(narrowOop* p);
-    virtual const bool do_nmethods() const { return true; }
   };
 
   PSParallelCompact();
@@ -1221,6 +1222,9 @@
   // Update subklass/sibling/implementor links at end of marking.
   static void revisit_weak_klass_link(ParCompactionManager* cm, Klass* k);
 
+  // Clear unmarked oops in MDOs at the end of marking.
+  static void revisit_mdo(ParCompactionManager* cm, DataLayout* p);
+
 #ifndef PRODUCT
   // Debugging support.
   static const char* space_names[last_space_id];
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -358,6 +358,7 @@
     PSPromotionManager* promotion_manager = PSPromotionManager::vm_thread_promotion_manager();
     {
       // TraceTime("Roots");
+      ParallelScavengeHeap::ParStrongRootsScope psrs;
 
       GCTaskQueue* q = GCTaskQueue::create();
 
@@ -376,6 +377,7 @@
       q->enqueue(new ScavengeRootsTask(ScavengeRootsTask::management));
       q->enqueue(new ScavengeRootsTask(ScavengeRootsTask::system_dictionary));
       q->enqueue(new ScavengeRootsTask(ScavengeRootsTask::jvmti));
+      q->enqueue(new ScavengeRootsTask(ScavengeRootsTask::code_cache));
 
       ParallelTaskTerminator terminator(
         gc_task_manager()->workers(),
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -66,7 +66,7 @@
     case threads:
     {
       ResourceMark rm;
-      Threads::oops_do(&roots_closure);
+      Threads::oops_do(&roots_closure, NULL);
     }
     break;
 
@@ -90,6 +90,14 @@
       JvmtiExport::oops_do(&roots_closure);
       break;
 
+
+    case code_cache:
+      {
+        CodeBlobToOopClosure each_scavengable_code_blob(&roots_closure, /*do_marking=*/ true);
+        CodeCache::scavenge_root_nmethods_do(&each_scavengable_code_blob);
+      }
+      break;
+
     default:
       fatal("Unknown root type");
   }
@@ -107,12 +115,13 @@
 
   PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which);
   PSScavengeRootsClosure roots_closure(pm);
+  CodeBlobToOopClosure roots_in_blobs(&roots_closure, /*do_marking=*/ true);
 
   if (_java_thread != NULL)
-    _java_thread->oops_do(&roots_closure);
+    _java_thread->oops_do(&roots_closure, &roots_in_blobs);
 
   if (_vm_thread != NULL)
-    _vm_thread->oops_do(&roots_closure);
+    _vm_thread->oops_do(&roots_closure, &roots_in_blobs);
 
   // Do the real work
   pm->drain_stacks(false);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -54,7 +54,8 @@
     flat_profiler         = 5,
     system_dictionary     = 6,
     management            = 7,
-    jvmti                 = 8
+    jvmti                 = 8,
+    code_cache            = 9
   };
  private:
   RootType _root_type;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/shared/allocationStats.hpp
--- a/src/share/vm/gc_implementation/shared/allocationStats.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/shared/allocationStats.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -31,7 +31,7 @@
   // beginning of this sweep:
   //   Count(end_last_sweep) - Count(start_this_sweep)
   //     + splitBirths(between) - splitDeaths(between)
-  // The above number divided by the time since the start [END???] of the
+  // The above number divided by the time since the end of the
   // previous sweep gives us a time rate of demand for blocks
   // of this size. We compute a padded average of this rate as
   // our current estimate for the time rate of demand for blocks
@@ -41,7 +41,7 @@
   // estimates.
   AdaptivePaddedAverage _demand_rate_estimate;
 
-  ssize_t     _desired;          // Estimate computed as described above
+  ssize_t     _desired;         // Demand stimate computed as described above
   ssize_t     _coalDesired;     // desired +/- small-percent for tuning coalescing
 
   ssize_t     _surplus;         // count - (desired +/- small-percent),
@@ -53,9 +53,9 @@
   ssize_t     _coalDeaths;      // loss from coalescing
   ssize_t     _splitBirths;     // additional chunks from splitting
   ssize_t     _splitDeaths;     // loss from splitting
-  size_t     _returnedBytes;    // number of bytes returned to list.
+  size_t      _returnedBytes;   // number of bytes returned to list.
  public:
-  void initialize() {
+  void initialize(bool split_birth = false) {
     AdaptivePaddedAverage* dummy =
       new (&_demand_rate_estimate) AdaptivePaddedAverage(CMS_FLSWeight,
                                                          CMS_FLSPadding);
@@ -67,7 +67,7 @@
     _beforeSweep = 0;
     _coalBirths = 0;
     _coalDeaths = 0;
-    _splitBirths = 0;
+    _splitBirths = split_birth? 1 : 0;
     _splitDeaths = 0;
     _returnedBytes = 0;
   }
@@ -75,10 +75,12 @@
   AllocationStats() {
     initialize();
   }
+
   // The rate estimate is in blocks per second.
   void compute_desired(size_t count,
                        float inter_sweep_current,
-                       float inter_sweep_estimate) {
+                       float inter_sweep_estimate,
+                       float intra_sweep_estimate) {
     // If the latest inter-sweep time is below our granularity
     // of measurement, we may call in here with
     // inter_sweep_current == 0. However, even for suitably small
@@ -88,12 +90,31 @@
     // vulnerable to noisy glitches. In such cases, we
     // ignore the current sample and use currently available
     // historical estimates.
+    // XXX NEEDS TO BE FIXED
+    // assert(prevSweep() + splitBirths() >= splitDeaths() + (ssize_t)count, "Conservation Principle");
+    //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    //     "Total Stock"                  "Not used at this block size"
     if (inter_sweep_current > _threshold) {
-      ssize_t demand = prevSweep() - count + splitBirths() - splitDeaths();
+      ssize_t demand = prevSweep() - (ssize_t)count + splitBirths() - splitDeaths();
+      // XXX NEEDS TO BE FIXED
+      // assert(demand >= 0, "Demand should be non-negative");
+      // Defensive: adjust for imprecision in event counting
+      if (demand < 0) {
+        demand = 0;
+      }
+      float old_rate = _demand_rate_estimate.padded_average();
       float rate = ((float)demand)/inter_sweep_current;
       _demand_rate_estimate.sample(rate);
-      _desired = (ssize_t)(_demand_rate_estimate.padded_average()
-                           *inter_sweep_estimate);
+      float new_rate = _demand_rate_estimate.padded_average();
+      ssize_t old_desired = _desired;
+      _desired = (ssize_t)(new_rate * (inter_sweep_estimate
+                                       + CMSExtrapolateSweep
+                                         ? intra_sweep_estimate
+                                         : 0.0));
+      if (PrintFLSStatistics > 1) {
+        gclog_or_tty->print_cr("demand: %d, old_rate: %f, current_rate: %f, new_rate: %f, old_desired: %d, new_desired: %d",
+                                demand,     old_rate,     rate,             new_rate,     old_desired,     _desired);
+      }
     }
   }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/shared/coTracker.cpp
--- a/src/share/vm/gc_implementation/shared/coTracker.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,189 +0,0 @@
-/*
- * 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
- * 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/_coTracker.cpp.incl"
-
-COTracker* COTracker::_head = NULL;
-double COTracker::_cpu_number = -1.0;
-
-void
-COTracker::resetPeriod(double now_sec, double vnow_sec) {
-  guarantee( _enabled, "invariant" );
-  _period_start_time_sec  = now_sec;
-  _period_start_vtime_sec = vnow_sec;
-}
-
-void
-COTracker::setConcOverhead(double time_stamp_sec,
-                           double conc_overhead) {
-  guarantee( _enabled, "invariant" );
-  _conc_overhead  = conc_overhead;
-  _time_stamp_sec = time_stamp_sec;
-  if (conc_overhead > 0.001)
-    _conc_overhead_seq.add(conc_overhead);
-}
-
-void
-COTracker::reset(double starting_conc_overhead) {
-  guarantee( _enabled, "invariant" );
-  double now_sec = os::elapsedTime();
-  setConcOverhead(now_sec, starting_conc_overhead);
-}
-
-void
-COTracker::start() {
-  guarantee( _enabled, "invariant" );
-  resetPeriod(os::elapsedTime(), os::elapsedVTime());
-}
-
-void
-COTracker::update(bool force_end) {
-  assert( _enabled, "invariant" );
-  double end_time_sec = os::elapsedTime();
-  double elapsed_time_sec = end_time_sec - _period_start_time_sec;
-  if (force_end || elapsed_time_sec > _update_period_sec) {
-    // reached the end of the period
-    double end_vtime_sec = os::elapsedVTime();
-    double elapsed_vtime_sec = end_vtime_sec - _period_start_vtime_sec;
-
-    double conc_overhead = elapsed_vtime_sec / elapsed_time_sec;
-
-    setConcOverhead(end_time_sec, conc_overhead);
-    resetPeriod(end_time_sec, end_vtime_sec);
-  }
-}
-
-void
-COTracker::updateForSTW(double start_sec, double end_sec) {
-  if (!_enabled)
-    return;
-
-  // During a STW pause, no concurrent GC thread has done any
-  // work. So, we can safely adjust the start of the current period by
-  // adding the duration of the STW pause to it, so that the STW pause
-  // doesn't affect the reading of the concurrent overhead (it's
-  // basically like excluding the time of the STW pause from the
-  // concurrent overhead calculation).
-
-  double stw_duration_sec = end_sec - start_sec;
-  guarantee( stw_duration_sec > 0.0, "invariant" );
-
-  if (outOfDate(start_sec))
-    _conc_overhead = 0.0;
-  else
-    _time_stamp_sec = end_sec;
-  _period_start_time_sec += stw_duration_sec;
-  _conc_overhead_seq = NumberSeq();
-
-  guarantee( os::elapsedTime() > _period_start_time_sec, "invariant" );
-}
-
-double
-COTracker::predConcOverhead() {
-  if (_enabled) {
-    // tty->print(" %1.2lf", _conc_overhead_seq.maximum());
-    return _conc_overhead_seq.maximum();
-  } else {
-    // tty->print(" DD");
-    return 0.0;
-  }
-}
-
-void
-COTracker::resetPred() {
-  _conc_overhead_seq = NumberSeq();
-}
-
-COTracker::COTracker(int group)
-    : _enabled(false),
-      _group(group),
-      _period_start_time_sec(-1.0),
-      _period_start_vtime_sec(-1.0),
-      _conc_overhead(-1.0),
-      _time_stamp_sec(-1.0),
-      _next(NULL) {
-  // GCOverheadReportingPeriodMS indicates how frequently the
-  // concurrent overhead will be recorded by the GC Overhead
-  // Reporter. We want to take readings less often than that. If we
-  // took readings more often than some of them might be lost.
-  _update_period_sec = ((double) GCOverheadReportingPeriodMS) / 1000.0 * 1.25;
-  _next = _head;
-  _head = this;
-
-  if (_cpu_number < 0.0)
-    _cpu_number = (double) os::processor_count();
-}
-
-// statics
-
-void
-COTracker::updateAllForSTW(double start_sec, double end_sec) {
-  for (COTracker* curr = _head; curr != NULL; curr = curr->_next) {
-    curr->updateForSTW(start_sec, end_sec);
-  }
-}
-
-double
-COTracker::totalConcOverhead(double now_sec) {
-  double total_conc_overhead = 0.0;
-
-  for (COTracker* curr = _head; curr != NULL; curr = curr->_next) {
-    double conc_overhead = curr->concOverhead(now_sec);
-    total_conc_overhead += conc_overhead;
-  }
-
-  return total_conc_overhead;
-}
-
-double
-COTracker::totalConcOverhead(double now_sec,
-                             size_t group_num,
-                             double* co_per_group) {
-  double total_conc_overhead = 0.0;
-
-  for (size_t i = 0; i < group_num; ++i)
-    co_per_group[i] = 0.0;
-
-  for (COTracker* curr = _head; curr != NULL; curr = curr->_next) {
-    size_t group = curr->_group;
-    assert( 0 <= group && group < group_num, "invariant" );
-    double conc_overhead = curr->concOverhead(now_sec);
-
-    co_per_group[group] += conc_overhead;
-    total_conc_overhead += conc_overhead;
-  }
-
-  return total_conc_overhead;
-}
-
-double
-COTracker::totalPredConcOverhead() {
-  double total_pred_conc_overhead = 0.0;
-  for (COTracker* curr = _head; curr != NULL; curr = curr->_next) {
-    total_pred_conc_overhead += curr->predConcOverhead();
-    curr->resetPred();
-  }
-  return total_pred_conc_overhead / _cpu_number;
-}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/shared/coTracker.hpp
--- a/src/share/vm/gc_implementation/shared/coTracker.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-/*
- * 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
- * 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.
- *
- */
-
-// COTracker keeps track of the concurrent overhead of a GC thread.
-
-// A thread that needs to be tracked must, itself, start up its
-// tracker with the start() method and then call the update() method
-// at regular intervals. What the tracker does is to calculate the
-// concurrent overhead of a process at a given update period. The
-// tracker starts and when is detects that it has exceeded the given
-// period, it calculates the duration of the period in wall-clock time
-// and the duration of the period in vtime (i.e. how much time the
-// concurrent processes really took up during this period). The ratio
-// of the latter over the former is the concurrent overhead of that
-// process for that period over a single CPU. This overhead is stored
-// on the tracker, "timestamped" with the wall-clock time of the end
-// of the period. When the concurrent overhead of this process needs
-// to be queried, this last "reading" provides a good approximation
-// (we assume that the concurrent overhead of a particular thread
-// stays largely constant over time). The timestamp is necessary to
-// detect when the process has stopped working and the recorded
-// reading hasn't been updated for some time.
-
-// Each concurrent GC thread is considered to be part of a "group"
-// (i.e. any available concurrent marking threads are part of the
-// "concurrent marking thread group"). A COTracker is associated with
-// a single group at construction-time. It's up to each collector to
-// decide how groups will be mapped to such an id (ids should start
-// from 0 and be consecutive; there's a hardcoded max group num
-// defined on the GCOverheadTracker class). The notion of a group has
-// been introduced to be able to identify how much overhead was
-// imposed by each group, instead of getting a single value that
-// covers all concurrent overhead.
-
-class COTracker {
-private:
-  // It indicates whether this tracker is enabled or not. When the
-  // tracker is disabled, then it returns 0.0 as the latest concurrent
-  // overhead and several methods (reset, start, and update) are not
-  // supposed to be called on it. This enabling / disabling facility
-  // is really provided to make a bit more explicit in the code when a
-  // particulary tracker of a processes that doesn't run all the time
-  // (e.g. concurrent marking) is supposed to be used and not it's not.
-  bool               _enabled;
-
-  // The ID of the group associated with this tracker.
-  int                _group;
-
-  // The update period of the tracker. A new value for the concurrent
-  // overhead of the associated process will be made at intervals no
-  // smaller than this.
-  double             _update_period_sec;
-
-  // The start times (both wall-block time and vtime) of the current
-  // interval.
-  double             _period_start_time_sec;
-  double             _period_start_vtime_sec;
-
-  // Number seq of the concurrent overhead readings within a period
-  NumberSeq          _conc_overhead_seq;
-
-  // The latest reading of the concurrent overhead (over a single CPU)
-  // imposed by the associated concurrent thread, made available at
-  // the indicated wall-clock time.
-  double             _conc_overhead;
-  double             _time_stamp_sec;
-
-  // The number of CPUs that the host machine has (for convenience
-  // really, as we'd have to keep translating it into a double)
-  static double      _cpu_number;
-
-  // Fields that keep a list of all trackers created. This is useful,
-  // since it allows us to sum up the concurrent overhead without
-  // having to write code for a specific collector to broadcast a
-  // request to all its concurrent processes.
-  COTracker*         _next;
-  static COTracker*  _head;
-
-  // It indicates that a new period is starting by updating the
-  // _period_start_time_sec and _period_start_vtime_sec fields.
-  void resetPeriod(double now_sec, double vnow_sec);
-  // It updates the latest concurrent overhead reading, taken at a
-  // given wall-clock time.
-  void setConcOverhead(double time_stamp_sec, double conc_overhead);
-
-  // It determines whether the time stamp of the latest concurrent
-  // overhead reading is out of date or not.
-  bool outOfDate(double now_sec) {
-    // The latest reading is considered out of date, if it was taken
-    // 1.2x the update period.
-    return (now_sec - _time_stamp_sec) > 1.2 * _update_period_sec;
-  }
-
-public:
-  // The constructor which associates the tracker with a group ID.
-  COTracker(int group);
-
-  // Methods to enable / disable the tracker and query whether it is enabled.
-  void enable()  { _enabled = true;  }
-  void disable() { _enabled = false; }
-  bool enabled() { return _enabled;  }
-
-  // It resets the tracker and sets concurrent overhead reading to be
-  // the given parameter and the associated time stamp to be now.
-  void reset(double starting_conc_overhead = 0.0);
-  // The tracker starts tracking. IT should only be called from the
-  // concurrent thread that is tracked by this tracker.
-  void start();
-  // It updates the tracker and, if the current period is longer than
-  // the update period, the concurrent overhead reading will be
-  // updated. force_end being true indicates that it's the last call
-  // to update() by this process before the tracker is disabled (the
-  // tracker can be re-enabled later if necessary).  It should only be
-  // called from the concurrent thread that is tracked by this tracker
-  // and while the thread has joined the STS.
-  void update(bool force_end = false);
-  // It adjusts the contents of the tracker to take into account a STW
-  // pause.
-  void updateForSTW(double start_sec, double end_sec);
-
-  // It returns the last concurrent overhead reading over a single
-  // CPU. If the reading is out of date, or the tracker is disabled,
-  // it returns 0.0.
-  double concCPUOverhead(double now_sec) {
-    if (!_enabled || outOfDate(now_sec))
-      return 0.0;
-    else
-      return _conc_overhead;
-  }
-
-  // It returns the last concurrent overhead reading over all CPUs
-  // that the host machine has. If the reading is out of date, or the
-  // tracker is disabled, it returns 0.0.
-  double concOverhead(double now_sec) {
-    return concCPUOverhead(now_sec) / _cpu_number;
-  }
-
-  double predConcOverhead();
-
-  void resetPred();
-
-  // statics
-
-  // It notifies all trackers about a STW pause.
-  static void updateAllForSTW(double start_sec, double end_sec);
-
-  // It returns the sum of the concurrent overhead readings of all
-  // available (and enabled) trackers for the given time stamp. The
-  // overhead is over all the CPUs of the host machine.
-
-  static double totalConcOverhead(double now_sec);
-  // Like the previous method, but it also sums up the overheads per
-  // group number. The length of the co_per_group array must be at
-  // least as large group_num
-  static double totalConcOverhead(double now_sec,
-                                  size_t group_num,
-                                  double* co_per_group);
-
-  static double totalPredConcOverhead();
-};
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp
--- a/src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
- * 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
- * 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/_gcOverheadReporter.cpp.incl"
-
-class COReportingThread : public ConcurrentGCThread {
-private:
-  GCOverheadReporter* _reporter;
-
-public:
-  COReportingThread(GCOverheadReporter* reporter) : _reporter(reporter) {
-    guarantee( _reporter != NULL, "precondition" );
-    create_and_start();
-  }
-
-  virtual void run() {
-    initialize_in_thread();
-    wait_for_universe_init();
-
-    int period_ms = GCOverheadReportingPeriodMS;
-
-    while ( true ) {
-      os::sleep(Thread::current(), period_ms, false);
-
-      _sts.join();
-      double now_sec = os::elapsedTime();
-      _reporter->collect_and_record_conc_overhead(now_sec);
-      _sts.leave();
-    }
-
-    terminate();
-  }
-};
-
-GCOverheadReporter* GCOverheadReporter::_reporter = NULL;
-
-GCOverheadReporter::GCOverheadReporter(size_t group_num,
-                                       const char* group_names[],
-                                       size_t length)
-    : _group_num(group_num), _prev_end_sec(0.0) {
-  guarantee( 0 <= group_num && group_num <= MaxGCOverheadGroupNum,
-             "precondition" );
-
-  _base = NEW_C_HEAP_ARRAY(GCOverheadReporterEntry, length);
-  _top  = _base + length;
-  _curr = _base;
-
-  for (size_t i = 0; i < group_num; ++i) {
-    guarantee( group_names[i] != NULL, "precondition" );
-    _group_names[i] = group_names[i];
-  }
-}
-
-void
-GCOverheadReporter::add(double start_sec, double end_sec,
-                        double* conc_overhead,
-                        double stw_overhead) {
-  assert( _curr <= _top, "invariant" );
-
-  if (_curr == _top) {
-    guarantee( false, "trace full" );
-    return;
-  }
-
-  _curr->_start_sec       = start_sec;
-  _curr->_end_sec         = end_sec;
-  for (size_t i = 0; i < _group_num; ++i) {
-    _curr->_conc_overhead[i] =
-      (conc_overhead != NULL) ? conc_overhead[i] : 0.0;
-  }
-  _curr->_stw_overhead    = stw_overhead;
-
-  ++_curr;
-}
-
-void
-GCOverheadReporter::collect_and_record_conc_overhead(double end_sec) {
-  double start_sec = _prev_end_sec;
-  guarantee( end_sec > start_sec, "invariant" );
-
-  double conc_overhead[MaxGCOverheadGroupNum];
-  COTracker::totalConcOverhead(end_sec, _group_num, conc_overhead);
-  add_conc_overhead(start_sec, end_sec, conc_overhead);
-  _prev_end_sec = end_sec;
-}
-
-void
-GCOverheadReporter::record_stw_start(double start_sec) {
-  guarantee( start_sec > _prev_end_sec, "invariant" );
-  collect_and_record_conc_overhead(start_sec);
-}
-
-void
-GCOverheadReporter::record_stw_end(double end_sec) {
-  double start_sec = _prev_end_sec;
-  COTracker::updateAllForSTW(start_sec, end_sec);
-  add_stw_overhead(start_sec, end_sec, 1.0);
-
-  _prev_end_sec = end_sec;
-}
-
-void
-GCOverheadReporter::print() const {
-  tty->print_cr("");
-  tty->print_cr("GC Overhead (%d entries)", _curr - _base);
-  tty->print_cr("");
-  GCOverheadReporterEntry* curr = _base;
-  while (curr < _curr) {
-    double total = curr->_stw_overhead;
-    for (size_t i = 0; i < _group_num; ++i)
-      total += curr->_conc_overhead[i];
-
-    tty->print("OVERHEAD %12.8lf %12.8lf ",
-               curr->_start_sec, curr->_end_sec);
-
-    for (size_t i = 0; i < _group_num; ++i)
-      tty->print("%s %12.8lf ", _group_names[i], curr->_conc_overhead[i]);
-
-    tty->print_cr("STW %12.8lf TOT %12.8lf", curr->_stw_overhead, total);
-    ++curr;
-  }
-  tty->print_cr("");
-}
-
-// statics
-
-void
-GCOverheadReporter::initGCOverheadReporter(size_t group_num,
-                                           const char* group_names[]) {
-  guarantee( _reporter == NULL, "should only be called once" );
-  guarantee( 0 <= group_num && group_num <= MaxGCOverheadGroupNum,
-             "precondition" );
-  guarantee( group_names != NULL, "pre-condition" );
-
-  if (GCOverheadReporting) {
-    _reporter = new GCOverheadReporter(group_num, group_names);
-    new COReportingThread(_reporter);
-  }
-}
-
-void
-GCOverheadReporter::recordSTWStart(double start_sec) {
-  if (_reporter != NULL)
-    _reporter->record_stw_start(start_sec);
-}
-
-void
-GCOverheadReporter::recordSTWEnd(double end_sec) {
-  if (_reporter != NULL)
-    _reporter->record_stw_end(end_sec);
-}
-
-void
-GCOverheadReporter::printGCOverhead() {
-  if (_reporter != NULL)
-    _reporter->print();
-}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp
--- a/src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
- * 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
- * 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.
- *
- */
-
-// Keeps track of the GC overhead (both concurrent and STW). It stores
-// it in a large array and then prints it to tty at the end of the
-// execution.
-
-// See coTracker.hpp for the explanation on what groups are.
-
-// Let's set a maximum number of concurrent overhead groups, to
-// statically allocate any arrays we need and not to have to
-// malloc/free them. This is just a bit more convenient.
-enum {
-  MaxGCOverheadGroupNum = 4
-};
-
-typedef struct {
-  double _start_sec;
-  double _end_sec;
-
-  double _conc_overhead[MaxGCOverheadGroupNum];
-  double _stw_overhead;
-} GCOverheadReporterEntry;
-
-class GCOverheadReporter {
-  friend class COReportingThread;
-
-private:
-  enum PrivateConstants {
-    DefaultReporterLength = 128 * 1024
-  };
-
-  // Reference to the single instance of this class.
-  static GCOverheadReporter* _reporter;
-
-  // These three references point to the array that contains the GC
-  // overhead entries (_base is the base of the array, _top is the
-  // address passed the last entry of the array, _curr is the next
-  // entry to be used).
-  GCOverheadReporterEntry* _base;
-  GCOverheadReporterEntry* _top;
-  GCOverheadReporterEntry* _curr;
-
-  // The number of concurrent overhead groups.
-  size_t _group_num;
-
-  // The wall-clock time of the end of the last recorded period of GC
-  // overhead.
-  double _prev_end_sec;
-
-  // Names for the concurrent overhead groups.
-  const char* _group_names[MaxGCOverheadGroupNum];
-
-  // Add a new entry to the large array. conc_overhead being NULL is
-  // equivalent to an array full of 0.0s. conc_overhead should have a
-  // length of at least _group_num.
-  void add(double start_sec, double end_sec,
-           double* conc_overhead,
-           double stw_overhead);
-
-  // Add an entry that represents concurrent GC overhead.
-  // conc_overhead must be at least of length _group_num.
-  // conc_overhead being NULL is equivalent to an array full of 0.0s.
-  void add_conc_overhead(double start_sec, double end_sec,
-                         double* conc_overhead) {
-    add(start_sec, end_sec, conc_overhead, 0.0);
-  }
-
-  // Add an entry that represents STW GC overhead.
-  void add_stw_overhead(double start_sec, double end_sec,
-                        double stw_overhead) {
-    add(start_sec, end_sec, NULL, stw_overhead);
-  }
-
-  // It records the start of a STW pause (i.e. it records the
-  // concurrent overhead up to that point)
-  void record_stw_start(double start_sec);
-
-  // It records the end of a STW pause (i.e. it records the overhead
-  // associated with the pause and adjusts all the trackers to reflect
-  // the pause)
-  void record_stw_end(double end_sec);
-
-  // It queries all the trackers of their concurrent overhead and
-  // records it.
-  void collect_and_record_conc_overhead(double end_sec);
-
-  // It prints the contents of the GC overhead array
-  void print() const;
-
-
-  // Constructor. The same preconditions for group_num and group_names
-  // from initGCOverheadReporter apply here too.
-  GCOverheadReporter(size_t group_num,
-                     const char* group_names[],
-                     size_t length = DefaultReporterLength);
-
-public:
-
-  // statics
-
-  // It initialises the GCOverheadReporter and launches the concurrent
-  // overhead reporting thread. Both actions happen only if the
-  // GCOverheadReporting parameter is set. The length of the
-  // group_names array should be >= group_num and group_num should be
-  // <= MaxGCOverheadGroupNum. Entries group_namnes[0..group_num-1]
-  // should not be NULL.
-  static void initGCOverheadReporter(size_t group_num,
-                                     const char* group_names[]);
-
-  // The following three are provided for convenience and they are
-  // wrappers around record_stw_start(start_sec), record_stw_end(end_sec),
-  // and print(). Each of these checks whether GC overhead reporting
-  // is on (i.e. _reporter != NULL) and, if it is, calls the
-  // corresponding method. Saves from repeating this pattern again and
-  // again from the places where they need to be called.
-  static void recordSTWStart(double start_sec);
-  static void recordSTWEnd(double end_sec);
-  static void printGCOverhead();
-};
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/shared/gcUtil.cpp
--- a/src/share/vm/gc_implementation/shared/gcUtil.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/shared/gcUtil.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -52,11 +52,35 @@
   _last_sample = new_sample;
 }
 
+void AdaptiveWeightedAverage::print() const {
+  print_on(tty);
+}
+
+void AdaptiveWeightedAverage::print_on(outputStream* st) const {
+  guarantee(false, "NYI");
+}
+
+void AdaptivePaddedAverage::print() const {
+  print_on(tty);
+}
+
+void AdaptivePaddedAverage::print_on(outputStream* st) const {
+  guarantee(false, "NYI");
+}
+
+void AdaptivePaddedNoZeroDevAverage::print() const {
+  print_on(tty);
+}
+
+void AdaptivePaddedNoZeroDevAverage::print_on(outputStream* st) const {
+  guarantee(false, "NYI");
+}
+
 void AdaptivePaddedAverage::sample(float new_sample) {
-  // Compute our parent classes sample information
+  // Compute new adaptive weighted average based on new sample.
   AdaptiveWeightedAverage::sample(new_sample);
 
-  // Now compute the deviation and the new padded sample
+  // Now update the deviation and the padded average.
   float new_avg = average();
   float new_dev = compute_adaptive_average(fabsd(new_sample - new_avg),
                                            deviation());
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/shared/gcUtil.hpp
--- a/src/share/vm/gc_implementation/shared/gcUtil.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/shared/gcUtil.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -54,8 +54,8 @@
 
  public:
   // Input weight must be between 0 and 100
-  AdaptiveWeightedAverage(unsigned weight) :
-    _average(0.0), _sample_count(0), _weight(weight), _last_sample(0.0) {
+  AdaptiveWeightedAverage(unsigned weight, float avg = 0.0) :
+    _average(avg), _sample_count(0), _weight(weight), _last_sample(0.0) {
   }
 
   void clear() {
@@ -64,6 +64,13 @@
     _last_sample = 0;
   }
 
+  // Useful for modifying static structures after startup.
+  void  modify(size_t avg, unsigned wt, bool force = false)  {
+    assert(force, "Are you sure you want to call this?");
+    _average = (float)avg;
+    _weight  = wt;
+  }
+
   // Accessors
   float    average() const       { return _average;       }
   unsigned weight()  const       { return _weight;        }
@@ -83,6 +90,10 @@
     // Convert to float and back to avoid integer overflow.
     return (size_t)exp_avg((float)avg, (float)sample, weight);
   }
+
+  // Printing
+  void print_on(outputStream* st) const;
+  void print() const;
 };
 
 
@@ -129,6 +140,10 @@
 
   // Override
   void  sample(float new_sample);
+
+  // Printing
+  void print_on(outputStream* st) const;
+  void print() const;
 };
 
 // A weighted average that includes a deviation from the average,
@@ -146,7 +161,12 @@
     AdaptivePaddedAverage(weight, padding)  {}
   // Override
   void  sample(float new_sample);
+
+  // Printing
+  void print_on(outputStream* st) const;
+  void print() const;
 };
+
 // Use a least squares fit to a set of data to generate a linear
 // equation.
 //              y = intercept + slope * x
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/shared/markSweep.cpp
--- a/src/share/vm/gc_implementation/shared/markSweep.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/shared/markSweep.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -27,6 +27,7 @@
 
 GrowableArray<oop>*     MarkSweep::_marking_stack       = NULL;
 GrowableArray<Klass*>*  MarkSweep::_revisit_klass_stack = NULL;
+GrowableArray<DataLayout*>*  MarkSweep::_revisit_mdo_stack = NULL;
 
 GrowableArray<oop>*     MarkSweep::_preserved_oop_stack = NULL;
 GrowableArray<markOop>* MarkSweep::_preserved_mark_stack= NULL;
@@ -62,13 +63,37 @@
 void MarkSweep::follow_weak_klass_links() {
   // All klasses on the revisit stack are marked at this point.
   // Update and follow all subklass, sibling and implementor links.
+  if (PrintRevisitStats) {
+    gclog_or_tty->print_cr("#classes in system dictionary = %d", SystemDictionary::number_of_classes());
+    gclog_or_tty->print_cr("Revisit klass stack length = %d", _revisit_klass_stack->length());
+  }
   for (int i = 0; i < _revisit_klass_stack->length(); i++) {
     _revisit_klass_stack->at(i)->follow_weak_klass_links(&is_alive,&keep_alive);
   }
   follow_stack();
 }
 
+void MarkSweep::revisit_mdo(DataLayout* p) {
+  _revisit_mdo_stack->push(p);
+}
+
+void MarkSweep::follow_mdo_weak_refs() {
+  // All strongly reachable oops have been marked at this point;
+  // we can visit and clear any weak references from MDO's which
+  // we memoized during the strong marking phase.
+  assert(_marking_stack->is_empty(), "Marking stack should be empty");
+  if (PrintRevisitStats) {
+    gclog_or_tty->print_cr("#classes in system dictionary = %d", SystemDictionary::number_of_classes());
+    gclog_or_tty->print_cr("Revisit MDO stack length = %d", _revisit_mdo_stack->length());
+  }
+  for (int i = 0; i < _revisit_mdo_stack->length(); i++) {
+    _revisit_mdo_stack->at(i)->follow_weak_refs(&is_alive);
+  }
+  follow_stack();
+}
+
 MarkSweep::FollowRootClosure  MarkSweep::follow_root_closure;
+CodeBlobToOopClosure MarkSweep::follow_code_root_closure(&MarkSweep::follow_root_closure, /*do_marking=*/ true);
 
 void MarkSweep::FollowRootClosure::do_oop(oop* p)       { follow_root(p); }
 void MarkSweep::FollowRootClosure::do_oop(narrowOop* p) { follow_root(p); }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_implementation/shared/markSweep.hpp
--- a/src/share/vm/gc_implementation/shared/markSweep.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_implementation/shared/markSweep.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -23,6 +23,7 @@
  */
 
 class ReferenceProcessor;
+class DataLayout;
 
 // MarkSweep takes care of global mark-compact garbage collection for a
 // GenCollectedHeap using a four-phase pointer forwarding algorithm.  All
@@ -57,14 +58,14 @@
    public:
     virtual void do_oop(oop* p);
     virtual void do_oop(narrowOop* p);
-    virtual const bool do_nmethods() const { return true; }
   };
 
   class MarkAndPushClosure: public OopClosure {
    public:
     virtual void do_oop(oop* p);
     virtual void do_oop(narrowOop* p);
-    virtual const bool do_nmethods() const { return true; }
+    virtual const bool should_remember_mdo() const { return true; }
+    virtual void remember_mdo(DataLayout* p) { MarkSweep::revisit_mdo(p); }
   };
 
   class FollowStackClosure: public VoidClosure {
@@ -103,6 +104,7 @@
   friend class KeepAliveClosure;
   friend class VM_MarkSweep;
   friend void marksweep_init();
+  friend class DataLayout;
 
   //
   // Vars
@@ -112,6 +114,8 @@
   static GrowableArray<oop>*             _marking_stack;
   // Stack for live klasses to revisit at end of marking phase
   static GrowableArray<Klass*>*          _revisit_klass_stack;
+  // Set (stack) of MDO's to revisit at end of marking phase
+  static GrowableArray<DataLayout*>*    _revisit_mdo_stack;
 
   // Space for storing/restoring mark word
   static GrowableArray<markOop>*         _preserved_mark_stack;
@@ -157,12 +161,17 @@
   // Class unloading. Update subklass/sibling/implementor links at end of marking phase.
   static void follow_weak_klass_links();
 
+  // Class unloading. Clear weak refs in MDO's (ProfileData)
+  // at the end of the marking phase.
+  static void follow_mdo_weak_refs();
+
   // Debugging
   static void trace(const char* msg) PRODUCT_RETURN;
 
  public:
   // Public closures
   static FollowRootClosure    follow_root_closure;
+  static CodeBlobToOopClosure follow_code_root_closure; // => follow_root_closure
   static MarkAndPushClosure   mark_and_push_closure;
   static FollowStackClosure   follow_stack_closure;
   static AdjustPointerClosure adjust_root_pointer_closure;
@@ -213,7 +222,10 @@
 #endif
 
   // Call backs for class unloading
-  static void revisit_weak_klass_link(Klass* k);  // Update subklass/sibling/implementor links at end of marking.
+  // Update subklass/sibling/implementor links at end of marking.
+  static void revisit_weak_klass_link(Klass* k);
+  // For weak refs clearing in MDO's
+  static void revisit_mdo(DataLayout* p);
 };
 
 class PreservedMark VALUE_OBJ_CLASS_SPEC {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_interface/collectedHeap.cpp
--- a/src/share/vm/gc_interface/collectedHeap.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_interface/collectedHeap.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -59,8 +59,19 @@
                 PerfDataManager::create_string_variable(SUN_GC, "lastCause",
                              80, GCCause::to_string(_gc_lastcause), CHECK);
   }
+  _defer_initial_card_mark = false; // strengthened by subclass in pre_initialize() below.
 }
 
+void CollectedHeap::pre_initialize() {
+  // Used for ReduceInitialCardMarks (when COMPILER2 is used);
+  // otherwise remains unused.
+#ifdef COMPLER2
+  _defer_initial_card_mark =    ReduceInitialCardMarks && can_elide_tlab_store_barriers()
+                             && (DeferInitialCardMark || card_mark_must_follow_store());
+#else
+  assert(_defer_initial_card_mark == false, "Who would set it?");
+#endif
+}
 
 #ifndef PRODUCT
 void CollectedHeap::check_for_bad_heap_word_value(HeapWord* addr, size_t size) {
@@ -137,6 +148,96 @@
   return obj;
 }
 
+void CollectedHeap::flush_deferred_store_barrier(JavaThread* thread) {
+  MemRegion deferred = thread->deferred_card_mark();
+  if (!deferred.is_empty()) {
+    assert(_defer_initial_card_mark, "Otherwise should be empty");
+    {
+      // Verify that the storage points to a parsable object in heap
+      DEBUG_ONLY(oop old_obj = oop(deferred.start());)
+      assert(is_in(old_obj), "Not in allocated heap");
+      assert(!can_elide_initializing_store_barrier(old_obj),
+             "Else should have been filtered in new_store_pre_barrier()");
+      assert(!is_in_permanent(old_obj), "Sanity: not expected");
+      assert(old_obj->is_oop(true), "Not an oop");
+      assert(old_obj->is_parsable(), "Will not be concurrently parsable");
+      assert(deferred.word_size() == (size_t)(old_obj->size()),
+             "Mismatch: multiple objects?");
+    }
+    BarrierSet* bs = barrier_set();
+    assert(bs->has_write_region_opt(), "No write_region() on BarrierSet");
+    bs->write_region(deferred);
+    // "Clear" the deferred_card_mark field
+    thread->set_deferred_card_mark(MemRegion());
+  }
+  assert(thread->deferred_card_mark().is_empty(), "invariant");
+}
+
+// Helper for ReduceInitialCardMarks. For performance,
+// compiled code may elide card-marks for initializing stores
+// to a newly allocated object along the fast-path. We
+// compensate for such elided card-marks as follows:
+// (a) Generational, non-concurrent collectors, such as
+//     GenCollectedHeap(ParNew,DefNew,Tenured) and
+//     ParallelScavengeHeap(ParallelGC, ParallelOldGC)
+//     need the card-mark if and only if the region is
+//     in the old gen, and do not care if the card-mark
+//     succeeds or precedes the initializing stores themselves,
+//     so long as the card-mark is completed before the next
+//     scavenge. For all these cases, we can do a card mark
+//     at the point at which we do a slow path allocation
+//     in the old gen, i.e. in this call.
+// (b) GenCollectedHeap(ConcurrentMarkSweepGeneration) requires
+//     in addition that the card-mark for an old gen allocated
+//     object strictly follow any associated initializing stores.
+//     In these cases, the memRegion remembered below is
+//     used to card-mark the entire region either just before the next
+//     slow-path allocation by this thread or just before the next scavenge or
+//     CMS-associated safepoint, whichever of these events happens first.
+//     (The implicit assumption is that the object has been fully
+//     initialized by this point, a fact that we assert when doing the
+//     card-mark.)
+// (c) G1CollectedHeap(G1) uses two kinds of write barriers. When a
+//     G1 concurrent marking is in progress an SATB (pre-write-)barrier is
+//     is used to remember the pre-value of any store. Initializing
+//     stores will not need this barrier, so we need not worry about
+//     compensating for the missing pre-barrier here. Turning now
+//     to the post-barrier, we note that G1 needs a RS update barrier
+//     which simply enqueues a (sequence of) dirty cards which may
+//     optionally be refined by the concurrent update threads. Note
+//     that this barrier need only be applied to a non-young write,
+//     but, like in CMS, because of the presence of concurrent refinement
+//     (much like CMS' precleaning), must strictly follow the oop-store.
+//     Thus, using the same protocol for maintaining the intended
+//     invariants turns out, serendepitously, to be the same for both
+//     G1 and CMS.
+//
+// For any future collector, this code should be reexamined with
+// that specific collector in mind, and the documentation above suitably
+// extended and updated.
+oop CollectedHeap::new_store_pre_barrier(JavaThread* thread, oop new_obj) {
+  // If a previous card-mark was deferred, flush it now.
+  flush_deferred_store_barrier(thread);
+  if (can_elide_initializing_store_barrier(new_obj)) {
+    // The deferred_card_mark region should be empty
+    // following the flush above.
+    assert(thread->deferred_card_mark().is_empty(), "Error");
+  } else {
+    MemRegion mr((HeapWord*)new_obj, new_obj->size());
+    assert(!mr.is_empty(), "Error");
+    if (_defer_initial_card_mark) {
+      // Defer the card mark
+      thread->set_deferred_card_mark(mr);
+    } else {
+      // Do the card mark
+      BarrierSet* bs = barrier_set();
+      assert(bs->has_write_region_opt(), "No write_region() on BarrierSet");
+      bs->write_region(mr);
+    }
+  }
+  return new_obj;
+}
+
 size_t CollectedHeap::filler_array_hdr_size() {
   return size_t(arrayOopDesc::header_size(T_INT));
 }
@@ -158,9 +259,9 @@
   assert(Universe::heap()->is_in_reserved(start + words - 1), "not in heap");
 }
 
-void CollectedHeap::zap_filler_array(HeapWord* start, size_t words)
+void CollectedHeap::zap_filler_array(HeapWord* start, size_t words, bool zap)
 {
-  if (ZapFillerObjects) {
+  if (ZapFillerObjects && zap) {
     Copy::fill_to_words(start + filler_array_hdr_size(),
                         words - filler_array_hdr_size(), 0XDEAFBABE);
   }
@@ -168,7 +269,7 @@
 #endif // ASSERT
 
 void
-CollectedHeap::fill_with_array(HeapWord* start, size_t words)
+CollectedHeap::fill_with_array(HeapWord* start, size_t words, bool zap)
 {
   assert(words >= filler_array_min_size(), "too small for an array");
   assert(words <= filler_array_max_size(), "too big for a single object");
@@ -179,31 +280,31 @@
   // Set the length first for concurrent GC.
   ((arrayOop)start)->set_length((int)len);
   post_allocation_setup_common(Universe::intArrayKlassObj(), start, words);
-  DEBUG_ONLY(zap_filler_array(start, words);)
+  DEBUG_ONLY(zap_filler_array(start, words, zap);)
 }
 
 void
-CollectedHeap::fill_with_object_impl(HeapWord* start, size_t words)
+CollectedHeap::fill_with_object_impl(HeapWord* start, size_t words, bool zap)
 {
   assert(words <= filler_array_max_size(), "too big for a single object");
 
   if (words >= filler_array_min_size()) {
-    fill_with_array(start, words);
+    fill_with_array(start, words, zap);
   } else if (words > 0) {
     assert(words == min_fill_size(), "unaligned size");
-    post_allocation_setup_common(SystemDictionary::object_klass(), start,
+    post_allocation_setup_common(SystemDictionary::Object_klass(), start,
                                  words);
   }
 }
 
-void CollectedHeap::fill_with_object(HeapWord* start, size_t words)
+void CollectedHeap::fill_with_object(HeapWord* start, size_t words, bool zap)
 {
   DEBUG_ONLY(fill_args_check(start, words);)
   HandleMark hm;  // Free handles before leaving.
-  fill_with_object_impl(start, words);
+  fill_with_object_impl(start, words, zap);
 }
 
-void CollectedHeap::fill_with_objects(HeapWord* start, size_t words)
+void CollectedHeap::fill_with_objects(HeapWord* start, size_t words, bool zap)
 {
   DEBUG_ONLY(fill_args_check(start, words);)
   HandleMark hm;  // Free handles before leaving.
@@ -216,23 +317,13 @@
   const size_t max = filler_array_max_size();
   while (words > max) {
     const size_t cur = words - max >= min ? max : max - min;
-    fill_with_array(start, cur);
+    fill_with_array(start, cur, zap);
     start += cur;
     words -= cur;
   }
 #endif
 
-  fill_with_object_impl(start, words);
-}
-
-oop CollectedHeap::new_store_barrier(oop new_obj) {
-  // %%% This needs refactoring.  (It was imported from the server compiler.)
-  guarantee(can_elide_tlab_store_barriers(), "store barrier elision not supported");
-  BarrierSet* bs = this->barrier_set();
-  assert(bs->has_write_region_opt(), "Barrier set does not have write_region");
-  int new_size = new_obj->size();
-  bs->write_region(MemRegion((HeapWord*)new_obj, new_size));
-  return new_obj;
+  fill_with_object_impl(start, words, zap);
 }
 
 HeapWord* CollectedHeap::allocate_new_tlab(size_t size) {
@@ -240,22 +331,6 @@
   return NULL;
 }
 
-void CollectedHeap::fill_all_tlabs(bool retire) {
-  assert(UseTLAB, "should not reach here");
-  // See note in ensure_parsability() below.
-  assert(SafepointSynchronize::is_at_safepoint() ||
-         !is_init_completed(),
-         "should only fill tlabs at safepoint");
-  // The main thread starts allocating via a TLAB even before it
-  // has added itself to the threads list at vm boot-up.
-  assert(Threads::first() != NULL,
-         "Attempt to fill tlabs before main thread has been added"
-         " to threads list is doomed to failure!");
-  for(JavaThread *thread = Threads::first(); thread; thread = thread->next()) {
-     thread->tlab().make_parsable(retire);
-  }
-}
-
 void CollectedHeap::ensure_parsability(bool retire_tlabs) {
   // The second disjunct in the assertion below makes a concession
   // for the start-up verification done while the VM is being
@@ -270,8 +345,24 @@
          "Should only be called at a safepoint or at start-up"
          " otherwise concurrent mutator activity may make heap "
          " unparsable again");
-  if (UseTLAB) {
-    fill_all_tlabs(retire_tlabs);
+  const bool use_tlab = UseTLAB;
+  const bool deferred = _defer_initial_card_mark;
+  // The main thread starts allocating via a TLAB even before it
+  // has added itself to the threads list at vm boot-up.
+  assert(!use_tlab || Threads::first() != NULL,
+         "Attempt to fill tlabs before main thread has been added"
+         " to threads list is doomed to failure!");
+  for (JavaThread *thread = Threads::first(); thread; thread = thread->next()) {
+     if (use_tlab) thread->tlab().make_parsable(retire_tlabs);
+#ifdef COMPILER2
+     // The deferred store barriers must all have been flushed to the
+     // card-table (or other remembered set structure) before GC starts
+     // processing the card-table (or other remembered set).
+     if (deferred) flush_deferred_store_barrier(thread);
+#else
+     assert(!deferred, "Should be false");
+     assert(thread->deferred_card_mark().is_empty(), "Should be empty");
+#endif
   }
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/gc_interface/collectedHeap.hpp
--- a/src/share/vm/gc_interface/collectedHeap.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/gc_interface/collectedHeap.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -51,6 +51,9 @@
   // Used for filler objects (static, but initialized in ctor).
   static size_t _filler_array_max_size;
 
+  // Used in support of ReduceInitialCardMarks; only consulted if COMPILER2 is being used
+  bool _defer_initial_card_mark;
+
  protected:
   MemRegion _reserved;
   BarrierSet* _barrier_set;
@@ -70,13 +73,16 @@
   // Constructor
   CollectedHeap();
 
+  // Do common initializations that must follow instance construction,
+  // for example, those needing virtual calls.
+  // This code could perhaps be moved into initialize() but would
+  // be slightly more awkward because we want the latter to be a
+  // pure virtual.
+  void pre_initialize();
+
   // Create a new tlab
   virtual HeapWord* allocate_new_tlab(size_t size);
 
-  // Fix up tlabs to make the heap well-formed again,
-  // optionally retiring the tlabs.
-  virtual void fill_all_tlabs(bool retire);
-
   // Accumulate statistics on all tlabs.
   virtual void accumulate_statistics_all_tlabs();
 
@@ -127,14 +133,14 @@
   static inline size_t filler_array_max_size();
 
   DEBUG_ONLY(static void fill_args_check(HeapWord* start, size_t words);)
-  DEBUG_ONLY(static void zap_filler_array(HeapWord* start, size_t words);)
+  DEBUG_ONLY(static void zap_filler_array(HeapWord* start, size_t words, bool zap = true);)
 
   // Fill with a single array; caller must ensure filler_array_min_size() <=
   // words <= filler_array_max_size().
-  static inline void fill_with_array(HeapWord* start, size_t words);
+  static inline void fill_with_array(HeapWord* start, size_t words, bool zap = true);
 
   // Fill with a single object (either an int array or a java.lang.Object).
-  static inline void fill_with_object_impl(HeapWord* start, size_t words);
+  static inline void fill_with_object_impl(HeapWord* start, size_t words, bool zap = true);
 
   // Verification functions
   virtual void check_for_bad_heap_word_value(HeapWord* addr, size_t size)
@@ -239,6 +245,9 @@
     return p == NULL || is_in_closed_subset(p);
   }
 
+  // XXX is_permanent() and is_in_permanent() should be better named
+  // to distinguish one from the other.
+
   // Returns "TRUE" if "p" is allocated as "permanent" data.
   // If the heap does not use "permanent" data, returns the same
   // value is_in_reserved() would return.
@@ -247,13 +256,25 @@
   // space). If you need the more conservative answer use is_permanent().
   virtual bool is_in_permanent(const void *p) const = 0;
 
+  bool is_in_permanent_or_null(const void *p) const {
+    return p == NULL || is_in_permanent(p);
+  }
+
   // Returns "TRUE" if "p" is in the committed area of  "permanent" data.
   // If the heap does not use "permanent" data, returns the same
   // value is_in() would return.
   virtual bool is_permanent(const void *p) const = 0;
 
-  bool is_in_permanent_or_null(const void *p) const {
-    return p == NULL || is_in_permanent(p);
+  bool is_permanent_or_null(const void *p) const {
+    return p == NULL || is_permanent(p);
+  }
+
+  // An object is scavengable if its location may move during a scavenge.
+  // (A scavenge is a GC which is not a full GC.)
+  // Currently, this just means it is not perm (and not null).
+  // This could change if we rethink what's in perm-gen.
+  bool is_scavengable(const void *p) const {
+    return !is_in_permanent_or_null(p);
   }
 
   // Returns "TRUE" if "p" is a method oop in the
@@ -323,14 +344,14 @@
     return size_t(align_object_size(oopDesc::header_size()));
   }
 
-  static void fill_with_objects(HeapWord* start, size_t words);
+  static void fill_with_objects(HeapWord* start, size_t words, bool zap = true);
 
-  static void fill_with_object(HeapWord* start, size_t words);
-  static void fill_with_object(MemRegion region) {
-    fill_with_object(region.start(), region.word_size());
+  static void fill_with_object(HeapWord* start, size_t words, bool zap = true);
+  static void fill_with_object(MemRegion region, bool zap = true) {
+    fill_with_object(region.start(), region.word_size(), zap);
   }
-  static void fill_with_object(HeapWord* start, HeapWord* end) {
-    fill_with_object(start, pointer_delta(end, start));
+  static void fill_with_object(HeapWord* start, HeapWord* end, bool zap = true) {
+    fill_with_object(start, pointer_delta(end, start), zap);
   }
 
   // Some heaps may offer a contiguous region for shared non-blocking
@@ -400,9 +421,14 @@
     guarantee(false, "thread-local allocation buffers not supported");
     return 0;
   }
+
   // Can a compiler initialize a new object without store barriers?
   // This permission only extends from the creation of a new object
-  // via a TLAB up to the first subsequent safepoint.
+  // via a TLAB up to the first subsequent safepoint. If such permission
+  // is granted for this heap type, the compiler promises to call
+  // defer_store_barrier() below on any slow path allocation of
+  // a new object for which such initializing store barriers will
+  // have been elided.
   virtual bool can_elide_tlab_store_barriers() const = 0;
 
   // If a compiler is eliding store barriers for TLAB-allocated objects,
@@ -410,8 +436,30 @@
   // an object allocated anywhere.  The compiler's runtime support
   // promises to call this function on such a slow-path-allocated
   // object before performing initializations that have elided
-  // store barriers.  Returns new_obj, or maybe a safer copy thereof.
-  virtual oop new_store_barrier(oop new_obj);
+  // store barriers. Returns new_obj, or maybe a safer copy thereof.
+  virtual oop new_store_pre_barrier(JavaThread* thread, oop new_obj);
+
+  // Answers whether an initializing store to a new object currently
+  // allocated at the given address doesn't need a store
+  // barrier. Returns "true" if it doesn't need an initializing
+  // store barrier; answers "false" if it does.
+  virtual bool can_elide_initializing_store_barrier(oop new_obj) = 0;
+
+  // If a compiler is eliding store barriers for TLAB-allocated objects,
+  // we will be informed of a slow-path allocation by a call
+  // to new_store_pre_barrier() above. Such a call precedes the
+  // initialization of the object itself, and no post-store-barriers will
+  // be issued. Some heap types require that the barrier strictly follows
+  // the initializing stores. (This is currently implemented by deferring the
+  // barrier until the next slow-path allocation or gc-related safepoint.)
+  // This interface answers whether a particular heap type needs the card
+  // mark to be thus strictly sequenced after the stores.
+  virtual bool card_mark_must_follow_store() const = 0;
+
+  // If the CollectedHeap was asked to defer a store barrier above,
+  // this informs it to flush such a deferred store barrier to the
+  // remembered set.
+  virtual void flush_deferred_store_barrier(JavaThread* thread);
 
   // Can a compiler elide a store barrier when it writes
   // a permanent oop into the heap?  Applies when the compiler
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/includeDB_compiler1
--- a/src/share/vm/includeDB_compiler1	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/includeDB_compiler1	Thu Mar 25 16:54:59 2010 -0700
@@ -409,8 +409,6 @@
 
 compileBroker.cpp                       c1_Compiler.hpp
 
-frame.hpp                               c1_Defs.hpp
-
 frame_<arch>.cpp                        c1_Runtime1.hpp
 
 globals.cpp                             c1_globals.hpp
@@ -433,8 +431,6 @@
 
 os_<os_arch>.cpp                        c1_Runtime1.hpp
 
-registerMap.hpp                         c1_Defs.hpp
-
 safepoint.cpp                           c1_globals.hpp
 
 sharedRuntime.cpp                       c1_Runtime1.hpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/includeDB_compiler2
--- a/src/share/vm/includeDB_compiler2	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/includeDB_compiler2	Thu Mar 25 16:54:59 2010 -0700
@@ -149,11 +149,15 @@
 c2compiler.hpp                          abstractCompiler.hpp
 
 callGenerator.cpp                       addnode.hpp
+callGenerator.cpp                       bcEscapeAnalyzer.hpp
 callGenerator.cpp                       callGenerator.hpp
 callGenerator.cpp                       callnode.hpp
 callGenerator.cpp                       cfgnode.hpp
 callGenerator.cpp                       compileLog.hpp
 callGenerator.cpp                       connode.hpp
+callGenerator.cpp                       ciCPCache.hpp
+callGenerator.cpp                       ciMethodHandle.hpp
+callGenerator.cpp                       javaClasses.hpp
 callGenerator.cpp                       parse.hpp
 callGenerator.cpp                       rootnode.hpp
 callGenerator.cpp                       runtime.hpp
@@ -321,6 +325,7 @@
 compile.cpp                             rootnode.hpp
 compile.cpp                             runtime.hpp
 compile.cpp                             signature.hpp
+compile.cpp                             stringopts.hpp
 compile.cpp                             stubRoutines.hpp
 compile.cpp                             systemDictionary.hpp
 compile.cpp                             timer.hpp
@@ -389,6 +394,9 @@
 
 doCall.cpp                              addnode.hpp
 doCall.cpp                              callGenerator.hpp
+doCall.cpp                              ciCallSite.hpp
+doCall.cpp                              ciCPCache.hpp
+doCall.cpp                              ciMethodHandle.hpp
 doCall.cpp                              cfgnode.hpp
 doCall.cpp                              compileLog.hpp
 doCall.cpp                              linkResolver.hpp
@@ -476,12 +484,16 @@
 graphKit.cpp                            runtime.hpp
 graphKit.cpp                            sharedRuntime.hpp
 
+graphKit.hpp                            addnode.hpp
 graphKit.hpp                            callnode.hpp
 graphKit.hpp                            cfgnode.hpp
 graphKit.hpp                            ciEnv.hpp
+graphKit.hpp                            divnode.hpp
 graphKit.hpp                            compile.hpp
 graphKit.hpp                            deoptimization.hpp
 graphKit.hpp                            phaseX.hpp
+graphKit.hpp                            mulnode.hpp
+graphKit.hpp                            subnode.hpp
 graphKit.hpp                            type.hpp
 
 idealKit.cpp                            addnode.hpp
@@ -490,7 +502,10 @@
 idealKit.cpp                            idealKit.hpp
 idealKit.cpp				runtime.hpp
 
+idealKit.hpp                            addnode.hpp
+idealKit.hpp                            cfgnode.hpp
 idealKit.hpp                            connode.hpp
+idealKit.hpp                            divnode.hpp
 idealKit.hpp                            mulnode.hpp
 idealKit.hpp                            phaseX.hpp
 idealKit.hpp                            subnode.hpp
@@ -586,6 +601,7 @@
 
 loopTransform.cpp                       addnode.hpp
 loopTransform.cpp                       allocation.inline.hpp
+loopTransform.cpp                       callnode.hpp
 loopTransform.cpp                       connode.hpp
 loopTransform.cpp                       compileLog.hpp
 loopTransform.cpp                       divnode.hpp
@@ -641,6 +657,7 @@
 macro.cpp                               callnode.hpp
 macro.cpp                               cfgnode.hpp
 macro.cpp                               compile.hpp
+macro.cpp                              compileLog.hpp
 macro.cpp                               connode.hpp
 macro.cpp                               locknode.hpp
 macro.cpp                               loopnode.hpp
@@ -758,6 +775,7 @@
 output.cpp                              assembler.inline.hpp
 output.cpp                              callnode.hpp
 output.cpp                              cfgnode.hpp
+output.cpp                              compileBroker.hpp
 output.cpp                              debugInfo.hpp
 output.cpp                              debugInfoRec.hpp
 output.cpp                              handles.inline.hpp
@@ -993,6 +1011,21 @@
 split_if.cpp                            connode.hpp
 split_if.cpp                            loopnode.hpp
 
+stringopts.hpp                          phaseX.hpp
+stringopts.hpp                          node.hpp
+
+stringopts.cpp                          addnode.hpp
+stringopts.cpp                          callnode.hpp
+stringopts.cpp                          callGenerator.hpp
+stringopts.cpp                          compileLog.hpp
+stringopts.cpp                          divnode.hpp
+stringopts.cpp                          idealKit.hpp
+stringopts.cpp                          graphKit.hpp
+stringopts.cpp                          rootnode.hpp
+stringopts.cpp                          runtime.hpp
+stringopts.cpp                          subnode.hpp
+stringopts.cpp                          stringopts.hpp
+
 stubGenerator_<arch_model>.cpp          runtime.hpp
 
 stubRoutines.cpp                        runtime.hpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/includeDB_core
--- a/src/share/vm/includeDB_core	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/includeDB_core	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 //
-// Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+// Copyright 1997-2010 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
@@ -175,6 +175,8 @@
 arguments.cpp                           management.hpp
 arguments.cpp                           oop.inline.hpp
 arguments.cpp                           os_<os_family>.inline.hpp
+arguments.cpp                           referenceProcessor.hpp
+arguments.cpp                           taskqueue.hpp
 arguments.cpp                           universe.inline.hpp
 arguments.cpp                           vm_version_<arch>.hpp
 
@@ -289,7 +291,7 @@
 attachListener.hpp                      debug.hpp
 attachListener.hpp                      ostream.hpp
 
-barrierSet.cpp				barrierSet.hpp
+barrierSet.cpp				barrierSet.inline.hpp
 barrierSet.cpp			        collectedHeap.hpp
 barrierSet.cpp				universe.hpp
 
@@ -516,6 +518,11 @@
 
 ciCallProfile.hpp                       ciClassList.hpp
 
+ciCallSite.cpp                          ciCallSite.hpp
+ciCallSite.cpp                          ciUtilities.hpp
+
+ciCallSite.hpp                          ciInstance.hpp
+
 ciConstant.cpp                          allocation.hpp
 ciConstant.cpp                          allocation.inline.hpp
 ciConstant.cpp                          ciConstant.hpp
@@ -532,6 +539,12 @@
 ciConstantPoolCache.hpp                 growableArray.hpp
 ciConstantPoolCache.hpp                 resourceArea.hpp
 
+ciCPCache.cpp                           cpCacheOop.hpp
+ciCPCache.cpp                           ciCPCache.hpp
+
+ciCPCache.hpp                           ciClassList.hpp
+ciCPCache.hpp                           ciObject.hpp
+
 ciEnv.cpp                               allocation.inline.hpp
 ciEnv.cpp                               ciConstant.hpp
 ciEnv.cpp                               ciEnv.hpp
@@ -570,6 +583,7 @@
 ciEnv.hpp                               dependencies.hpp
 ciEnv.hpp                               exceptionHandlerTable.hpp
 ciEnv.hpp                               oopMap.hpp
+ciEnv.hpp                               systemDictionary.hpp
 ciEnv.hpp                               thread.hpp
 
 ciExceptionHandler.cpp                  ciExceptionHandler.hpp
@@ -592,6 +606,7 @@
 ciField.hpp                             ciClassList.hpp
 ciField.hpp                             ciConstant.hpp
 ciField.hpp                             ciFlags.hpp
+ciField.hpp                             ciInstance.hpp
 
 ciFlags.cpp                             ciFlags.hpp
 
@@ -678,6 +693,7 @@
 ciMethod.hpp                            ciInstanceKlass.hpp
 ciMethod.hpp                            ciObject.hpp
 ciMethod.hpp                            ciSignature.hpp
+ciMethod.hpp                            methodHandles.hpp
 ciMethod.hpp                            methodLiveness.hpp
 
 ciMethodBlocks.cpp                      bytecode.hpp
@@ -709,6 +725,15 @@
 ciMethodKlass.hpp                       ciKlass.hpp
 ciMethodKlass.hpp                       ciSymbol.hpp
 
+ciMethodHandle.cpp                      ciClassList.hpp
+ciMethodHandle.cpp                      ciInstance.hpp
+ciMethodHandle.cpp                      ciMethodHandle.hpp
+ciMethodHandle.cpp                      ciUtilities.hpp
+ciMethodHandle.cpp                      methodHandles.hpp
+ciMethodHandle.cpp                      methodHandleWalk.hpp
+
+ciMethodHandle.hpp                      methodHandles.hpp
+
 ciNullObject.cpp                        ciNullObject.hpp
 
 ciNullObject.hpp                        ciClassList.hpp
@@ -754,11 +779,14 @@
 ciObject.hpp                            jniHandles.hpp
 
 ciObjectFactory.cpp                     allocation.inline.hpp
+ciObjectFactory.cpp                     ciCallSite.hpp
+ciObjectFactory.cpp                     ciCPCache.hpp
 ciObjectFactory.cpp                     ciInstance.hpp
 ciObjectFactory.cpp                     ciInstanceKlass.hpp
 ciObjectFactory.cpp                     ciInstanceKlassKlass.hpp
 ciObjectFactory.cpp                     ciMethod.hpp
 ciObjectFactory.cpp                     ciMethodData.hpp
+ciObjectFactory.cpp                     ciMethodHandle.hpp
 ciObjectFactory.cpp                     ciMethodKlass.hpp
 ciObjectFactory.cpp                     ciNullObject.hpp
 ciObjectFactory.cpp                     ciObjArray.hpp
@@ -792,6 +820,7 @@
 ciSignature.hpp                         globalDefinitions.hpp
 ciSignature.hpp                         growableArray.hpp
 
+ciStreams.cpp                           ciCallSite.hpp
 ciStreams.cpp                           ciConstant.hpp
 ciStreams.cpp                           ciField.hpp
 ciStreams.cpp                           ciStreams.hpp
@@ -894,6 +923,7 @@
 
 classLoader.cpp                         allocation.inline.hpp
 classLoader.cpp                         arguments.hpp
+classLoader.cpp                         bytecodeStream.hpp
 classLoader.cpp                         classFileParser.hpp
 classLoader.cpp                         classFileStream.hpp
 classLoader.cpp                         classLoader.hpp
@@ -921,6 +951,7 @@
 classLoader.cpp                         management.hpp
 classLoader.cpp                         oop.inline.hpp
 classLoader.cpp                         oopFactory.hpp
+classLoader.cpp                         oopMapCache.hpp
 classLoader.cpp                         os_<os_family>.inline.hpp
 classLoader.cpp                         symbolOop.hpp
 classLoader.cpp                         systemDictionary.hpp
@@ -991,6 +1022,7 @@
 codeCache.cpp                           codeCache.hpp
 codeCache.cpp                           dependencies.hpp
 codeCache.cpp                           gcLocker.hpp
+codeCache.cpp                           handles.inline.hpp
 codeCache.cpp                           icache.hpp
 codeCache.cpp                           iterator.hpp
 codeCache.cpp                           java.hpp
@@ -1003,6 +1035,7 @@
 codeCache.cpp                           oop.inline.hpp
 codeCache.cpp                           pcDesc.hpp
 codeCache.cpp                           resourceArea.hpp
+codeCache.cpp                           xmlstream.hpp
 
 codeCache.hpp                           allocation.hpp
 codeCache.hpp                           codeBlob.hpp
@@ -1091,6 +1124,7 @@
 compileBroker.cpp                       oop.inline.hpp
 compileBroker.cpp                       os.hpp
 compileBroker.cpp                       sharedRuntime.hpp
+compileBroker.cpp                       sweeper.hpp
 compileBroker.cpp                       systemDictionary.hpp
 compileBroker.cpp                       vmSymbols.hpp
 
@@ -1291,6 +1325,7 @@
 cpCacheOop.cpp                          markSweep.inline.hpp
 cpCacheOop.cpp                          objArrayOop.hpp
 cpCacheOop.cpp                          oop.inline.hpp
+cpCacheOop.cpp                          rewriter.hpp
 cpCacheOop.cpp                          universe.inline.hpp
 
 cpCacheOop.hpp                          allocation.hpp
@@ -1451,6 +1486,7 @@
 deoptimization.cpp                      vframe.hpp
 deoptimization.cpp                      vframeArray.hpp
 deoptimization.cpp                      vframe_hp.hpp
+deoptimization.cpp                      vmreg_<arch>.inline.hpp
 deoptimization.cpp                      xmlstream.hpp
 
 deoptimization.hpp                      allocation.hpp
@@ -1497,6 +1533,7 @@
 disassembler.cpp                        fprofiler.hpp
 disassembler.cpp                        handles.inline.hpp
 disassembler.cpp                        hpi.hpp
+disassembler.cpp                        javaClasses.hpp
 disassembler.cpp                        stubCodeGenerator.hpp
 disassembler.cpp                        stubRoutines.hpp
 
@@ -1987,6 +2024,7 @@
 
 instanceKlass.cpp                       collectedHeap.inline.hpp
 instanceKlass.cpp                       compileBroker.hpp
+instanceKlass.cpp                       dtrace.hpp
 instanceKlass.cpp                       fieldDescriptor.hpp
 instanceKlass.cpp                       genOopClosures.inline.hpp
 instanceKlass.cpp                       handles.inline.hpp
@@ -2446,6 +2484,7 @@
 jvm.cpp                                 collectedHeap.inline.hpp
 jvm.cpp                                 copy.hpp
 jvm.cpp                                 defaultStream.hpp
+jvm.cpp                                 dtrace.hpp
 jvm.cpp                                 dtraceJSDT.hpp
 jvm.cpp                                 events.hpp
 jvm.cpp                                 handles.inline.hpp
@@ -2501,6 +2540,7 @@
 jvmtiExport.hpp                         handles.hpp
 jvmtiExport.hpp                         iterator.hpp
 jvmtiExport.hpp                         jvmti.h
+jvmtiExport.hpp                         jvmticmlr.h
 jvmtiExport.hpp                         oop.hpp
 jvmtiExport.hpp                         oopsHierarchy.hpp
 
@@ -2619,6 +2659,7 @@
 loaderConstraints.cpp                   safepoint.hpp
 
 loaderConstraints.hpp                   dictionary.hpp
+loaderConstraints.hpp                   placeholders.hpp
 loaderConstraints.hpp                   hashtable.hpp
 
 location.cpp                            debugInfo.hpp
@@ -2684,6 +2725,7 @@
 markOop.inline.hpp                      markOop.hpp
 
 markSweep.cpp                           compileBroker.hpp
+markSweep.cpp                           methodDataOop.hpp
 
 markSweep.hpp                           collectedHeap.hpp
 
@@ -2811,6 +2853,12 @@
 methodDataOop.hpp                       orderAccess.hpp
 methodDataOop.hpp                       universe.hpp
 
+methodHandleWalk.hpp                    methodHandles.hpp
+
+methodHandleWalk.cpp                    methodHandleWalk.hpp
+methodHandleWalk.cpp                    oopFactory.hpp
+methodHandleWalk.cpp                    rewriter.hpp
+
 methodHandles.hpp                       frame.inline.hpp
 methodHandles.hpp                       globals.hpp
 methodHandles.hpp                       interfaceSupport.hpp
@@ -3468,6 +3516,7 @@
 reflection.cpp                          javaClasses.hpp
 reflection.cpp                          jvm.h
 reflection.cpp                          linkResolver.hpp
+reflection.cpp                          methodHandleWalk.hpp
 reflection.cpp                          objArrayKlass.hpp
 reflection.cpp                          objArrayOop.hpp
 reflection.cpp                          oopFactory.hpp
@@ -3679,6 +3728,7 @@
 sharedRuntime.cpp                       abstractCompiler.hpp
 sharedRuntime.cpp                       arguments.hpp
 sharedRuntime.cpp                       biasedLocking.hpp
+sharedRuntime.cpp                       compileBroker.hpp
 sharedRuntime.cpp                       compiledIC.hpp
 sharedRuntime.cpp                       compilerOracle.hpp
 sharedRuntime.cpp                       copy.hpp
@@ -3687,6 +3737,7 @@
 sharedRuntime.cpp                       forte.hpp
 sharedRuntime.cpp                       gcLocker.inline.hpp
 sharedRuntime.cpp                       handles.inline.hpp
+sharedRuntime.cpp                       hashtable.inline.hpp
 sharedRuntime.cpp                       init.hpp
 sharedRuntime.cpp                       interfaceSupport.hpp
 sharedRuntime.cpp                       interpreterRuntime.hpp
@@ -3714,6 +3765,7 @@
 sharedRuntime.hpp                       allocation.hpp
 sharedRuntime.hpp                       bytecodeHistogram.hpp
 sharedRuntime.hpp                       bytecodeTracer.hpp
+sharedRuntime.hpp                       hashtable.hpp
 sharedRuntime.hpp                       linkResolver.hpp
 sharedRuntime.hpp                       resourceArea.hpp
 sharedRuntime.hpp                       threadLocalStorage.hpp
@@ -3931,6 +3983,7 @@
 
 sweeper.cpp                             atomic.hpp
 sweeper.cpp                             codeCache.hpp
+sweeper.cpp                             compileBroker.hpp
 sweeper.cpp                             events.hpp
 sweeper.cpp                             methodOop.hpp
 sweeper.cpp                             mutexLocker.hpp
@@ -3938,6 +3991,8 @@
 sweeper.cpp                             os.hpp
 sweeper.cpp                             resourceArea.hpp
 sweeper.cpp                             sweeper.hpp
+sweeper.cpp                             vm_operations.hpp
+sweeper.cpp                             xmlstream.hpp
 
 symbolKlass.cpp                         gcLocker.hpp
 symbolKlass.cpp                         handles.inline.hpp
@@ -4396,6 +4451,7 @@
 
 unsafe.cpp                              allocation.inline.hpp
 unsafe.cpp                              copy.hpp
+unsafe.cpp                              dtrace.hpp
 unsafe.cpp                              globals.hpp
 unsafe.cpp                              interfaceSupport.hpp
 unsafe.cpp                              jni.h
@@ -4567,6 +4623,7 @@
 
 vmThread.cpp                            collectedHeap.hpp
 vmThread.cpp                            compileBroker.hpp
+vmThread.cpp                            dtrace.hpp
 vmThread.cpp                            events.hpp
 vmThread.cpp                            interfaceSupport.hpp
 vmThread.cpp                            methodOop.hpp
@@ -4591,6 +4648,7 @@
 vm_operations.cpp                       interfaceSupport.hpp
 vm_operations.cpp                       isGCActiveMark.hpp
 vm_operations.cpp                       resourceArea.hpp
+vm_operations.cpp                       sweeper.hpp
 vm_operations.cpp                       threadService.hpp
 vm_operations.cpp                       thread_<os_family>.inline.hpp
 vm_operations.cpp                       vmSymbols.hpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/includeDB_gc_parallel
--- a/src/share/vm/includeDB_gc_parallel	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/includeDB_gc_parallel	Thu Mar 25 16:54:59 2010 -0700
@@ -21,6 +21,8 @@
 // have any questions.
 //  
 
+arguments.cpp                           compactibleFreeListSpace.hpp
+
 assembler_<arch>.cpp                    g1SATBCardTableModRefBS.hpp
 assembler_<arch>.cpp                    g1CollectedHeap.inline.hpp
 assembler_<arch>.cpp                    heapRegion.hpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/includeDB_zero
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/includeDB_zero	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,55 @@
+//
+// Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
+// Copyright 2009 Red Hat, Inc.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 2 only, as
+// published by the Free Software Foundation.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+// CA 95054 USA or visit www.sun.com if you need additional information or
+// have any questions.
+//  
+//
+
+// NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
+
+entryFrame_<arch>.hpp                   javaCalls.hpp
+entryFrame_<arch>.hpp                   stack_<arch>.hpp
+
+fakeStubFrame_<arch>.hpp                stack_<arch>.hpp
+
+frame.hpp                               stack_<arch>.hpp
+
+frame.inline.hpp                        fakeStubFrame_<arch>.hpp
+frame.inline.hpp                        entryFrame_<arch>.hpp
+frame.inline.hpp                        interpreterFrame_<arch>.hpp
+frame.inline.hpp                        sharkFrame_<arch>.hpp
+
+frame_<arch>.cpp                        interpreterRuntime.hpp
+frame_<arch>.cpp                        scopeDesc.hpp
+
+interpreter.hpp                         entry_<arch>.hpp
+
+interpreterFrame_<arch>.hpp             bytecodeInterpreter.hpp
+interpreterFrame_<arch>.hpp             methodOop.hpp
+interpreterFrame_<arch>.hpp             stack_<arch>.hpp
+interpreterFrame_<arch>.hpp             thread.hpp
+
+sharkFrame_<arch>.hpp                   methodOop.hpp
+sharkFrame_<arch>.hpp                   stack_<arch>.hpp
+
+stack_<arch>.hpp                        sizes.hpp
+
+thread.hpp                              stack_<arch>.hpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/abstractInterpreter.hpp
--- a/src/share/vm/interpreter/abstractInterpreter.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/abstractInterpreter.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -109,6 +109,8 @@
 
   static void       print_method_kind(MethodKind kind)          PRODUCT_RETURN;
 
+  static bool       can_be_compiled(methodHandle m);
+
   // Runtime support
 
   // length = invoke bytecode length (to advance to next bytecode)
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/bytecode.cpp
--- a/src/share/vm/interpreter/bytecode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/bytecode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -102,7 +102,9 @@
   KlassHandle resolved_klass;
   constantPoolHandle constants(THREAD, _method->constants());
 
-  if (adjusted_invoke_code() != Bytecodes::_invokeinterface) {
+  if (adjusted_invoke_code() == Bytecodes::_invokedynamic) {
+    LinkResolver::resolve_dynamic_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
+  } else if (adjusted_invoke_code() != Bytecodes::_invokeinterface) {
     LinkResolver::resolve_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
   } else {
     LinkResolver::resolve_interface_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/bytecode.hpp
--- a/src/share/vm/interpreter/bytecode.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/bytecode.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -205,12 +205,14 @@
   bool is_invokespecial() const                  { return adjusted_invoke_code() == Bytecodes::_invokespecial; }
   bool is_invokedynamic() const                  { return adjusted_invoke_code() == Bytecodes::_invokedynamic; }
 
+  bool has_receiver() const                      { return !is_invokestatic() && !is_invokedynamic(); }
   bool has_giant_index() const                   { return is_invokedynamic(); }
 
   bool is_valid() const                          { return is_invokeinterface() ||
                                                           is_invokevirtual()   ||
                                                           is_invokestatic()    ||
-                                                          is_invokespecial();     }
+                                                          is_invokespecial()   ||
+                                                          is_invokedynamic(); }
 
   // Creation
   inline friend Bytecode_invoke* Bytecode_invoke_at(methodHandle method, int bci);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/bytecodeInterpreter.cpp
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -281,7 +281,7 @@
 
 #define DO_BACKEDGE_CHECKS(skip, branch_pc)                                                         \
     if ((skip) <= 0) {                                                                              \
-      if (UseCompiler && UseLoopCounter) {                                                          \
+      if (UseLoopCounter) {                                                                         \
         bool do_OSR = UseOnStackReplacement;                                                        \
         BACKEDGE_COUNT->increment();                                                                \
         if (do_OSR) do_OSR = BACKEDGE_COUNT->reached_InvocationLimit();                             \
@@ -289,16 +289,12 @@
           nmethod*  osr_nmethod;                                                                    \
           OSR_REQUEST(osr_nmethod, branch_pc);                                                      \
           if (osr_nmethod != NULL && osr_nmethod->osr_entry_bci() != InvalidOSREntryBci) {          \
-            intptr_t* buf;                                                                          \
-            CALL_VM(buf=SharedRuntime::OSR_migration_begin(THREAD), handle_exception);              \
+            intptr_t* buf = SharedRuntime::OSR_migration_begin(THREAD);                             \
             istate->set_msg(do_osr);                                                                \
             istate->set_osr_buf((address)buf);                                                      \
             istate->set_osr_entry(osr_nmethod->osr_entry());                                        \
             return;                                                                                 \
           }                                                                                         \
-        } else {                                                                                    \
-          INCR_INVOCATION_COUNT;                                                                    \
-          SAFEPOINT;                                                                                \
         }                                                                                           \
       }  /* UseCompiler ... */                                                                      \
       INCR_INVOCATION_COUNT;                                                                        \
@@ -1281,12 +1277,7 @@
           jfloat f;
           jdouble r;
           f = STACK_FLOAT(-1);
-#ifdef IA64
-          // IA64 gcc bug
-          r = ( f == 0.0f ) ? (jdouble) f : (jdouble) f + ia64_double_zero;
-#else
           r = (jdouble) f;
-#endif
           MORE_STACK(-1); // POP
           SET_STACK_DOUBLE(r, 1);
           UPDATE_PC_AND_TOS_AND_CONTINUE(1, 2);
@@ -3031,9 +3022,9 @@
   tty->print_cr("&native_fresult: " INTPTR_FORMAT, (uintptr_t) &this->_native_fresult);
   tty->print_cr("native_lresult: " INTPTR_FORMAT, (uintptr_t) this->_native_lresult);
 #endif
-#ifdef IA64
+#if defined(IA64) && !defined(ZERO)
   tty->print_cr("last_Java_fp: " INTPTR_FORMAT, (uintptr_t) this->_last_Java_fp);
-#endif // IA64
+#endif // IA64 && !ZERO
   tty->print_cr("self_link: " INTPTR_FORMAT, (uintptr_t) this->_self_link);
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/bytecodeTracer.cpp
--- a/src/share/vm/interpreter/bytecodeTracer.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/bytecodeTracer.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -270,6 +270,8 @@
     st->print_cr(" %s", constants->resolved_klass_at(i)->klass_part()->external_name());
   } else if (tag.is_unresolved_klass()) {
     st->print_cr(" <unresolved klass at %d>", i);
+  } else if (tag.is_object()) {
+    st->print_cr(" " PTR_FORMAT, constants->object_at(i));
   } else {
     st->print_cr(" bad tag=%d at %d", tag.value(), i);
   }
@@ -282,18 +284,21 @@
   constantPoolOop constants = method()->constants();
   constantTag tag = constants->tag_at(i);
 
+  int nt_index = -1;
+
   switch (tag.value()) {
   case JVM_CONSTANT_InterfaceMethodref:
   case JVM_CONSTANT_Methodref:
   case JVM_CONSTANT_Fieldref:
+  case JVM_CONSTANT_NameAndType:
     break;
   default:
     st->print_cr(" bad tag=%d at %d", tag.value(), i);
     return;
   }
 
-  symbolOop name = constants->name_ref_at(orig_i);
-  symbolOop signature = constants->signature_ref_at(orig_i);
+  symbolOop name = constants->uncached_name_ref_at(i);
+  symbolOop signature = constants->uncached_signature_ref_at(i);
   st->print_cr(" %d <%s> <%s> ", i, name->as_C_string(), signature->as_C_string());
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/bytecodes.cpp
--- a/src/share/vm/interpreter/bytecodes.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/bytecodes.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -357,7 +357,7 @@
   def(_invokespecial       , "invokespecial"       , "bjj"  , NULL    , T_ILLEGAL, -1, true);
   def(_invokestatic        , "invokestatic"        , "bjj"  , NULL    , T_ILLEGAL,  0, true);
   def(_invokeinterface     , "invokeinterface"     , "bjj__", NULL    , T_ILLEGAL, -1, true);
-  def(_invokedynamic       , "invokedynamic"       , "bjjjj", NULL    , T_ILLEGAL, -1, true );
+  def(_invokedynamic       , "invokedynamic"       , "bjjjj", NULL    , T_ILLEGAL,  0, true );
   def(_new                 , "new"                 , "bii"  , NULL    , T_OBJECT ,  1, true );
   def(_newarray            , "newarray"            , "bc"   , NULL    , T_OBJECT ,  0, true );
   def(_anewarray           , "anewarray"           , "bii"  , NULL    , T_OBJECT ,  0, true );
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/interpreter.cpp
--- a/src/share/vm/interpreter/interpreter.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/interpreter.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -314,6 +314,20 @@
       break;
     }
 
+   case Bytecodes::_invokedynamic: {
+      Thread *thread = Thread::current();
+      ResourceMark rm(thread);
+      methodHandle mh(thread, method);
+      type = Bytecode_invoke_at(mh, bci)->result_type(thread);
+      // since the cache entry might not be initialized:
+      // (NOT needed for the old calling convension)
+      if (!is_top_frame) {
+        int index = Bytes::get_native_u4(bcp+1);
+        method->constants()->cache()->secondary_entry_at(index)->set_parameter_size(callee_parameters);
+      }
+      break;
+    }
+
     case Bytecodes::_ldc   :
       type = constant_pool_type( method, *(bcp+1) );
       break;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/interpreterRuntime.cpp
--- a/src/share/vm/interpreter/interpreterRuntime.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -353,7 +353,7 @@
     assert(h_exception.not_null(), "NULL exceptions should be handled by athrow");
     assert(h_exception->is_oop(), "just checking");
     // Check that exception is a subclass of Throwable, otherwise we have a VerifyError
-    if (!(h_exception->is_a(SystemDictionary::throwable_klass()))) {
+    if (!(h_exception->is_a(SystemDictionary::Throwable_klass()))) {
       if (ExitVMOnVerifyError) vm_exit(-1);
       ShouldNotReachHere();
     }
@@ -397,7 +397,7 @@
 
   // notify JVMTI of an exception throw; JVMTI will detect if this is a first
   // time throw or a stack unwinding throw and accordingly notify the debugger
-  if (JvmtiExport::can_post_exceptions()) {
+  if (JvmtiExport::can_post_on_exceptions()) {
     JvmtiExport::post_exception_throw(thread, h_method(), bcp(thread), h_exception());
   }
 
@@ -426,7 +426,7 @@
   }
   // notify debugger of an exception catch
   // (this is good for exceptions caught in native methods as well)
-  if (JvmtiExport::can_post_exceptions()) {
+  if (JvmtiExport::can_post_on_exceptions()) {
     JvmtiExport::notice_unwind_due_to_exception(thread, h_method(), handler_pc, h_exception(), (handler_pc != NULL));
   }
 
@@ -585,7 +585,7 @@
   Handle exception(thread, thread->vm_result());
   assert(exception() != NULL, "vm result should be set");
   thread->set_vm_result(NULL); // clear vm result before continuing (may cause memory leaks and assert failures)
-  if (!exception->is_a(SystemDictionary::threaddeath_klass())) {
+  if (!exception->is_a(SystemDictionary::ThreadDeath_klass())) {
     exception = get_preinitialized_exception(
                        SystemDictionary::IllegalMonitorStateException_klass(),
                        CATCH);
@@ -660,7 +660,7 @@
       tty->print_cr("Resolving: klass: %s to method: %s", info.resolved_klass()->name()->as_C_string(), info.resolved_method()->name()->as_C_string());
     }
     if (info.resolved_method()->method_holder() ==
-                                            SystemDictionary::object_klass()) {
+                                            SystemDictionary::Object_klass()) {
       // NOTE: THIS IS A FIX FOR A CORNER CASE in the JVM spec
       // (see also cpCacheOop.cpp for details)
       methodHandle rm = info.resolved_method();
@@ -681,7 +681,7 @@
 IRT_END
 
 
-// First time execution:  Resolve symbols, create a permanent CallSiteImpl object.
+// First time execution:  Resolve symbols, create a permanent CallSite object.
 IRT_ENTRY(void, InterpreterRuntime::resolve_invokedynamic(JavaThread* thread)) {
   ResourceMark rm(thread);
 
@@ -708,21 +708,16 @@
   constantPoolHandle pool(thread, caller_method->constants());
   pool->set_invokedynamic();    // mark header to flag active call sites
 
-  int raw_index = four_byte_index(thread);
-  assert(constantPoolCacheOopDesc::is_secondary_index(raw_index), "invokedynamic indexes marked specially");
-
-  // there are two CPC entries that are of interest:
-  int site_index = constantPoolCacheOopDesc::decode_secondary_index(raw_index);
-  int main_index = pool->cache()->entry_at(site_index)->main_entry_index();
-  // and there is one CP entry, a NameAndType:
-  int nt_index = pool->map_instruction_operand_to_index(raw_index);
+  int site_index = four_byte_index(thread);
+  // there is a second CPC entries that is of interest; it caches signature info:
+  int main_index = pool->cache()->secondary_entry_at(site_index)->main_entry_index();
 
   // first resolve the signature to a MH.invoke methodOop
   if (!pool->cache()->entry_at(main_index)->is_resolved(bytecode)) {
     JvmtiHideSingleStepping jhss(thread);
     CallInfo info;
     LinkResolver::resolve_invoke(info, Handle(), pool,
-                                 raw_index, bytecode, CHECK);
+                                 site_index, bytecode, CHECK);
     // The main entry corresponds to a JVM_CONSTANT_NameAndType, and serves
     // as a common reference point for all invokedynamic call sites with
     // that exact call descriptor.  We will link it in the CP cache exactly
@@ -741,7 +736,7 @@
   assert(mh_invdyn.not_null() && mh_invdyn->is_method() && mh_invdyn->is_method_handle_invoke(),
          "correct result from LinkResolver::resolve_invokedynamic");
 
-  symbolHandle call_site_name(THREAD, pool->nt_name_ref_at(nt_index));
+  symbolHandle call_site_name(THREAD, pool->name_ref_at(site_index));
   Handle call_site
     = SystemDictionary::make_dynamic_call_site(caller_method->method_holder(),
                                                caller_method->method_idnum(),
@@ -753,61 +748,11 @@
   // In the secondary entry, the f1 field is the call site, and the f2 (index)
   // field is some data about the invoke site.
   int extra_data = 0;
-  pool->cache()->entry_at(site_index)->set_dynamic_call(call_site(), extra_data);
+  pool->cache()->secondary_entry_at(site_index)->set_dynamic_call(call_site(), extra_data);
 }
 IRT_END
 
 
-// Called on first time execution, and also whenever the CallSite.target is null.
-// FIXME:  Do more of this in Java code.
-IRT_ENTRY(void, InterpreterRuntime::bootstrap_invokedynamic(JavaThread* thread, oopDesc* call_site)) {
-  methodHandle   mh_invdyn(thread, (methodOop) sun_dyn_CallSiteImpl::vmmethod(call_site));
-  Handle         mh_type(thread,   mh_invdyn->method_handle_type());
-  objArrayHandle mh_ptypes(thread, java_dyn_MethodType::ptypes(mh_type()));
-
-  // squish the arguments down to a single array
-  int nargs = mh_ptypes->length();
-  objArrayHandle arg_array;
-  {
-    objArrayOop aaoop = oopFactory::new_objArray(SystemDictionary::object_klass(), nargs, CHECK);
-    arg_array = objArrayHandle(thread, aaoop);
-  }
-  frame fr = thread->last_frame();
-  assert(fr.interpreter_frame_bcp() != NULL, "sanity");
-  int tos_offset = 0;
-  for (int i = nargs; --i >= 0; ) {
-    intptr_t* slot_addr = fr.interpreter_frame_tos_at(tos_offset++);
-    oop ptype = mh_ptypes->obj_at(i);
-    oop arg = NULL;
-    if (!java_lang_Class::is_primitive(ptype)) {
-      arg = *(oop*) slot_addr;
-    } else {
-      BasicType bt = java_lang_Class::primitive_type(ptype);
-      assert(frame::interpreter_frame_expression_stack_direction() < 0, "else reconsider this code");
-      jvalue value;
-      Interpreter::get_jvalue_in_slot(slot_addr, bt, &value);
-      tos_offset += type2size[bt]-1;
-      arg = java_lang_boxing_object::create(bt, &value, CHECK);
-      // FIXME:  These boxing objects are not canonicalized under
-      // the Java autoboxing rules.  They should be...
-      // The best approach would be to push the arglist creation into Java.
-      // The JVM should use a lower-level interface to communicate argument lists.
-    }
-    arg_array->obj_at_put(i, arg);
-  }
-
-  // now find the bootstrap method
-  oop bootstrap_mh_oop = instanceKlass::cast(fr.interpreter_frame_method()->method_holder())->bootstrap_method();
-  assert(bootstrap_mh_oop != NULL, "resolve_invokedynamic ensures a BSM");
-
-  // return the bootstrap method and argument array via vm_result/_2
-  thread->set_vm_result(bootstrap_mh_oop);
-  thread->set_vm_result_2(arg_array());
-}
-IRT_END
-
-
-
 //------------------------------------------------------------------------------------------------------------------------
 // Miscellaneous
 
@@ -849,8 +794,25 @@
 }
 #endif // !PRODUCT
 
+nmethod* InterpreterRuntime::frequency_counter_overflow(JavaThread* thread, address branch_bcp) {
+  nmethod* nm = frequency_counter_overflow_inner(thread, branch_bcp);
+  assert(branch_bcp != NULL || nm == NULL, "always returns null for non OSR requests");
+  if (branch_bcp != NULL && nm != NULL) {
+    // This was a successful request for an OSR nmethod.  Because
+    // frequency_counter_overflow_inner ends with a safepoint check,
+    // nm could have been unloaded so look it up again.  It's unsafe
+    // to examine nm directly since it might have been freed and used
+    // for something else.
+    frame fr = thread->last_frame();
+    methodOop method =  fr.interpreter_frame_method();
+    int bci = method->bci_from(fr.interpreter_frame_bcp());
+    nm = method->lookup_osr_nmethod_for(bci);
+  }
+  return nm;
+}
+
 IRT_ENTRY(nmethod*,
-          InterpreterRuntime::frequency_counter_overflow(JavaThread* thread, address branch_bcp))
+          InterpreterRuntime::frequency_counter_overflow_inner(JavaThread* thread, address branch_bcp))
   // use UnlockFlagSaver to clear and restore the _do_not_unlock_if_synchronized
   // flag, in case this method triggers classloading which will call into Java.
   UnlockFlagSaver fs(thread);
@@ -923,7 +885,6 @@
         }
         BiasedLocking::revoke(objects_to_revoke);
       }
-
       return osr_nm;
     }
   }
@@ -1289,7 +1250,7 @@
   methodHandle mh(thread, fr.interpreter_frame_method());
   Bytecode_invoke* invoke = Bytecode_invoke_at(mh, bci);
   ArgumentSizeComputer asc(invoke->signature());
-  int size_of_arguments = (asc.size() + (invoke->is_invokestatic() ? 0 : 1)); // receiver
+  int size_of_arguments = (asc.size() + (invoke->has_receiver() ? 1 : 0)); // receiver
   Copy::conjoint_bytes(src_address, dest_address,
                        size_of_arguments * Interpreter::stackElementSize());
 IRT_END
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/interpreterRuntime.hpp
--- a/src/share/vm/interpreter/interpreterRuntime.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/interpreterRuntime.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -49,6 +49,9 @@
   static ConstantPoolCacheEntry* cache_entry(JavaThread *thread)            { return cache_entry_at(thread, Bytes::get_native_u2(bcp(thread) + 1)); }
   static void      note_trap(JavaThread *thread, int reason, TRAPS);
 
+  // Inner work method for Interpreter's frequency counter overflow
+  static nmethod* frequency_counter_overflow_inner(JavaThread* thread, address branch_bcp);
+
  public:
   // Constants
   static void    ldc           (JavaThread* thread, bool wide);
@@ -88,7 +91,6 @@
   // Calls
   static void    resolve_invoke       (JavaThread* thread, Bytecodes::Code bytecode);
   static void    resolve_invokedynamic(JavaThread* thread);
-  static void  bootstrap_invokedynamic(JavaThread* thread, oopDesc* call_site);
 
   // Breakpoints
   static void _breakpoint(JavaThread* thread, methodOopDesc* method, address bcp);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/linkResolver.cpp
--- a/src/share/vm/interpreter/linkResolver.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/linkResolver.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -55,7 +55,7 @@
   // we should pick the vtable index from the resolved method.
   // Other than that case, there is no valid vtable index to specify.
   int vtable_index = methodOopDesc::invalid_vtable_index;
-  if (resolved_method->method_holder() == SystemDictionary::object_klass()) {
+  if (resolved_method->method_holder() == SystemDictionary::Object_klass()) {
     assert(resolved_method->vtable_index() == selected_method->vtable_index(), "sanity check");
     vtable_index = resolved_method->vtable_index();
   }
@@ -75,6 +75,8 @@
   _selected_method = selected_method;
   _vtable_index    = vtable_index;
   if (CompilationPolicy::mustBeCompiled(selected_method)) {
+    // This path is unusual, mostly used by the '-Xcomp' stress test mode.
+
     // Note: with several active threads, the mustBeCompiled may be true
     //       while canBeCompiled is false; remove assert
     // assert(CompilationPolicy::canBeCompiled(selected_method), "cannot compile");
@@ -82,6 +84,16 @@
       // don't force compilation, resolve was on behalf of compiler
       return;
     }
+    if (instanceKlass::cast(selected_method->method_holder())->is_not_initialized()) {
+      // 'is_not_initialized' means not only '!is_initialized', but also that
+      // initialization has not been started yet ('!being_initialized')
+      // Do not force compilation of methods in uninitialized classes.
+      // Note that doing this would throw an assert later,
+      // in CompileBroker::compile_method.
+      // We sometimes use the link resolver to do reflective lookups
+      // even before classes are initialized.
+      return;
+    }
     CompileBroker::compile_method(selected_method, InvocationEntryBci,
                                   methodHandle(), 0, "mustBeCompiled", CHECK);
   }
@@ -181,7 +193,7 @@
   // We'll check for the method name first, as that's most likely
   // to be false (so we'll short-circuit out of these tests).
   if (sel_method->name() == vmSymbols::clone_name() &&
-      sel_klass() == SystemDictionary::object_klass() &&
+      sel_klass() == SystemDictionary::Object_klass() &&
       resolved_klass->oop_is_array()) {
     // We need to change "protected" to "public".
     assert(flags.is_protected(), "clone not protected?");
@@ -223,6 +235,18 @@
   resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
 }
 
+void LinkResolver::resolve_dynamic_method(methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS) {
+  // The class is java.dyn.MethodHandle
+  resolved_klass = SystemDictionaryHandles::MethodHandle_klass();
+
+  symbolHandle method_name = vmSymbolHandles::invoke_name();
+
+  symbolHandle method_signature(THREAD, pool->signature_ref_at(index));
+  KlassHandle  current_klass   (THREAD, pool->pool_holder());
+
+  resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
+}
+
 void LinkResolver::resolve_interface_method(methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS) {
 
   // resolve klass
@@ -1015,11 +1039,8 @@
 
   // This guy is reached from InterpreterRuntime::resolve_invokedynamic.
 
-  assert(constantPoolCacheOopDesc::is_secondary_index(raw_index), "must be secondary index");
-  int nt_index = pool->map_instruction_operand_to_index(raw_index);
-
   // At this point, we only need the signature, and can ignore the name.
-  symbolHandle method_signature(THREAD, pool->nt_signature_ref_at(nt_index));
+  symbolHandle method_signature(THREAD, pool->signature_ref_at(raw_index));  // raw_index works directly
   symbolHandle method_name = vmSymbolHandles::invoke_name();
   KlassHandle resolved_klass = SystemDictionaryHandles::MethodHandle_klass();
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/linkResolver.hpp
--- a/src/share/vm/interpreter/linkResolver.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/linkResolver.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -133,6 +133,7 @@
 
   // static resolving for all calls except interface calls
   static void resolve_method          (methodHandle& method_result, KlassHandle& klass_result, constantPoolHandle pool, int index, TRAPS);
+  static void resolve_dynamic_method  (methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS);
   static void resolve_interface_method(methodHandle& method_result, KlassHandle& klass_result, constantPoolHandle pool, int index, TRAPS);
 
   // runtime/static resolving for fields
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/oopMapCache.cpp
--- a/src/share/vm/interpreter/oopMapCache.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/oopMapCache.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -281,7 +281,7 @@
  public:
   void pass_int()                                { /* ignore */ }
   void pass_long()                               { /* ignore */ }
-#ifdef _LP64
+#if defined(_LP64) || defined(ZERO)
   void pass_float()                              { /* ignore */ }
 #endif
   void pass_double()                             { /* ignore */ }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/rewriter.cpp
--- a/src/share/vm/interpreter/rewriter.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/rewriter.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -48,16 +48,6 @@
 }
 
 
-int Rewriter::add_extra_cp_cache_entry(int main_entry) {
-  // Hack: We put it on the map as an encoded value.
-  // The only place that consumes this is ConstantPoolCacheEntry::set_initial_state
-  int encoded = constantPoolCacheOopDesc::encode_secondary_index(main_entry);
-  int plain_secondary_index = _cp_cache_map.append(encoded);
-  return constantPoolCacheOopDesc::encode_secondary_index(plain_secondary_index);
-}
-
-
-
 // Creates a constant pool cache given a CPC map
 // This creates the constant pool cache initially in a state
 // that is unsafe for concurrent GC processing but sets it to
@@ -127,7 +117,7 @@
   assert(p[-1] == Bytecodes::_invokedynamic, "");
   int cp_index = Bytes::get_Java_u2(p);
   int cpc  = maybe_add_cp_cache_entry(cp_index);  // add lazily
-  int cpc2 = add_extra_cp_cache_entry(cpc);
+  int cpc2 = add_secondary_cp_cache_entry(cpc);
 
   // Replace the trailing four bytes with a CPC index for the dynamic
   // call site.  Unlike other CPC entries, there is one per bytecode,
@@ -137,7 +127,7 @@
   // all these entries.  That is the main reason invokedynamic
   // must have a five-byte instruction format.  (Of course, other JVM
   // implementations can use the bytes for other purposes.)
-  Bytes::put_native_u4(p, cpc2);
+  Bytes::put_native_u4(p, constantPoolCacheOopDesc::encode_secondary_index(cpc2));
   // Note: We use native_u4 format exclusively for 4-byte indexes.
 }
 
@@ -257,15 +247,22 @@
 
 void Rewriter::rewrite(instanceKlassHandle klass, TRAPS) {
   ResourceMark rm(THREAD);
-  Rewriter     rw(klass, CHECK);
+  Rewriter     rw(klass, klass->constants(), klass->methods(), CHECK);
   // (That's all, folks.)
 }
 
-Rewriter::Rewriter(instanceKlassHandle klass, TRAPS)
+
+void Rewriter::rewrite(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS) {
+  ResourceMark rm(THREAD);
+  Rewriter     rw(klass, cpool, methods, CHECK);
+  // (That's all, folks.)
+}
+
+
+Rewriter::Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS)
   : _klass(klass),
-    // gather starting points
-    _pool(   THREAD, klass->constants()),
-    _methods(THREAD, klass->methods())
+    _pool(cpool),
+    _methods(methods)
 {
   assert(_pool->cache() == NULL, "constant pool cache must not be set yet");
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/rewriter.hpp
--- a/src/share/vm/interpreter/rewriter.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/rewriter.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -43,16 +43,21 @@
   bool has_cp_cache(int i) { return (uint)i < (uint)_cp_map.length() && _cp_map[i] >= 0; }
   int maybe_add_cp_cache_entry(int i) { return has_cp_cache(i) ? _cp_map[i] : add_cp_cache_entry(i); }
   int add_cp_cache_entry(int cp_index) {
+    assert((cp_index & _secondary_entry_tag) == 0, "bad tag");
     assert(_cp_map[cp_index] == -1, "not twice on same cp_index");
     int cache_index = _cp_cache_map.append(cp_index);
     _cp_map.at_put(cp_index, cache_index);
     assert(cp_entry_to_cp_cache(cp_index) == cache_index, "");
     return cache_index;
   }
-  int add_extra_cp_cache_entry(int main_entry);
+  int add_secondary_cp_cache_entry(int main_cpc_entry) {
+    assert(main_cpc_entry < _cp_cache_map.length(), "must be earlier CP cache entry");
+    int cache_index = _cp_cache_map.append(main_cpc_entry | _secondary_entry_tag);
+    return cache_index;
+  }
 
   // All the work goes in here:
-  Rewriter(instanceKlassHandle klass, TRAPS);
+  Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS);
 
   void compute_index_maps();
   void make_constant_pool_cache(TRAPS);
@@ -65,4 +70,9 @@
  public:
   // Driver routine:
   static void rewrite(instanceKlassHandle klass, TRAPS);
+  static void rewrite(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS);
+
+  enum {
+    _secondary_entry_tag = nth_bit(30)
+  };
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/templateInterpreter.cpp
--- a/src/share/vm/interpreter/templateInterpreter.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/templateInterpreter.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -178,14 +178,12 @@
 #endif // !PRODUCT
 EntryPoint TemplateInterpreter::_return_entry[TemplateInterpreter::number_of_return_entries];
 EntryPoint TemplateInterpreter::_earlyret_entry;
-EntryPoint TemplateInterpreter::_return_unbox_entry;
 EntryPoint TemplateInterpreter::_deopt_entry [TemplateInterpreter::number_of_deopt_entries ];
 EntryPoint TemplateInterpreter::_continuation_entry;
 EntryPoint TemplateInterpreter::_safept_entry;
 
 address    TemplateInterpreter::_return_3_addrs_by_index[TemplateInterpreter::number_of_return_addrs];
 address    TemplateInterpreter::_return_5_addrs_by_index[TemplateInterpreter::number_of_return_addrs];
-address    TemplateInterpreter::_return_5_unbox_addrs_by_index[TemplateInterpreter::number_of_return_addrs];
 
 DispatchTable TemplateInterpreter::_active_table;
 DispatchTable TemplateInterpreter::_normal_table;
@@ -253,22 +251,6 @@
     }
   }
 
-  if (EnableInvokeDynamic) {
-    CodeletMark cm(_masm, "unboxing return entry points");
-    Interpreter::_return_unbox_entry =
-      EntryPoint(
-        generate_return_unbox_entry_for(btos, 5),
-        generate_return_unbox_entry_for(ctos, 5),
-        generate_return_unbox_entry_for(stos, 5),
-        generate_return_unbox_entry_for(atos, 5), // cast conversion
-        generate_return_unbox_entry_for(itos, 5),
-        generate_return_unbox_entry_for(ltos, 5),
-        generate_return_unbox_entry_for(ftos, 5),
-        generate_return_unbox_entry_for(dtos, 5),
-        Interpreter::_return_entry[5].entry(vtos) // no unboxing for void
-      );
-  }
-
   { CodeletMark cm(_masm, "earlyret entry points");
     Interpreter::_earlyret_entry =
       EntryPoint(
@@ -319,8 +301,6 @@
     int index = Interpreter::TosState_as_index(states[j]);
     Interpreter::_return_3_addrs_by_index[index] = Interpreter::return_entry(states[j], 3);
     Interpreter::_return_5_addrs_by_index[index] = Interpreter::return_entry(states[j], 5);
-    if (EnableInvokeDynamic)
-      Interpreter::_return_5_unbox_addrs_by_index[index] = Interpreter::return_unbox_entry(states[j], 5);
   }
 
   { CodeletMark cm(_masm, "continuation entry points");
@@ -485,9 +465,11 @@
 void TemplateInterpreterGenerator::set_short_entry_points(Template* t, address& bep, address& cep, address& sep, address& aep, address& iep, address& lep, address& fep, address& dep, address& vep) {
   assert(t->is_valid(), "template must exist");
   switch (t->tos_in()) {
-    case btos: vep = __ pc(); __ pop(btos); bep = __ pc(); generate_and_dispatch(t); break;
-    case ctos: vep = __ pc(); __ pop(ctos); sep = __ pc(); generate_and_dispatch(t); break;
-    case stos: vep = __ pc(); __ pop(stos); sep = __ pc(); generate_and_dispatch(t); break;
+    case btos:
+    case ctos:
+    case stos:
+      ShouldNotReachHere();  // btos/ctos/stos should use itos.
+      break;
     case atos: vep = __ pc(); __ pop(atos); aep = __ pc(); generate_and_dispatch(t); break;
     case itos: vep = __ pc(); __ pop(itos); iep = __ pc(); generate_and_dispatch(t); break;
     case ltos: vep = __ pc(); __ pop(ltos); lep = __ pc(); generate_and_dispatch(t); break;
@@ -547,18 +529,6 @@
 }
 
 
-address TemplateInterpreter::return_unbox_entry(TosState state, int length) {
-  assert(EnableInvokeDynamic, "");
-  if (state == vtos) {
-    // no unboxing to do, actually
-    return return_entry(state, length);
-  } else {
-    assert(length == 5, "unboxing entries generated for invokedynamic only");
-    return _return_unbox_entry.entry(state);
-  }
-}
-
-
 address TemplateInterpreter::deopt_entry(TosState state, int length) {
   guarantee(0 <= length && length < Interpreter::number_of_deopt_entries, "illegal length");
   return _deopt_entry[length].entry(state);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/templateInterpreter.hpp
--- a/src/share/vm/interpreter/templateInterpreter.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/templateInterpreter.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -110,14 +110,12 @@
 #endif // !PRODUCT
   static EntryPoint _return_entry[number_of_return_entries];    // entry points to return to from a call
   static EntryPoint _earlyret_entry;                            // entry point to return early from a call
-  static EntryPoint _return_unbox_entry;                        // entry point to unbox a return value from a call
   static EntryPoint _deopt_entry[number_of_deopt_entries];      // entry points to return to from a deoptimization
   static EntryPoint _continuation_entry;
   static EntryPoint _safept_entry;
 
   static address    _return_3_addrs_by_index[number_of_return_addrs];     // for invokevirtual   return entries
   static address    _return_5_addrs_by_index[number_of_return_addrs];     // for invokeinterface return entries
-  static address    _return_5_unbox_addrs_by_index[number_of_return_addrs]; // for invokedynamic bootstrap methods
 
   static DispatchTable _active_table;                           // the active    dispatch table (used by the interpreter for dispatch)
   static DispatchTable _normal_table;                           // the normal    dispatch table (used to set the active table in normal mode)
@@ -159,12 +157,10 @@
   // Support for invokes
   static address*   return_3_addrs_by_index_table()             { return _return_3_addrs_by_index; }
   static address*   return_5_addrs_by_index_table()             { return _return_5_addrs_by_index; }
-  static address*   return_5_unbox_addrs_by_index_table()       { return _return_5_unbox_addrs_by_index; }
   static int        TosState_as_index(TosState state);          // computes index into return_3_entry_by_index table
 
   static address    return_entry  (TosState state, int length);
   static address    deopt_entry   (TosState state, int length);
-  static address    return_unbox_entry(TosState state, int length);
 
   // Safepoint support
   static void       notice_safepoints();                        // stops the thread when reaching a safepoint
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/interpreter/templateInterpreterGenerator.hpp
--- a/src/share/vm/interpreter/templateInterpreterGenerator.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/interpreter/templateInterpreterGenerator.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -51,10 +51,7 @@
   address generate_WrongMethodType_handler();
   address generate_ArrayIndexOutOfBounds_handler(const char* name);
   address generate_continuation_for(TosState state);
-  address generate_return_entry_for(TosState state, int step, bool unbox = false);
-  address generate_return_unbox_entry_for(TosState state, int step) {
-    return generate_return_entry_for(state, step, true);
-  }
+  address generate_return_entry_for(TosState state, int step);
   address generate_earlyret_entry_for(TosState state);
   address generate_deopt_entry_for(TosState state, int step);
   address generate_safept_entry_for(TosState state, address runtime_entry);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/barrierSet.cpp
--- a/src/share/vm/memory/barrierSet.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/barrierSet.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -41,11 +41,6 @@
 
 // count is number of array elements being written
 void BarrierSet::static_write_ref_array_post(HeapWord* start, size_t count) {
-  assert(count <= (size_t)max_intx, "count too large");
-  HeapWord* end = start + objArrayOopDesc::array_size((int)count);
-#if 0
-  warning("Post:\t" INTPTR_FORMAT "[" SIZE_FORMAT "] : [" INTPTR_FORMAT","INTPTR_FORMAT")\t",
-                   start,            count,              start,          end);
-#endif
-  Universe::heap()->barrier_set()->write_ref_array_work(MemRegion(start, end));
+  // simply delegate to instance method
+  Universe::heap()->barrier_set()->write_ref_array(start, count);
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/barrierSet.hpp
--- a/src/share/vm/memory/barrierSet.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/barrierSet.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -121,17 +121,18 @@
   virtual void read_ref_array(MemRegion mr) = 0;
   virtual void read_prim_array(MemRegion mr) = 0;
 
+  // Below length is the # array elements being written
   virtual void write_ref_array_pre(      oop* dst, int length) {}
   virtual void write_ref_array_pre(narrowOop* dst, int length) {}
-  inline void write_ref_array(MemRegion mr);
+  // Below count is the # array elements being written, starting
+  // at the address "start", which may not necessarily be HeapWord-aligned
+  inline void write_ref_array(HeapWord* start, size_t count);
 
-  // Static versions, suitable for calling from generated code.
+  // Static versions, suitable for calling from generated code;
+  // count is # array elements being written, starting with "start",
+  // which may not necessarily be HeapWord-aligned.
   static void static_write_ref_array_pre(HeapWord* start, size_t count);
   static void static_write_ref_array_post(HeapWord* start, size_t count);
-  // Narrow oop versions of the above; count is # of array elements being written,
-  // starting with "start", which is HeapWord-aligned.
-  static void static_write_ref_array_pre_narrow(HeapWord* start, size_t count);
-  static void static_write_ref_array_post_narrow(HeapWord* start, size_t count);
 
 protected:
   virtual void write_ref_array_work(MemRegion mr) = 0;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/barrierSet.inline.hpp
--- a/src/share/vm/memory/barrierSet.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/barrierSet.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -42,14 +42,34 @@
   }
 }
 
-void BarrierSet::write_ref_array(MemRegion mr) {
-  if (kind() == CardTableModRef) {
-    ((CardTableModRefBS*)this)->inline_write_ref_array(mr);
-  } else {
-    write_ref_array_work(mr);
-  }
+// count is number of array elements being written
+void BarrierSet::write_ref_array(HeapWord* start, size_t count) {
+  assert(count <= (size_t)max_intx, "count too large");
+  HeapWord* end = (HeapWord*)((char*)start + (count*heapOopSize));
+  // In the case of compressed oops, start and end may potentially be misaligned;
+  // so we need to conservatively align the first downward (this is not
+  // strictly necessary for current uses, but a case of good hygiene and,
+  // if you will, aesthetics) and the second upward (this is essential for
+  // current uses) to a HeapWord boundary, so we mark all cards overlapping
+  // this write. If this evolves in the future to calling a
+  // logging barrier of narrow oop granularity, like the pre-barrier for G1
+  // (mentioned here merely by way of example), we will need to change this
+  // interface, so it is "exactly precise" (if i may be allowed the adverbial
+  // redundancy for emphasis) and does not include narrow oop slots not
+  // included in the original write interval.
+  HeapWord* aligned_start = (HeapWord*)align_size_down((uintptr_t)start, HeapWordSize);
+  HeapWord* aligned_end   = (HeapWord*)align_size_up  ((uintptr_t)end,   HeapWordSize);
+  // If compressed oops were not being used, these should already be aligned
+  assert(UseCompressedOops || (aligned_start == start && aligned_end == end),
+         "Expected heap word alignment of start and end");
+#if 0
+  warning("Post:\t" INTPTR_FORMAT "[" SIZE_FORMAT "] : [" INTPTR_FORMAT","INTPTR_FORMAT")\t",
+                   start,            count,              aligned_start,   aligned_end);
+#endif
+  write_ref_array_work(MemRegion(aligned_start, aligned_end));
 }
 
+
 void BarrierSet::write_region(MemRegion mr) {
   if (kind() == CardTableModRef) {
     ((CardTableModRefBS*)this)->inline_write_region(mr);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/cardTableModRefBS.cpp
--- a/src/share/vm/memory/cardTableModRefBS.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/cardTableModRefBS.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -511,6 +511,8 @@
 }
 
 void CardTableModRefBS::dirty_MemRegion(MemRegion mr) {
+  assert((HeapWord*)align_size_down((uintptr_t)mr.start(), HeapWordSize) == mr.start(), "Unaligned start");
+  assert((HeapWord*)align_size_up  ((uintptr_t)mr.end(),   HeapWordSize) == mr.end(),   "Unaligned end"  );
   jbyte* cur  = byte_for(mr.start());
   jbyte* last = byte_after(mr.last());
   while (cur < last) {
@@ -520,6 +522,8 @@
 }
 
 void CardTableModRefBS::invalidate(MemRegion mr, bool whole_heap) {
+  assert((HeapWord*)align_size_down((uintptr_t)mr.start(), HeapWordSize) == mr.start(), "Unaligned start");
+  assert((HeapWord*)align_size_up  ((uintptr_t)mr.end(),   HeapWordSize) == mr.end(),   "Unaligned end"  );
   for (int i = 0; i < _cur_covered_regions; i++) {
     MemRegion mri = mr.intersection(_covered[i]);
     if (!mri.is_empty()) dirty_MemRegion(mri);
@@ -660,6 +664,29 @@
   GuaranteeNotModClosure blk(this);
   non_clean_card_iterate_work(mr, &blk, false);
 }
+
+// To verify a MemRegion is entirely dirty this closure is passed to
+// dirty_card_iterate. If the region is dirty do_MemRegion will be
+// invoked only once with a MemRegion equal to the one being
+// verified.
+class GuaranteeDirtyClosure: public MemRegionClosure {
+  CardTableModRefBS* _ct;
+  MemRegion _mr;
+  bool _result;
+public:
+  GuaranteeDirtyClosure(CardTableModRefBS* ct, MemRegion mr)
+    : _ct(ct), _mr(mr), _result(false) {}
+  void do_MemRegion(MemRegion mr) {
+    _result = _mr.equals(mr);
+  }
+  bool result() const { return _result; }
+};
+
+void CardTableModRefBS::verify_dirty_region(MemRegion mr) {
+  GuaranteeDirtyClosure blk(this, mr);
+  dirty_card_iterate(mr, &blk);
+  guarantee(blk.result(), "Non-dirty cards in region that should be dirty");
+}
 #endif
 
 bool CardTableModRefBSForCTRS::card_will_be_scanned(jbyte cv) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/cardTableModRefBS.hpp
--- a/src/share/vm/memory/cardTableModRefBS.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/cardTableModRefBS.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -339,6 +339,16 @@
     return (val & (clean_card_mask_val() | claimed_card_val())) == claimed_card_val();
   }
 
+  void set_card_claimed(size_t card_index) {
+      jbyte val = _byte_map[card_index];
+      if (val == clean_card_val()) {
+        val = (jbyte)claimed_card_val();
+      } else {
+        val |= (jbyte)claimed_card_val();
+      }
+      _byte_map[card_index] = val;
+  }
+
   bool claim_card(size_t card_index);
 
   bool is_card_clean(size_t card_index) {
@@ -456,6 +466,7 @@
   void verify_guard();
 
   void verify_clean_region(MemRegion mr) PRODUCT_RETURN;
+  void verify_dirty_region(MemRegion mr) PRODUCT_RETURN;
 
   static size_t par_chunk_heapword_alignment() {
     return CardsPerStrideChunk * card_size_in_words;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/classify.cpp
--- a/src/share/vm/memory/classify.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/classify.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -49,7 +49,7 @@
 
   Klass* k = obj->blueprint();
 
-  if (k->as_klassOop() == SystemDictionary::object_klass()) {
+  if (k->as_klassOop() == SystemDictionary::Object_klass()) {
     tty->print_cr("Found the class!");
   }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/collectorPolicy.cpp
--- a/src/share/vm/memory/collectorPolicy.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/collectorPolicy.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -55,7 +55,7 @@
 
 void CollectorPolicy::initialize_size_info() {
   // User inputs from -mx and ms are aligned
-  set_initial_heap_byte_size(Arguments::initial_heap_size());
+  set_initial_heap_byte_size(InitialHeapSize);
   if (initial_heap_byte_size() == 0) {
     set_initial_heap_byte_size(NewSize + OldSize);
   }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/compactingPermGenGen.cpp
--- a/src/share/vm/memory/compactingPermGenGen.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/compactingPermGenGen.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -352,15 +352,19 @@
 }
 
 
+// Do not use in time-critical operations due to the possibility of paging
+// in otherwise untouched or previously unread portions of the perm gen,
+// for instance, the shared spaces. NOTE: Because CompactingPermGenGen
+// derives from OneContigSpaceCardGeneration which is supposed to have a
+// single space, and does not override its object_iterate() method,
+// object iteration via that interface does not look at the objects in
+// the shared spaces when using CDS. This should be fixed; see CR 6897798.
 void CompactingPermGenGen::space_iterate(SpaceClosure* blk, bool usedOnly) {
   OneContigSpaceCardGeneration::space_iterate(blk, usedOnly);
   if (spec()->enable_shared_spaces()) {
-#ifdef PRODUCT
     // Making the rw_space walkable will page in the entire space, and
-    // is to be avoided. However, this is required for Verify options.
-    ShouldNotReachHere();
-#endif
-
+    // is to be avoided in the case of time-critical operations.
+    // However, this is required for Verify and heap dump operations.
     blk->do_space(ro_space());
     blk->do_space(rw_space());
   }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/compactingPermGenGen.hpp
--- a/src/share/vm/memory/compactingPermGenGen.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/compactingPermGenGen.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -29,6 +29,9 @@
 class PermanentGenerationSpec;
 
 // This is the "generation" view of a CompactingPermGen.
+// NOTE: the shared spaces used for CDS are here handled in
+// a somewhat awkward and potentially buggy fashion, see CR 6801625.
+// This infelicity should be fixed, see CR 6897789.
 class CompactingPermGenGen: public OneContigSpaceCardGeneration {
   friend class VMStructs;
   // Abstractly, this is a subtype that gets access to protected fields.
@@ -47,7 +50,7 @@
   OffsetTableContigSpace* _ro_space;
   OffsetTableContigSpace* _rw_space;
 
-  // With shared spaces there is a dicotomy in the use of the
+  // With shared spaces there is a dichotomy in the use of the
   // _virtual_space of the generation.  There is a portion of the
   // _virtual_space that is used for the unshared part of the
   // permanent generation and a portion that is reserved for the shared part.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/defNewGeneration.cpp
--- a/src/share/vm/memory/defNewGeneration.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/defNewGeneration.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -555,12 +555,14 @@
          "save marks have not been newly set.");
 
   gch->gen_process_strong_roots(_level,
-                                true, // Process younger gens, if any, as
-                                      // strong roots.
-                                false,// not collecting permanent generation.
+                                true,  // Process younger gens, if any,
+                                       // as strong roots.
+                                true,  // activate StrongRootsScope
+                                false, // not collecting perm generation.
                                 SharedHeap::SO_AllClasses,
-                                &fsc_with_gc_barrier,
-                                &fsc_with_no_gc_barrier);
+                                &fsc_with_no_gc_barrier,
+                                true,   // walk *all* scavengable nmethods
+                                &fsc_with_gc_barrier);
 
   // "evacuate followers".
   evacuate_followers.do_void();
@@ -607,7 +609,7 @@
 
     remove_forwarding_pointers();
     if (PrintGCDetails) {
-      gclog_or_tty->print(" (promotion failed)");
+      gclog_or_tty->print(" (promotion failed) ");
     }
     // Add to-space to the list of space to compact
     // when a promotion failure has occurred.  In that
@@ -618,6 +620,9 @@
     from()->set_next_compaction_space(to());
     gch->set_incremental_collection_will_fail();
 
+    // Inform the next generation that a promotion failure occurred.
+    _next_gen->promotion_failure_occurred();
+
     // Reset the PromotionFailureALot counters.
     NOT_PRODUCT(Universe::heap()->reset_promotion_should_fail();)
   }
@@ -677,6 +682,11 @@
 
 void DefNewGeneration::handle_promotion_failure(oop old) {
   preserve_mark_if_necessary(old, old->mark());
+  if (!_promotion_failed && PrintPromotionFailure) {
+    gclog_or_tty->print(" (promotion failure size = " SIZE_FORMAT ") ",
+                        old->size());
+  }
+
   // forward to self
   old->forward_to(old);
   _promotion_failed = true;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/dump.cpp
--- a/src/share/vm/memory/dump.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/dump.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -63,7 +63,7 @@
   void do_oop(oop* p) {
     if (p != NULL) {
       oop obj = *p;
-      if (obj->klass() == SystemDictionary::string_klass()) {
+      if (obj->klass() == SystemDictionary::String_klass()) {
 
         int hash;
         typeArrayOop value = java_lang_String::value(obj);
@@ -625,11 +625,11 @@
 
     if (obj->is_klass() || obj->is_instance()) {
       if (obj->is_klass() ||
-          obj->is_a(SystemDictionary::class_klass()) ||
-          obj->is_a(SystemDictionary::throwable_klass())) {
+          obj->is_a(SystemDictionary::Class_klass()) ||
+          obj->is_a(SystemDictionary::Throwable_klass())) {
         // Do nothing
       }
-      else if (obj->is_a(SystemDictionary::string_klass())) {
+      else if (obj->is_a(SystemDictionary::String_klass())) {
         // immutable objects.
       } else {
         // someone added an object we hadn't accounted for.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/genCollectedHeap.cpp
--- a/src/share/vm/memory/genCollectedHeap.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/genCollectedHeap.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -51,6 +51,8 @@
 }
 
 jint GenCollectedHeap::initialize() {
+  CollectedHeap::pre_initialize();
+
   int i;
   _n_gens = gen_policy()->number_of_generations();
 
@@ -129,6 +131,7 @@
 
   _rem_set = collector_policy()->create_rem_set(_reserved, n_covered_regions);
   set_barrier_set(rem_set()->bs());
+
   _gch = this;
 
   for (i = 0; i < _n_gens; i++) {
@@ -677,13 +680,23 @@
 void GenCollectedHeap::
 gen_process_strong_roots(int level,
                          bool younger_gens_as_roots,
+                         bool activate_scope,
                          bool collecting_perm_gen,
                          SharedHeap::ScanningOption so,
-                         OopsInGenClosure* older_gens,
-                         OopsInGenClosure* not_older_gens) {
+                         OopsInGenClosure* not_older_gens,
+                         bool do_code_roots,
+                         OopsInGenClosure* older_gens) {
   // General strong roots.
-  SharedHeap::process_strong_roots(collecting_perm_gen, so,
-                                   not_older_gens, older_gens);
+
+  if (!do_code_roots) {
+    SharedHeap::process_strong_roots(activate_scope, collecting_perm_gen, so,
+                                     not_older_gens, NULL, older_gens);
+  } else {
+    bool do_code_marking = (activate_scope || nmethod::oops_do_marking_is_active());
+    CodeBlobToOopClosure code_roots(not_older_gens, /*do_marking=*/ do_code_marking);
+    SharedHeap::process_strong_roots(activate_scope, collecting_perm_gen, so,
+                                     not_older_gens, &code_roots, older_gens);
+  }
 
   if (younger_gens_as_roots) {
     if (!_gen_process_strong_tasks->is_task_claimed(GCH_PS_younger_gens)) {
@@ -706,8 +719,9 @@
 }
 
 void GenCollectedHeap::gen_process_weak_roots(OopClosure* root_closure,
+                                              CodeBlobClosure* code_roots,
                                               OopClosure* non_root_closure) {
-  SharedHeap::process_weak_roots(root_closure, non_root_closure);
+  SharedHeap::process_weak_roots(root_closure, code_roots, non_root_closure);
   // "Local" "weak" refs
   for (int i = 0; i < _n_gens; i++) {
     _gens[i]->ref_processor()->weak_oops_do(root_closure);
@@ -914,6 +928,8 @@
   guarantee(VerifyBeforeGC   ||
             VerifyDuringGC   ||
             VerifyBeforeExit ||
+            PrintAssembly    ||
+            tty->count() != 0 ||   // already printing
             VerifyAfterGC, "too expensive");
   #endif
   // This might be sped up with a cache of the last generation that
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/genCollectedHeap.hpp
--- a/src/share/vm/memory/genCollectedHeap.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/genCollectedHeap.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -260,6 +260,24 @@
     return true;
   }
 
+  virtual bool card_mark_must_follow_store() const {
+    return UseConcMarkSweepGC;
+  }
+
+  // We don't need barriers for stores to objects in the
+  // young gen and, a fortiori, for initializing stores to
+  // objects therein. This applies to {DefNew,ParNew}+{Tenured,CMS}
+  // only and may need to be re-examined in case other
+  // kinds of collectors are implemented in the future.
+  virtual bool can_elide_initializing_store_barrier(oop new_obj) {
+    // We wanted to assert that:-
+    // assert(UseParNewGC || UseSerialGC || UseConcMarkSweepGC,
+    //       "Check can_elide_initializing_store_barrier() for this collector");
+    // but unfortunately the flag UseSerialGC need not necessarily always
+    // be set when DefNew+Tenured are being used.
+    return is_in_youngest((void*)new_obj);
+  }
+
   // Can a compiler elide a store barrier when it writes
   // a permanent oop into the heap?  Applies when the compiler
   // is storing x to the heap, where x->is_perm() is true.
@@ -408,16 +426,22 @@
   // "SO_SystemClasses" to all the "system" classes and loaders;
   // "SO_Symbols_and_Strings" applies the closure to all entries in
   // SymbolsTable and StringTable.
-  void gen_process_strong_roots(int level, bool younger_gens_as_roots,
+  void gen_process_strong_roots(int level,
+                                bool younger_gens_as_roots,
+                                // The remaining arguments are in an order
+                                // consistent with SharedHeap::process_strong_roots:
+                                bool activate_scope,
                                 bool collecting_perm_gen,
                                 SharedHeap::ScanningOption so,
-                                OopsInGenClosure* older_gens,
-                                OopsInGenClosure* not_older_gens);
+                                OopsInGenClosure* not_older_gens,
+                                bool do_code_roots,
+                                OopsInGenClosure* older_gens);
 
   // Apply "blk" to all the weak roots of the system.  These include
   // JNI weak roots, the code cache, system dictionary, symbol table,
   // string table, and referents of reachable weak refs.
   void gen_process_weak_roots(OopClosure* root_closure,
+                              CodeBlobClosure* code_roots,
                               OopClosure* non_root_closure);
 
   // Set the saved marks of generations, if that makes sense.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/genMarkSweep.cpp
--- a/src/share/vm/memory/genMarkSweep.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/genMarkSweep.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 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
@@ -162,6 +162,9 @@
 
   int size = SystemDictionary::number_of_classes() * 2;
   _revisit_klass_stack = new (ResourceObj::C_HEAP) GrowableArray<Klass*>(size, true);
+  // (#klass/k)^2 for k ~ 10 appears to be a better fit, but this will have to do for
+  // now until we have had a chance to investigate a more optimal setting.
+  _revisit_mdo_stack   = new (ResourceObj::C_HEAP) GrowableArray<DataLayout*>(2*size, true);
 
 #ifdef VALIDATE_MARK_SWEEP
   if (ValidateMarkSweep) {
@@ -206,6 +209,7 @@
 
   delete _marking_stack;
   delete _revisit_klass_stack;
+  delete _revisit_mdo_stack;
 
 #ifdef VALIDATE_MARK_SWEEP
   if (ValidateMarkSweep) {
@@ -240,9 +244,12 @@
 
   gch->gen_process_strong_roots(level,
                                 false, // Younger gens are not roots.
+                                true,  // activate StrongRootsScope
                                 true,  // Collecting permanent generation.
                                 SharedHeap::SO_SystemClasses,
-                                &follow_root_closure, &follow_root_closure);
+                                &follow_root_closure,
+                                true,   // walk code active on stacks
+                                &follow_root_closure);
 
   // Process reference objects found during marking
   {
@@ -262,6 +269,10 @@
   follow_weak_klass_links();
   assert(_marking_stack->is_empty(), "just drained");
 
+  // Visit memoized MDO's and clear any unmarked weak refs
+  follow_mdo_weak_refs();
+  assert(_marking_stack->is_empty(), "just drained");
+
   // Visit symbol and interned string tables and delete unmarked oops
   SymbolTable::unlink(&is_alive);
   StringTable::unlink(&is_alive);
@@ -330,14 +341,19 @@
 
   gch->gen_process_strong_roots(level,
                                 false, // Younger gens are not roots.
+                                true,  // activate StrongRootsScope
                                 true,  // Collecting permanent generation.
                                 SharedHeap::SO_AllClasses,
                                 &adjust_root_pointer_closure,
+                                false, // do not walk code
                                 &adjust_root_pointer_closure);
 
   // Now adjust pointers in remaining weak roots.  (All of which should
   // have been cleared if they pointed to non-surviving objects.)
+  CodeBlobToOopClosure adjust_code_pointer_closure(&adjust_pointer_closure,
+                                                   /*do_marking=*/ false);
   gch->gen_process_weak_roots(&adjust_root_pointer_closure,
+                              &adjust_code_pointer_closure,
                               &adjust_pointer_closure);
 
   adjust_marks();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/generation.cpp
--- a/src/share/vm/memory/generation.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/generation.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -606,6 +606,13 @@
 void OneContigSpaceCardGeneration::prepare_for_verify() {}
 
 
+// Override for a card-table generation with one contiguous
+// space. NOTE: For reasons that are lost in the fog of history,
+// this code is used when you iterate over perm gen objects,
+// even when one uses CDS, where the perm gen has a couple of
+// other spaces; this is because CompactingPermGenGen derives
+// from OneContigSpaceCardGeneration. This should be cleaned up,
+// see CR 6897789..
 void OneContigSpaceCardGeneration::object_iterate(ObjectClosure* blk) {
   _the_space->object_iterate(blk);
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/generation.hpp
--- a/src/share/vm/memory/generation.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/generation.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -181,6 +181,12 @@
   virtual bool promotion_attempt_is_safe(size_t promotion_in_bytes,
     bool younger_handles_promotion_failure) const;
 
+  // For a non-young generation, this interface can be used to inform a
+  // generation that a promotion attempt into that generation failed.
+  // Typically used to enable diagnostic output for post-mortem analysis,
+  // but other uses of the interface are not ruled out.
+  virtual void promotion_failure_occurred() { /* does nothing */ }
+
   // Return an estimate of the maximum allocation that could be performed
   // in the generation without triggering any collection or expansion
   // activity.  It is "unsafe" because no locks are taken; the result
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/heap.cpp
--- a/src/share/vm/memory/heap.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/heap.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -464,7 +464,7 @@
   }
 
   // Verify that freelist contains the right amount of free space
-  guarantee(len == _free_segments, "wrong freelist");
+  //  guarantee(len == _free_segments, "wrong freelist");
 
   // Verify that the number of free blocks is not out of hand.
   static int free_block_threshold = 10000;
@@ -479,5 +479,5 @@
   for(HeapBlock *h = first_block(); h != NULL; h = next_block(h)) {
     if (h->free()) count--;
   }
-  guarantee(count == 0, "missing free blocks");
+  //  guarantee(count == 0, "missing free blocks");
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/iterator.cpp
--- a/src/share/vm/memory/iterator.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/iterator.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2001 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -25,6 +25,10 @@
 # include "incls/_precompiled.incl"
 # include "incls/_iterator.cpp.incl"
 
+#ifdef ASSERT
+bool OopClosure::_must_remember_klasses = false;
+#endif
+
 void ObjectToOopClosure::do_object(oop obj) {
   obj->oop_iterate(_cl);
 }
@@ -32,3 +36,52 @@
 void VoidClosure::do_void() {
   ShouldNotCallThis();
 }
+
+#ifdef ASSERT
+bool OopClosure::must_remember_klasses() {
+  return _must_remember_klasses;
+}
+void OopClosure::set_must_remember_klasses(bool v) {
+  _must_remember_klasses = v;
+}
+#endif
+
+
+MarkingCodeBlobClosure::MarkScope::MarkScope(bool activate)
+  : _active(activate)
+{
+  if (_active)  nmethod::oops_do_marking_prologue();
+}
+
+MarkingCodeBlobClosure::MarkScope::~MarkScope() {
+  if (_active)  nmethod::oops_do_marking_epilogue();
+}
+
+void MarkingCodeBlobClosure::do_code_blob(CodeBlob* cb) {
+  if (!cb->is_nmethod())  return;
+  nmethod* nm = (nmethod*) cb;
+  if (!nm->test_set_oops_do_mark()) {
+    NOT_PRODUCT(if (TraceScavenge)  nm->print_on(tty, "oops_do, 1st visit\n"));
+    do_newly_marked_nmethod(nm);
+  } else {
+    NOT_PRODUCT(if (TraceScavenge)  nm->print_on(tty, "oops_do, skipped on 2nd visit\n"));
+  }
+}
+
+void CodeBlobToOopClosure::do_newly_marked_nmethod(nmethod* nm) {
+  nm->oops_do(_cl, /*do_strong_roots_only=*/ true);
+}
+
+void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) {
+  if (!_do_marking) {
+    NOT_PRODUCT(if (TraceScavenge && Verbose && cb->is_nmethod())  ((nmethod*)cb)->print_on(tty, "oops_do, unmarked visit\n"));
+    // This assert won't work, since there are lots of mini-passes
+    // (mostly in debug mode) that co-exist with marking phases.
+    //assert(!(cb->is_nmethod() && ((nmethod*)cb)->test_oops_do_mark()), "found marked nmethod during mark-free phase");
+    cb->oops_do(_cl);
+  } else {
+    MarkingCodeBlobClosure::do_code_blob(cb);
+  }
+}
+
+
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/iterator.hpp
--- a/src/share/vm/memory/iterator.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/iterator.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -24,7 +24,10 @@
 
 // The following classes are C++ `closures` for iterating over objects, roots and spaces
 
+class CodeBlob;
+class nmethod;
 class ReferenceProcessor;
+class DataLayout;
 
 // Closure provides abortability.
 
@@ -54,11 +57,19 @@
 
   // In support of post-processing of weak links of KlassKlass objects;
   // see KlassKlass::oop_oop_iterate().
-  virtual const bool should_remember_klasses() const { return false;    }
+
+  virtual const bool should_remember_klasses() const {
+    assert(!must_remember_klasses(), "Should have overriden this method.");
+    return false;
+  }
+
   virtual void remember_klass(Klass* k) { /* do nothing */ }
 
-  // If "true", invoke on nmethods (when scanning compiled frames).
-  virtual const bool do_nmethods() const { return false; }
+  // In support of post-processing of weak references in
+  // ProfileData (MethodDataOop) objects; see, for example,
+  // VirtualCallData::oop_iterate().
+  virtual const bool should_remember_mdo() const { return false; }
+  virtual void remember_mdo(DataLayout* v) { /* do nothing */ }
 
   // The methods below control how object iterations invoking this closure
   // should be performed:
@@ -74,6 +85,12 @@
   // location without an intervening "major reset" (like the end of a GC).
   virtual bool idempotent() { return false; }
   virtual bool apply_to_weak_ref_discovered_field() { return false; }
+
+#ifdef ASSERT
+  static bool _must_remember_klasses;
+  static bool must_remember_klasses();
+  static void set_must_remember_klasses(bool v);
+#endif
 };
 
 // ObjectClosure is used for iterating through an object space
@@ -158,6 +175,51 @@
 };
 
 
+// CodeBlobClosure is used for iterating through code blobs
+// in the code cache or on thread stacks
+
+class CodeBlobClosure : public Closure {
+ public:
+  // Called for each code blob.
+  virtual void do_code_blob(CodeBlob* cb) = 0;
+};
+
+
+class MarkingCodeBlobClosure : public CodeBlobClosure {
+ public:
+  // Called for each code blob, but at most once per unique blob.
+  virtual void do_newly_marked_nmethod(nmethod* nm) = 0;
+
+  virtual void do_code_blob(CodeBlob* cb);
+    // = { if (!nmethod(cb)->test_set_oops_do_mark())  do_newly_marked_nmethod(cb); }
+
+  class MarkScope : public StackObj {
+  protected:
+    bool _active;
+  public:
+    MarkScope(bool activate = true);
+      // = { if (active) nmethod::oops_do_marking_prologue(); }
+    ~MarkScope();
+      // = { if (active) nmethod::oops_do_marking_epilogue(); }
+  };
+};
+
+
+// Applies an oop closure to all ref fields in code blobs
+// iterated over in an object iteration.
+class CodeBlobToOopClosure: public MarkingCodeBlobClosure {
+  OopClosure* _cl;
+  bool _do_marking;
+public:
+  virtual void do_newly_marked_nmethod(nmethod* cb);
+    // = { cb->oops_do(_cl); }
+  virtual void do_code_blob(CodeBlob* cb);
+    // = { if (_do_marking)  super::do_code_blob(cb); else cb->oops_do(_cl); }
+  CodeBlobToOopClosure(OopClosure* cl, bool do_marking)
+    : _cl(cl), _do_marking(do_marking) {}
+};
+
+
 
 // MonitorClosure is used for iterating over monitors in the monitors cache
 
@@ -219,3 +281,47 @@
   // correct length.
   virtual void do_tag(int tag) = 0;
 };
+
+#ifdef ASSERT
+// This class is used to flag phases of a collection that
+// can unload classes and which should override the
+// should_remember_klasses() and remember_klass() of OopClosure.
+// The _must_remember_klasses is set in the contructor and restored
+// in the destructor.  _must_remember_klasses is checked in assertions
+// in the OopClosure implementations of should_remember_klasses() and
+// remember_klass() and the expectation is that the OopClosure
+// implementation should not be in use if _must_remember_klasses is set.
+// Instances of RememberKlassesChecker can be place in
+// marking phases of collections which can do class unloading.
+// RememberKlassesChecker can be passed "false" to turn off checking.
+// It is used by CMS when CMS yields to a different collector.
+class RememberKlassesChecker: StackObj {
+ bool _saved_state;
+ bool _do_check;
+ public:
+  RememberKlassesChecker(bool checking_on) : _saved_state(false),
+    _do_check(true) {
+    // The ClassUnloading unloading flag affects the collectors except
+    // for CMS.
+    // CMS unloads classes if CMSClassUnloadingEnabled is true or
+    // if ExplicitGCInvokesConcurrentAndUnloadsClasses is true and
+    // the current collection is an explicit collection.  Turning
+    // on the checking in general for
+    // ExplicitGCInvokesConcurrentAndUnloadsClasses and
+    // UseConcMarkSweepGC should not lead to false positives.
+    _do_check =
+      ClassUnloading && !UseConcMarkSweepGC ||
+      CMSClassUnloadingEnabled && UseConcMarkSweepGC ||
+      ExplicitGCInvokesConcurrentAndUnloadsClasses && UseConcMarkSweepGC;
+    if (_do_check) {
+      _saved_state = OopClosure::must_remember_klasses();
+      OopClosure::set_must_remember_klasses(checking_on);
+    }
+  }
+  ~RememberKlassesChecker() {
+    if (_do_check) {
+      OopClosure::set_must_remember_klasses(_saved_state);
+    }
+  }
+};
+#endif  // ASSERT
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/oopFactory.cpp
--- a/src/share/vm/memory/oopFactory.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/oopFactory.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -98,10 +98,12 @@
 }
 
 
-klassOop oopFactory::new_instanceKlass(int vtable_len, int itable_len, int static_field_size,
-                                       int nonstatic_oop_map_size, ReferenceType rt, TRAPS) {
+klassOop oopFactory::new_instanceKlass(int vtable_len, int itable_len,
+                                       int static_field_size,
+                                       unsigned int nonstatic_oop_map_count,
+                                       ReferenceType rt, TRAPS) {
   instanceKlassKlass* ikk = instanceKlassKlass::cast(Universe::instanceKlassKlassObj());
-  return ikk->allocate_instance_klass(vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, CHECK_NULL);
+  return ikk->allocate_instance_klass(vtable_len, itable_len, static_field_size, nonstatic_oop_map_count, rt, CHECK_NULL);
 }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/oopFactory.hpp
--- a/src/share/vm/memory/oopFactory.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/oopFactory.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -89,8 +89,10 @@
                                                     TRAPS);
 
   // Instance classes
-  static klassOop        new_instanceKlass(int vtable_len, int itable_len, int static_field_size,
-                                           int nonstatic_oop_map_size, ReferenceType rt, TRAPS);
+  static klassOop        new_instanceKlass(int vtable_len, int itable_len,
+                                           int static_field_size,
+                                           unsigned int nonstatic_oop_map_count,
+                                           ReferenceType rt, TRAPS);
 
   // Methods
 private:
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/referenceProcessor.cpp
--- a/src/share/vm/memory/referenceProcessor.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/referenceProcessor.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -71,7 +71,7 @@
   assert(_sentinelRef == NULL, "should be initialized precisely once");
   EXCEPTION_MARK;
   _sentinelRef = instanceKlass::cast(
-                    SystemDictionary::reference_klass())->
+                    SystemDictionary::Reference_klass())->
                       allocate_permanent_instance(THREAD);
 
   // Initialize the master soft ref clock.
@@ -299,8 +299,8 @@
 
 
 template <class T>
-static bool enqueue_discovered_ref_helper(ReferenceProcessor* ref,
-                                          AbstractRefProcTaskExecutor* task_executor) {
+bool enqueue_discovered_ref_helper(ReferenceProcessor* ref,
+                                   AbstractRefProcTaskExecutor* task_executor) {
 
   // Remember old value of pending references list
   T* pending_list_addr = (T*)java_lang_ref_Reference::pending_list_addr();
@@ -1227,10 +1227,18 @@
   BoolObjectClosure* is_alive,
   OopClosure* keep_alive,
   VoidClosure* complete_gc,
-  YieldClosure* yield) {
+  YieldClosure* yield,
+  bool should_unload_classes) {
 
   NOT_PRODUCT(verify_ok_to_handle_reflists());
 
+#ifdef ASSERT
+  bool must_remember_klasses = ClassUnloading && !UseConcMarkSweepGC ||
+                               CMSClassUnloadingEnabled && UseConcMarkSweepGC ||
+                               ExplicitGCInvokesConcurrentAndUnloadsClasses &&
+                                 UseConcMarkSweepGC && should_unload_classes;
+  RememberKlassesChecker mx(must_remember_klasses);
+#endif
   // Soft references
   {
     TraceTime tt("Preclean SoftReferences", PrintGCDetails && PrintReferenceGC,
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/referenceProcessor.hpp
--- a/src/share/vm/memory/referenceProcessor.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/referenceProcessor.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -170,11 +170,13 @@
   // The caller is responsible for taking care of potential
   // interference with concurrent operations on these lists
   // (or predicates involved) by other threads. Currently
-  // only used by the CMS collector.
+  // only used by the CMS collector.  should_unload_classes is
+  // used to aid assertion checking when classes are collected.
   void preclean_discovered_references(BoolObjectClosure* is_alive,
                                       OopClosure*        keep_alive,
                                       VoidClosure*       complete_gc,
-                                      YieldClosure*      yield);
+                                      YieldClosure*      yield,
+                                      bool               should_unload_classes);
 
   // Delete entries in the discovered lists that have
   // either a null referent or are not active. Such
@@ -261,10 +263,13 @@
     int                parallel_gc_threads = 1,
     bool               mt_processing = false,
     bool               discovered_list_needs_barrier = false);
+
   // RefDiscoveryPolicy values
-  enum {
+  enum DiscoveryPolicy {
     ReferenceBasedDiscovery = 0,
-    ReferentBasedDiscovery  = 1
+    ReferentBasedDiscovery  = 1,
+    DiscoveryPolicyMin      = ReferenceBasedDiscovery,
+    DiscoveryPolicyMax      = ReferentBasedDiscovery
   };
 
   static void init_statics();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/serialize.cpp
--- a/src/share/vm/memory/serialize.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/serialize.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/sharedHeap.cpp
--- a/src/share/vm/memory/sharedHeap.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/sharedHeap.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -100,12 +100,27 @@
          "Not in range.");
 }
 
-void SharedHeap::process_strong_roots(bool collecting_perm_gen,
+SharedHeap::StrongRootsScope::StrongRootsScope(SharedHeap* outer, bool activate)
+  : MarkScope(activate)
+{
+  if (_active) {
+    outer->change_strong_roots_parity();
+  }
+}
+
+SharedHeap::StrongRootsScope::~StrongRootsScope() {
+  // nothing particular
+}
+
+void SharedHeap::process_strong_roots(bool activate_scope,
+                                      bool collecting_perm_gen,
                                       ScanningOption so,
                                       OopClosure* roots,
+                                      CodeBlobClosure* code_roots,
                                       OopsInGenClosure* perm_blk) {
+  StrongRootsScope srs(this, activate_scope);
   // General strong roots.
-  if (n_par_threads() == 0) change_strong_roots_parity();
+  assert(_strong_roots_parity != 0, "must have called prologue code");
   if (!_process_strong_tasks->is_task_claimed(SH_PS_Universe_oops_do)) {
     Universe::oops_do(roots);
     ReferenceProcessor::oops_do(roots);
@@ -117,9 +132,9 @@
     JNIHandles::oops_do(roots);
   // All threads execute this; the individual threads are task groups.
   if (ParallelGCThreads > 0) {
-    Threads::possibly_parallel_oops_do(roots);
+    Threads::possibly_parallel_oops_do(roots, code_roots);
   } else {
-    Threads::oops_do(roots);
+    Threads::oops_do(roots, code_roots);
   }
   if (!_process_strong_tasks-> is_task_claimed(SH_PS_ObjectSynchronizer_oops_do))
     ObjectSynchronizer::oops_do(roots);
@@ -156,11 +171,29 @@
   }
 
   if (!_process_strong_tasks->is_task_claimed(SH_PS_CodeCache_oops_do)) {
-     if (so & SO_CodeCache) {
-       CodeCache::oops_do(roots);
-     }
+    if (so & SO_CodeCache) {
+      // (Currently, CMSCollector uses this to do intermediate-strength collections.)
+      assert(collecting_perm_gen, "scanning all of code cache");
+      assert(code_roots != NULL, "must supply closure for code cache");
+      if (code_roots != NULL) {
+        CodeCache::blobs_do(code_roots);
+      }
+    } else if (so & (SO_SystemClasses|SO_AllClasses)) {
+      if (!collecting_perm_gen) {
+        // If we are collecting from class statics, but we are not going to
+        // visit all of the CodeCache, collect from the non-perm roots if any.
+        // This makes the code cache function temporarily as a source of strong
+        // roots for oops, until the next major collection.
+        //
+        // If collecting_perm_gen is true, we require that this phase will call
+        // CodeCache::do_unloading.  This will kill off nmethods with expired
+        // weak references, such as stale invokedynamic targets.
+        CodeCache::scavenge_root_nmethods_do(code_roots);
+      }
+    }
     // Verify if the code cache contents are in the perm gen
-    NOT_PRODUCT(CodeCache::oops_do(&assert_is_perm_closure));
+    NOT_PRODUCT(CodeBlobToOopClosure assert_code_is_perm(&assert_is_perm_closure, /*do_marking=*/ false));
+    NOT_PRODUCT(CodeCache::asserted_non_scavengable_nmethods_do(&assert_code_is_perm));
   }
 
   // Roots that should point only into permanent generation.
@@ -220,11 +253,12 @@
 // just skip adjusting any shared entries in the string table.
 
 void SharedHeap::process_weak_roots(OopClosure* root_closure,
+                                    CodeBlobClosure* code_roots,
                                     OopClosure* non_root_closure) {
   // Global (weak) JNI handles
   JNIHandles::weak_oops_do(&always_true, root_closure);
 
-  CodeCache::oops_do(non_root_closure);
+  CodeCache::blobs_do(code_roots);
   SymbolTable::oops_do(root_closure);
   if (UseSharedSpaces && !DumpSharedSpaces) {
     SkipAdjustingSharedStrings skip_closure(root_closure);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/sharedHeap.hpp
--- a/src/share/vm/memory/sharedHeap.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/sharedHeap.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -165,9 +165,21 @@
   //   c) to never return a distinguished value (zero) with which such
   //      task-claiming variables may be initialized, to indicate "never
   //      claimed".
+ private:
   void change_strong_roots_parity();
+ public:
   int strong_roots_parity() { return _strong_roots_parity; }
 
+  // Call these in sequential code around process_strong_roots.
+  // strong_roots_prologue calls change_strong_roots_parity, if
+  // parallel tasks are enabled.
+  class StrongRootsScope : public MarkingCodeBlobClosure::MarkScope {
+  public:
+    StrongRootsScope(SharedHeap* outer, bool activate = true);
+    ~StrongRootsScope();
+  };
+  friend class StrongRootsScope;
+
   enum ScanningOption {
     SO_None                = 0x0,
     SO_AllClasses          = 0x1,
@@ -198,21 +210,20 @@
   // "SO_Symbols" applies the closure to all entries in SymbolsTable;
   // "SO_Strings" applies the closure to all entries in StringTable;
   // "SO_CodeCache" applies the closure to all elements of the CodeCache.
-  void process_strong_roots(bool collecting_perm_gen,
+  void process_strong_roots(bool activate_scope,
+                            bool collecting_perm_gen,
                             ScanningOption so,
                             OopClosure* roots,
+                            CodeBlobClosure* code_roots,
                             OopsInGenClosure* perm_blk);
 
   // Apply "blk" to all the weak roots of the system.  These include
   // JNI weak roots, the code cache, system dictionary, symbol table,
   // string table.
   void process_weak_roots(OopClosure* root_closure,
+                          CodeBlobClosure* code_roots,
                           OopClosure* non_root_closure);
 
-
-  // Like CollectedHeap::collect, but assume that the caller holds the Heap_lock.
-  virtual void collect_locked(GCCause::Cause cause) = 0;
-
   // The functions below are helper functions that a subclass of
   // "SharedHeap" can use in the implementation of its virtual
   // functions.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/space.cpp
--- a/src/share/vm/memory/space.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/space.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -876,7 +876,7 @@
     instanceOop obj = (instanceOop) allocate(size);
     obj->set_mark(markOopDesc::prototype());
     obj->set_klass_gap(0);
-    obj->set_klass(SystemDictionary::object_klass());
+    obj->set_klass(SystemDictionary::Object_klass());
   }
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/threadLocalAllocBuffer.cpp
--- a/src/share/vm/memory/threadLocalAllocBuffer.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/threadLocalAllocBuffer.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -100,7 +100,7 @@
 void ThreadLocalAllocBuffer::make_parsable(bool retire) {
   if (end() != NULL) {
     invariants();
-    CollectedHeap::fill_with_object(top(), hard_end());
+    CollectedHeap::fill_with_object(top(), hard_end(), retire);
 
     if (retire || ZeroTLAB) {  // "Reset" the TLAB
       set_start(NULL);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
--- a/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
@@ -27,8 +27,13 @@
   HeapWord* obj = top();
   if (pointer_delta(end(), obj) >= size) {
     // successful thread-local allocation
-
-    DEBUG_ONLY(Copy::fill_to_words(obj, size, badHeapWordVal));
+#ifdef ASSERT
+    // Skip mangling the space corresponding to the object header to
+    // ensure that the returned space is not considered parsable by
+    // any concurrent GC thread.
+    size_t hdr_size = CollectedHeap::min_fill_size();
+    Copy::fill_to_words(obj + hdr_size, size - hdr_size, badHeapWordVal);
+#endif // ASSERT
     // This addition is safe because we know that top is
     // at least size below end, so the add can't wrap.
     set_top(obj + size);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/universe.cpp
--- a/src/share/vm/memory/universe.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/universe.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -67,6 +67,8 @@
 objArrayOop Universe::_the_empty_system_obj_array     = NULL;
 objArrayOop Universe::_the_empty_class_klass_array    = NULL;
 objArrayOop Universe::_the_array_interfaces_array     = NULL;
+oop Universe::_the_null_string                        = NULL;
+oop Universe::_the_min_jint_string                   = NULL;
 LatestMethodOopCache* Universe::_finalizer_register_cache = NULL;
 LatestMethodOopCache* Universe::_loader_addClass_cache    = NULL;
 ActiveMethodOopsCache* Universe::_reflect_invoke_cache    = NULL;
@@ -187,6 +189,8 @@
   f->do_oop((oop*)&_the_empty_system_obj_array);
   f->do_oop((oop*)&_the_empty_class_klass_array);
   f->do_oop((oop*)&_the_array_interfaces_array);
+  f->do_oop((oop*)&_the_null_string);
+  f->do_oop((oop*)&_the_min_jint_string);
   _finalizer_register_cache->oops_do(f);
   _loader_addClass_cache->oops_do(f);
   _reflect_invoke_cache->oops_do(f);
@@ -287,14 +291,17 @@
 
     SystemDictionary::initialize(CHECK);
 
-    klassOop ok = SystemDictionary::object_klass();
+    klassOop ok = SystemDictionary::Object_klass();
+
+    _the_null_string            = StringTable::intern("null", CHECK);
+    _the_min_jint_string       = StringTable::intern("-2147483648", CHECK);
 
     if (UseSharedSpaces) {
       // Verify shared interfaces array.
       assert(_the_array_interfaces_array->obj_at(0) ==
-             SystemDictionary::cloneable_klass(), "u3");
+             SystemDictionary::Cloneable_klass(), "u3");
       assert(_the_array_interfaces_array->obj_at(1) ==
-             SystemDictionary::serializable_klass(), "u3");
+             SystemDictionary::Serializable_klass(), "u3");
 
       // Verify element klass for system obj array klass
       assert(objArrayKlass::cast(_systemObjArrayKlassObj)->element_klass() == ok, "u1");
@@ -313,8 +320,8 @@
       assert(Klass::cast(systemObjArrayKlassObj())->super() == ok, "u3");
     } else {
       // Set up shared interfaces array.  (Do this before supers are set up.)
-      _the_array_interfaces_array->obj_at_put(0, SystemDictionary::cloneable_klass());
-      _the_array_interfaces_array->obj_at_put(1, SystemDictionary::serializable_klass());
+      _the_array_interfaces_array->obj_at_put(0, SystemDictionary::Cloneable_klass());
+      _the_array_interfaces_array->obj_at_put(1, SystemDictionary::Serializable_klass());
 
       // Set element klass for system obj array klass
       objArrayKlass::cast(_systemObjArrayKlassObj)->set_element_klass(ok);
@@ -358,7 +365,7 @@
   // Initialize _objectArrayKlass after core bootstraping to make
   // sure the super class is set up properly for _objectArrayKlass.
   _objectArrayKlassObj = instanceKlass::
-    cast(SystemDictionary::object_klass())->array_klass(1, CHECK);
+    cast(SystemDictionary::Object_klass())->array_klass(1, CHECK);
   // Add the class to the class hierarchy manually to make sure that
   // its vtable is initialized after core bootstrapping is completed.
   Klass::cast(_objectArrayKlassObj)->append_to_sibling_list();
@@ -419,11 +426,11 @@
     while (i < size) {
       if (!UseConcMarkSweepGC) {
         // Allocate dummy in old generation
-        oop dummy = instanceKlass::cast(SystemDictionary::object_klass())->allocate_instance(CHECK);
+        oop dummy = instanceKlass::cast(SystemDictionary::Object_klass())->allocate_instance(CHECK);
         dummy_array->obj_at_put(i++, dummy);
       }
       // Allocate dummy in permanent generation
-      oop dummy = instanceKlass::cast(SystemDictionary::object_klass())->allocate_permanent_instance(CHECK);
+      oop dummy = instanceKlass::cast(SystemDictionary::Object_klass())->allocate_permanent_instance(CHECK);
       dummy_array->obj_at_put(i++, dummy);
     }
     {
@@ -533,7 +540,7 @@
   // but we cannot do that for classes created before java.lang.Class is loaded. Here we simply
   // walk over permanent objects created so far (mostly classes) and fixup their mirrors. Note
   // that the number of objects allocated at this point is very small.
-  assert(SystemDictionary::class_klass_loaded(), "java.lang.Class should be loaded");
+  assert(SystemDictionary::Class_klass_loaded(), "java.lang.Class should be loaded");
   FixupMirrorClosure blk;
   Universe::heap()->permanent_object_iterate(&blk);
 }
@@ -549,7 +556,7 @@
   if (TraceReferenceGC) tty->print_cr("Callback to run finalizers on exit");
   {
     PRESERVE_EXCEPTION_MARK;
-    KlassHandle finalizer_klass(THREAD, SystemDictionary::finalizer_klass());
+    KlassHandle finalizer_klass(THREAD, SystemDictionary::Finalizer_klass());
     JavaValue result(T_VOID);
     JavaCalls::call_static(
       &result,
@@ -744,19 +751,22 @@
 static const uint64_t OopEncodingHeapMax = NarrowOopHeapMax << LogMinObjAlignmentInBytes;
 
 char* Universe::preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode) {
+  size_t base = 0;
 #ifdef _LP64
   if (UseCompressedOops) {
     assert(mode == UnscaledNarrowOop  ||
            mode == ZeroBasedNarrowOop ||
            mode == HeapBasedNarrowOop, "mode is invalid");
-
     const size_t total_size = heap_size + HeapBaseMinAddress;
-    if (total_size <= OopEncodingHeapMax && (mode != HeapBasedNarrowOop)) {
+    // Return specified base for the first request.
+    if (!FLAG_IS_DEFAULT(HeapBaseMinAddress) && (mode == UnscaledNarrowOop)) {
+      base = HeapBaseMinAddress;
+    } else if (total_size <= OopEncodingHeapMax && (mode != HeapBasedNarrowOop)) {
       if (total_size <= NarrowOopHeapMax && (mode == UnscaledNarrowOop) &&
           (Universe::narrow_oop_shift() == 0)) {
         // Use 32-bits oops without encoding and
         // place heap's top on the 4Gb boundary
-        return (char*)(NarrowOopHeapMax - heap_size);
+        base = (NarrowOopHeapMax - heap_size);
       } else {
         // Can't reserve with NarrowOopShift == 0
         Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
@@ -765,16 +775,38 @@
           // Use zero based compressed oops with encoding and
           // place heap's top on the 32Gb boundary in case
           // total_size > 4Gb or failed to reserve below 4Gb.
-          return (char*)(OopEncodingHeapMax - heap_size);
+          base = (OopEncodingHeapMax - heap_size);
         }
       }
     } else {
       // Can't reserve below 32Gb.
       Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
     }
+    // Set narrow_oop_base and narrow_oop_use_implicit_null_checks
+    // used in ReservedHeapSpace() constructors.
+    // The final values will be set in initialize_heap() below.
+    if (base != 0 && (base + heap_size) <= OopEncodingHeapMax) {
+      // Use zero based compressed oops
+      Universe::set_narrow_oop_base(NULL);
+      // Don't need guard page for implicit checks in indexed
+      // addressing mode with zero based Compressed Oops.
+      Universe::set_narrow_oop_use_implicit_null_checks(true);
+    } else {
+      // Set to a non-NULL value so the ReservedSpace ctor computes
+      // the correct no-access prefix.
+      // The final value will be set in initialize_heap() below.
+      Universe::set_narrow_oop_base((address)NarrowOopHeapMax);
+#ifdef _WIN64
+      if (UseLargePages) {
+        // Cannot allocate guard pages for implicit checks in indexed
+        // addressing mode when large pages are specified on windows.
+        Universe::set_narrow_oop_use_implicit_null_checks(false);
+      }
+#endif //  _WIN64
+    }
   }
 #endif
-  return NULL; // also return NULL (don't care) for 32-bit VM
+  return (char*)base; // also return NULL (don't care) for 32-bit VM
 }
 
 jint Universe::initialize_heap() {
@@ -857,7 +889,7 @@
         // Can't reserve heap below 4Gb.
         Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
       } else {
-        assert(Universe::narrow_oop_shift() == 0, "use unscaled narrow oop");
+        Universe::set_narrow_oop_shift(0);
         if (PrintCompressedOopsMode) {
           tty->print(", 32-bits Oops");
         }
@@ -918,7 +950,7 @@
   { ResourceMark rm;
     Interpreter::initialize();      // needed for interpreter entry points
     if (!UseSharedSpaces) {
-      KlassHandle ok_h(THREAD, SystemDictionary::object_klass());
+      KlassHandle ok_h(THREAD, SystemDictionary::Object_klass());
       Universe::reinitialize_vtable_of(ok_h, CHECK_false);
       Universe::reinitialize_itables(CHECK_false);
     }
@@ -928,7 +960,7 @@
   instanceKlassHandle k_h;
   if (!UseSharedSpaces) {
     // Setup preallocated empty java.lang.Class array
-    Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_false);
+    Universe::_the_empty_class_klass_array = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_false);
     // Setup preallocated OutOfMemoryError errors
     k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_OutOfMemoryError(), true, CHECK_false);
     k_h = instanceKlassHandle(THREAD, k);
@@ -995,8 +1027,8 @@
   // Setup static method for registering finalizers
   // The finalizer klass must be linked before looking up the method, in
   // case it needs to get rewritten.
-  instanceKlass::cast(SystemDictionary::finalizer_klass())->link_class(CHECK_false);
-  methodOop m = instanceKlass::cast(SystemDictionary::finalizer_klass())->find_method(
+  instanceKlass::cast(SystemDictionary::Finalizer_klass())->link_class(CHECK_false);
+  methodOop m = instanceKlass::cast(SystemDictionary::Finalizer_klass())->find_method(
                                   vmSymbols::register_method_name(),
                                   vmSymbols::register_method_signature());
   if (m == NULL || !m->is_static()) {
@@ -1004,7 +1036,7 @@
       "java.lang.ref.Finalizer.register", false);
   }
   Universe::_finalizer_register_cache->init(
-    SystemDictionary::finalizer_klass(), m, CHECK_false);
+    SystemDictionary::Finalizer_klass(), m, CHECK_false);
 
   // Resolve on first use and initialize class.
   // Note: No race-condition here, since a resolve will always return the same result
@@ -1021,14 +1053,14 @@
   Universe::_reflect_invoke_cache->init(k_h(), m, CHECK_false);
 
   // Setup method for registering loaded classes in class loader vector
-  instanceKlass::cast(SystemDictionary::classloader_klass())->link_class(CHECK_false);
-  m = instanceKlass::cast(SystemDictionary::classloader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
+  instanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false);
+  m = instanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
   if (m == NULL || m->is_static()) {
     THROW_MSG_(vmSymbols::java_lang_NoSuchMethodException(),
       "java.lang.ClassLoader.addClass", false);
   }
   Universe::_loader_addClass_cache->init(
-    SystemDictionary::classloader_klass(), m, CHECK_false);
+    SystemDictionary::ClassLoader_klass(), m, CHECK_false);
 
   // The folowing is initializing converter functions for serialization in
   // JVM.cpp. If we clean up the StrictMath code above we may want to find
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/memory/universe.hpp
--- a/src/share/vm/memory/universe.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/memory/universe.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -169,6 +169,8 @@
   static objArrayOop  _the_empty_system_obj_array;    // Canonicalized system obj array
   static objArrayOop  _the_empty_class_klass_array;   // Canonicalized obj array of type java.lang.Class
   static objArrayOop  _the_array_interfaces_array;    // Canonicalized 2-array of cloneable & serializable klasses
+  static oop          _the_null_string;               // A cache of "null" as a Java string
+  static oop          _the_min_jint_string;          // A cache of "-2147483648" as a Java string
   static LatestMethodOopCache* _finalizer_register_cache; // static method for registering finalizable objects
   static LatestMethodOopCache* _loader_addClass_cache;    // method for registering loaded classes in class loader vector
   static ActiveMethodOopsCache* _reflect_invoke_cache;    // method for security checks
@@ -310,6 +312,8 @@
   static objArrayOop  the_empty_system_obj_array ()   { return _the_empty_system_obj_array;    }
   static objArrayOop  the_empty_class_klass_array ()  { return _the_empty_class_klass_array;   }
   static objArrayOop  the_array_interfaces_array()    { return _the_array_interfaces_array;    }
+  static oop          the_null_string()               { return _the_null_string;               }
+  static oop          the_min_jint_string()          { return _the_min_jint_string;          }
   static methodOop    finalizer_register_method()     { return _finalizer_register_cache->get_methodOop(); }
   static methodOop    loader_addClass_method()        { return _loader_addClass_cache->get_methodOop(); }
   static ActiveMethodOopsCache* reflect_invoke_cache() { return _reflect_invoke_cache; }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/arrayKlass.cpp
--- a/src/share/vm/oops/arrayKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/arrayKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -43,7 +43,7 @@
   if (super() == NULL)  return NULL;  // bootstrap case
   // Array klasses have primary supertypes which are not reported to Java.
   // Example super chain:  String[][] -> Object[][] -> Object[] -> Object
-  return SystemDictionary::object_klass();
+  return SystemDictionary::Object_klass();
 }
 
 
@@ -82,7 +82,7 @@
   k = arrayKlassHandle(THREAD, base_klass());
 
   assert(!k()->is_parsable(), "not expecting parsability yet.");
-  k->set_super(Universe::is_bootstrapping() ? (klassOop)NULL : SystemDictionary::object_klass());
+  k->set_super(Universe::is_bootstrapping() ? (klassOop)NULL : SystemDictionary::Object_klass());
   k->set_layout_helper(Klass::_lh_neutral_value);
   k->set_dimension(1);
   k->set_higher_dimension(NULL);
@@ -117,9 +117,9 @@
 
 bool arrayKlass::compute_is_subtype_of(klassOop k) {
   // An array is a subtype of Serializable, Clonable, and Object
-  return    k == SystemDictionary::object_klass()
-         || k == SystemDictionary::cloneable_klass()
-         || k == SystemDictionary::serializable_klass();
+  return    k == SystemDictionary::Object_klass()
+         || k == SystemDictionary::Cloneable_klass()
+         || k == SystemDictionary::Serializable_klass();
 }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/arrayKlass.hpp
--- a/src/share/vm/oops/arrayKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/arrayKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -67,7 +67,7 @@
   // Compiler/Interpreter offset
   static ByteSize component_mirror_offset() { return byte_offset_of(arrayKlass, _component_mirror); }
 
-  virtual klassOop java_super() const;//{ return SystemDictionary::object_klass(); }
+  virtual klassOop java_super() const;//{ return SystemDictionary::Object_klass(); }
 
   // Allocation
   // Sizes points to the first dimension of the array, subsequent dimensions
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/arrayKlassKlass.cpp
--- a/src/share/vm/oops/arrayKlassKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/arrayKlassKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -159,7 +159,7 @@
   assert(obj->is_klass(), "must be klass");
   klassKlass::oop_print_on(obj, st);
 }
-
+#endif //PRODUCT
 
 void arrayKlassKlass::oop_print_value_on(oop obj, outputStream* st) {
   assert(obj->is_klass(), "must be klass");
@@ -168,7 +168,6 @@
     st->print("[]");
   }
 }
-#endif
 
 
 const char* arrayKlassKlass::internal_name() const {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/arrayKlassKlass.hpp
--- a/src/share/vm/oops/arrayKlassKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/arrayKlassKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -55,14 +55,13 @@
   int oop_oop_iterate(oop obj, OopClosure* blk);
   int oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr);
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on(oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
-#endif
+#endif //PRODUCT
 
- public:
   // Verification
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/compiledICHolderKlass.cpp
--- a/src/share/vm/oops/compiledICHolderKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/compiledICHolderKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -166,12 +166,12 @@
   st->print(" - klass:  "); c->holder_klass()->print_value_on(st); st->cr();
 }
 
+#endif //PRODUCT
 
 void compiledICHolderKlass::oop_print_value_on(oop obj, outputStream* st) {
   assert(obj->is_compiledICHolder(), "must be compiledICHolder");
   Klass::oop_print_value_on(obj, st);
 }
-#endif
 
 const char* compiledICHolderKlass::internal_name() const {
   return "{compiledICHolder}";
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/compiledICHolderKlass.hpp
--- a/src/share/vm/oops/compiledICHolderKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/compiledICHolderKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -68,14 +68,13 @@
   int  oop_oop_iterate(oop obj, OopClosure* blk);
   int  oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr);
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on      (oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
-#endif
+#endif //PRODUCT
 
- public:
   // Verification
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/constMethodKlass.cpp
--- a/src/share/vm/oops/constMethodKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/constMethodKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -216,6 +216,7 @@
   }
 }
 
+#endif //PRODUCT
 
 // Short version of printing constMethodOop - just print the name of the
 // method it belongs to.
@@ -226,8 +227,6 @@
   m->method()->print_value_on(st);
 }
 
-#endif // PRODUCT
-
 const char* constMethodKlass::internal_name() const {
   return "{constMethod}";
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/constMethodKlass.hpp
--- a/src/share/vm/oops/constMethodKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/constMethodKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -77,15 +77,13 @@
   int oop_oop_iterate(oop obj, OopClosure* blk);
   int oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr);
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on      (oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
+#endif //PRODUCT
 
-#endif
-
- public:
   // Verify operations
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/constMethodOop.hpp
--- a/src/share/vm/oops/constMethodOop.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/constMethodOop.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -258,6 +258,11 @@
   LocalVariableTableElement* localvariable_table_start() const;
 
   // byte codes
+  void    set_code(address code) {
+    if (code_size() > 0) {
+      memcpy(code_base(), code, code_size());
+    }
+  }
   address code_base() const            { return (address) (this+1); }
   address code_end() const             { return code_base() + code_size(); }
   bool    contains(address bcp) const  { return code_base() <= bcp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/constantPoolKlass.cpp
--- a/src/share/vm/oops/constantPoolKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/constantPoolKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -387,8 +387,18 @@
   cp->set_cache(cache());
 }
 
+#endif
 
-#endif
+void constantPoolKlass::oop_print_value_on(oop obj, outputStream* st) {
+  assert(obj->is_constantPool(), "must be constantPool");
+  constantPoolOop cp = constantPoolOop(obj);
+  st->print("constant pool [%d]", cp->length());
+  if (cp->has_pseudo_string()) st->print("/pseudo_string");
+  if (cp->has_invokedynamic()) st->print("/invokedynamic");
+  cp->print_address_on(st);
+  st->print(" for ");
+  cp->pool_holder()->print_value_on(st);
+}
 
 const char* constantPoolKlass::internal_name() const {
   return "{constant pool}";
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/constantPoolKlass.hpp
--- a/src/share/vm/oops/constantPoolKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/constantPoolKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -65,9 +65,10 @@
   juint alloc_size() const              { return _alloc_size; }
   void set_alloc_size(juint n)          { _alloc_size = n; }
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on(oop obj, outputStream* st);
 #endif
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/constantPoolOop.cpp
--- a/src/share/vm/oops/constantPoolOop.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/constantPoolOop.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -110,7 +110,7 @@
         }
 
         if (!PENDING_EXCEPTION->
-              is_a(SystemDictionary::linkageError_klass())) {
+              is_a(SystemDictionary::LinkageError_klass())) {
           // Just throw the exception and don't prevent these classes from
           // being loaded due to virtual machine errors like StackOverflow
           // and OutOfMemoryError, etc, or if the thread was hit by stop()
@@ -262,25 +262,48 @@
 
 
 int constantPoolOopDesc::impl_name_and_type_ref_index_at(int which, bool uncached) {
-  jint ref_index = field_or_method_at(which, uncached);
+  int i = which;
+  if (!uncached && cache() != NULL) {
+    if (constantPoolCacheOopDesc::is_secondary_index(which))
+      // Invokedynamic indexes are always processed in native order
+      // so there is no question of reading a native u2 in Java order here.
+      return cache()->main_entry_at(which)->constant_pool_index();
+    // change byte-ordering and go via cache
+    i = remap_instruction_operand_from_cache(which);
+  } else {
+    if (tag_at(which).is_name_and_type())
+      // invokedynamic index is a simple name-and-type
+      return which;
+  }
+  assert(tag_at(i).is_field_or_method(), "Corrupted constant pool");
+  jint ref_index = *int_at_addr(i);
   return extract_high_short_from_int(ref_index);
 }
 
 
 int constantPoolOopDesc::impl_klass_ref_index_at(int which, bool uncached) {
-  jint ref_index = field_or_method_at(which, uncached);
+  guarantee(!constantPoolCacheOopDesc::is_secondary_index(which),
+            "an invokedynamic instruction does not have a klass");
+  int i = which;
+  if (!uncached && cache() != NULL) {
+    // change byte-ordering and go via cache
+    i = remap_instruction_operand_from_cache(which);
+  }
+  assert(tag_at(i).is_field_or_method(), "Corrupted constant pool");
+  jint ref_index = *int_at_addr(i);
   return extract_low_short_from_int(ref_index);
 }
 
 
 
-int constantPoolOopDesc::map_instruction_operand_to_index(int operand) {
-  if (constantPoolCacheOopDesc::is_secondary_index(operand)) {
-    return cache()->main_entry_at(operand)->constant_pool_index();
-  }
+int constantPoolOopDesc::remap_instruction_operand_from_cache(int operand) {
+  // Operand was fetched by a stream using get_Java_u2, yet was stored
+  // by Rewriter::rewrite_member_reference in native order.
+  // So now we have to fix the damage by swapping back to native order.
   assert((int)(u2)operand == operand, "clean u2");
-  int index = Bytes::swap_u2(operand);
-  return cache()->entry_at(index)->constant_pool_index();
+  int cpc_index = Bytes::swap_u2(operand);
+  int member_index = cache()->entry_at(cpc_index)->constant_pool_index();
+  return member_index;
 }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/constantPoolOop.hpp
--- a/src/share/vm/oops/constantPoolOop.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/constantPoolOop.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -191,6 +191,16 @@
     }
   }
 
+  void object_at_put(int which, oop str) {
+    oop_store((volatile oop*) obj_at_addr(which), str);
+    release_tag_at_put(which, JVM_CONSTANT_Object);
+    if (UseConcMarkSweepGC) {
+      // In case the earlier card-mark was consumed by a concurrent
+      // marking thread before the tag was updated, redirty the card.
+      oop_store_without_check((volatile oop*) obj_at_addr(which), str);
+    }
+  }
+
   // For temporary use while constructing constant pool
   void string_index_at_put(int which, int string_index) {
     tag_at_put(which, JVM_CONSTANT_StringIndex);
@@ -228,7 +238,8 @@
       tag.is_unresolved_klass() ||
       tag.is_symbol() ||
       tag.is_unresolved_string() ||
-      tag.is_string();
+      tag.is_string() ||
+      tag.is_object();
   }
 
   // Fetching constants
@@ -291,6 +302,11 @@
     return string_at_impl(h_this, which, CHECK_NULL);
   }
 
+  oop object_at(int which) {
+    assert(tag_at(which).is_object(), "Corrupted constant pool");
+    return *obj_at_addr(which);
+  }
+
   // A "pseudo-string" is an non-string oop that has found is way into
   // a String entry.
   // Under AnonymousClasses this can happen if the user patches a live
@@ -342,12 +358,14 @@
   }
 
   // The following methods (name/signature/klass_ref_at, klass_ref_at_noresolve,
-  // name_and_type_ref_index_at) all expect constant pool indices
-  // from the bytecodes to be passed in, which are actually potentially byte-swapped
-  // or rewritten constant pool cache indices.  They all call map_instruction_operand_to_index.
-  int map_instruction_operand_to_index(int operand);
+  // name_and_type_ref_index_at) all expect to be passed indices obtained
+  // directly from the bytecode, and extracted according to java byte order.
+  // If the indices are meant to refer to fields or methods, they are
+  // actually potentially byte-swapped, rewritten constant pool cache indices.
+  // The routine remap_instruction_operand_from_cache manages the adjustment
+  // of these values back to constant pool indices.
 
-  // There are also "uncached" versions which do not map the operand index; see below.
+  // There are also "uncached" versions which do not adjust the operand index; see below.
 
   // Lookup for entries consisting of (klass_index, name_and_type index)
   klassOop klass_ref_at(int which, TRAPS);
@@ -361,8 +379,6 @@
   // Lookup for entries consisting of (name_index, signature_index)
   int name_ref_index_at(int which_nt);            // ==  low-order jshort of name_and_type_at(which_nt)
   int signature_ref_index_at(int which_nt);       // == high-order jshort of name_and_type_at(which_nt)
-  symbolOop nt_name_ref_at(int which_nt)          { return symbol_at(name_ref_index_at(which_nt)); }
-  symbolOop nt_signature_ref_at(int which_nt)     { return symbol_at(signature_ref_index_at(which_nt)); }
 
   BasicType basic_type_for_signature_at(int which);
 
@@ -425,18 +441,7 @@
   int       impl_klass_ref_index_at(int which, bool uncached);
   int       impl_name_and_type_ref_index_at(int which, bool uncached);
 
-  // Takes either a constant pool cache index in possibly byte-swapped
-  // byte order (which comes from the bytecodes after rewriting) or,
-  // if "uncached" is true, a vanilla constant pool index
-  jint field_or_method_at(int which, bool uncached) {
-    int i = which;
-    if (!uncached && cache() != NULL) {
-      // change byte-ordering and go via cache
-      i = map_instruction_operand_to_index(which);
-    }
-    assert(tag_at(i).is_field_or_method(), "Corrupted constant pool");
-    return *int_at_addr(i);
-  }
+  int remap_instruction_operand_from_cache(int operand);
 
   // Used while constructing constant pool (only by ClassFileParser)
   jint klass_index_at(int which) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/cpCacheKlass.cpp
--- a/src/share/vm/oops/cpCacheKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/cpCacheKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -261,6 +261,15 @@
 
 #endif
 
+void constantPoolCacheKlass::oop_print_value_on(oop obj, outputStream* st) {
+  assert(obj->is_constantPoolCache(), "obj must be constant pool cache");
+  constantPoolCacheOop cache = (constantPoolCacheOop)obj;
+  st->print("cache [%d]", cache->length());
+  cache->print_address_on(st);
+  st->print(" for ");
+  cache->constant_pool()->print_value_on(st);
+}
+
 void constantPoolCacheKlass::oop_verify_on(oop obj, outputStream* st) {
   guarantee(obj->is_constantPoolCache(), "obj must be constant pool cache");
   constantPoolCacheOop cache = (constantPoolCacheOop)obj;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/cpCacheKlass.hpp
--- a/src/share/vm/oops/cpCacheKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/cpCacheKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -61,9 +61,10 @@
   juint alloc_size() const              { return _alloc_size; }
   void set_alloc_size(juint n)          { _alloc_size = n; }
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on(oop obj, outputStream* st);
 #endif
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/cpCacheOop.cpp
--- a/src/share/vm/oops/cpCacheOop.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/cpCacheOop.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -28,21 +28,17 @@
 
 // Implememtation of ConstantPoolCacheEntry
 
-void ConstantPoolCacheEntry::set_initial_state(int index) {
-  if (constantPoolCacheOopDesc::is_secondary_index(index)) {
-    // Hack:  The rewriter is trying to say that this entry itself
-    // will be a secondary entry.
-    int main_index = constantPoolCacheOopDesc::decode_secondary_index(index);
-    assert(0 <= main_index && main_index < 0x10000, "sanity check");
-    _indices = (main_index << 16);
-    assert(main_entry_index() == main_index, "");
-    return;
-  }
+void ConstantPoolCacheEntry::initialize_entry(int index) {
   assert(0 < index && index < 0x10000, "sanity check");
   _indices = index;
   assert(constant_pool_index() == index, "");
 }
 
+void ConstantPoolCacheEntry::initialize_secondary_entry(int main_index) {
+  assert(0 <= main_index && main_index < 0x10000, "sanity check");
+  _indices = (main_index << 16);
+  assert(main_entry_index() == main_index, "");
+}
 
 int ConstantPoolCacheEntry::as_flags(TosState state, bool is_final,
                     bool is_vfinal, bool is_volatile,
@@ -223,10 +219,10 @@
 
 
 void ConstantPoolCacheEntry::set_dynamic_call(Handle call_site, int extra_data) {
-  methodOop method = (methodOop) sun_dyn_CallSiteImpl::vmmethod(call_site());
+  methodOop method = (methodOop) java_dyn_CallSite::vmmethod(call_site());
   assert(method->is_method(), "must be initialized properly");
   int param_size = method->size_of_parameters();
-  assert(param_size > 1, "method argument size must include MH.this & initial dynamic receiver");
+  assert(param_size >= 1, "method argument size must include MH.this");
   param_size -= 1;              // do not count MH.this; it is not stacked for invokedynamic
   if (Atomic::cmpxchg_ptr(call_site(), &_f1, NULL) == NULL) {
     // racing threads might be trying to install their own favorites
@@ -439,7 +435,18 @@
 
 void constantPoolCacheOopDesc::initialize(intArray& inverse_index_map) {
   assert(inverse_index_map.length() == length(), "inverse index map must have same length as cache");
-  for (int i = 0; i < length(); i++) entry_at(i)->set_initial_state(inverse_index_map[i]);
+  for (int i = 0; i < length(); i++) {
+    ConstantPoolCacheEntry* e = entry_at(i);
+    int original_index = inverse_index_map[i];
+    if ((original_index & Rewriter::_secondary_entry_tag) != 0) {
+      int main_index = (original_index - Rewriter::_secondary_entry_tag);
+      assert(!entry_at(main_index)->is_secondary_entry(), "valid main index");
+      e->initialize_secondary_entry(main_index);
+    } else {
+      e->initialize_entry(original_index);
+    }
+    assert(entry_at(i) == e, "sanity");
+  }
 }
 
 // RedefineClasses() API support:
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/cpCacheOop.hpp
--- a/src/share/vm/oops/cpCacheOop.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/cpCacheOop.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -154,7 +154,8 @@
   };
 
   // Initialization
-  void set_initial_state(int index);             // sets entry to initial state
+  void initialize_entry(int original_index);     // initialize primary entry
+  void initialize_secondary_entry(int main_index); // initialize secondary entry
 
   void set_field(                                // sets entry to resolved field state
     Bytecodes::Code get_code,                    // the bytecode used for reading the field
@@ -251,6 +252,7 @@
 
   // Code generation support
   static WordSize size()                         { return in_WordSize(sizeof(ConstantPoolCacheEntry) / HeapWordSize); }
+  static ByteSize size_in_bytes()                { return in_ByteSize(sizeof(ConstantPoolCacheEntry)); }
   static ByteSize indices_offset()               { return byte_offset_of(ConstantPoolCacheEntry, _indices); }
   static ByteSize f1_offset()                    { return byte_offset_of(ConstantPoolCacheEntry, _f1); }
   static ByteSize f2_offset()                    { return byte_offset_of(ConstantPoolCacheEntry, _f2); }
@@ -321,6 +323,7 @@
   ConstantPoolCacheEntry* base() const           { return (ConstantPoolCacheEntry*)((address)this + in_bytes(base_offset())); }
 
   friend class constantPoolCacheKlass;
+  friend class ConstantPoolCacheEntry;
 
  public:
   // Initialization
@@ -329,7 +332,8 @@
   // Secondary indexes.
   // They must look completely different from normal indexes.
   // The main reason is that byte swapping is sometimes done on normal indexes.
-  // Also, it is helpful for debugging to tell the two apart.
+  // Also, some of the CP accessors do different things for secondary indexes.
+  // Finally, it is helpful for debugging to tell the two apart.
   static bool is_secondary_index(int i) { return (i < 0); }
   static int  decode_secondary_index(int i) { assert(is_secondary_index(i),  ""); return ~i; }
   static int  encode_secondary_index(int i) { assert(!is_secondary_index(i), ""); return ~i; }
@@ -337,18 +341,35 @@
   // Accessors
   void set_constant_pool(constantPoolOop pool)   { oop_store_without_check((oop*)&_constant_pool, (oop)pool); }
   constantPoolOop constant_pool() const          { return _constant_pool; }
-  ConstantPoolCacheEntry* entry_at(int i) const  { assert(0 <= i && i < length(), "index out of bounds"); return base() + i; }
+  // Fetches the entry at the given index.
+  // The entry may be either primary or secondary.
+  // In either case the index must not be encoded or byte-swapped in any way.
+  ConstantPoolCacheEntry* entry_at(int i) const {
+    assert(0 <= i && i < length(), "index out of bounds");
+    return base() + i;
+  }
+  // Fetches the secondary entry referred to by index.
+  // The index may be a secondary index, and must not be byte-swapped.
+  ConstantPoolCacheEntry* secondary_entry_at(int i) const {
+    int raw_index = i;
+    if (is_secondary_index(i)) {  // correct these on the fly
+      raw_index = decode_secondary_index(i);
+    }
+    assert(entry_at(raw_index)->is_secondary_entry(), "not a secondary entry");
+    return entry_at(raw_index);
+  }
+  // Given a primary or secondary index, fetch the corresponding primary entry.
+  // Indirect through the secondary entry, if the index is encoded as a secondary index.
+  // The index must not be byte-swapped.
   ConstantPoolCacheEntry* main_entry_at(int i) const {
-    ConstantPoolCacheEntry* e;
+    int primary_index = i;
     if (is_secondary_index(i)) {
       // run through an extra level of indirection:
-      i = decode_secondary_index(i);
-      e = entry_at(i);
-      i = e->main_entry_index();
+      int raw_index = decode_secondary_index(i);
+      primary_index = entry_at(raw_index)->main_entry_index();
     }
-    e = entry_at(i);
-    assert(!e->is_secondary_entry(), "only one level of indirection");
-    return e;
+    assert(!entry_at(primary_index)->is_secondary_entry(), "only one level of indirection");
+    return entry_at(primary_index);
   }
 
   // GC support
@@ -359,6 +380,12 @@
 
   // Code generation
   static ByteSize base_offset()                  { return in_ByteSize(sizeof(constantPoolCacheOopDesc)); }
+  static ByteSize entry_offset(int raw_index) {
+    int index = raw_index;
+    if (is_secondary_index(raw_index))
+      index = decode_secondary_index(raw_index);
+    return (base_offset() + ConstantPoolCacheEntry::size_in_bytes() * index);
+  }
 
   // RedefineClasses() API support:
   // If any entry of this constantPoolCache points to any of
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/generateOopMap.cpp
--- a/src/share/vm/oops/generateOopMap.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/generateOopMap.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1559,7 +1559,7 @@
     case Bytecodes::_invokevirtual:
     case Bytecodes::_invokespecial:     do_method(false, false, itr->get_index_big(), itr->bci()); break;
     case Bytecodes::_invokestatic:      do_method(true,  false, itr->get_index_big(), itr->bci()); break;
-    case Bytecodes::_invokedynamic:     do_method(false, true,  itr->get_index_int(), itr->bci()); break;
+    case Bytecodes::_invokedynamic:     do_method(true,  false, itr->get_index_int(), itr->bci()); break;
     case Bytecodes::_invokeinterface:   do_method(false, true,  itr->get_index_big(), itr->bci()); break;
     case Bytecodes::_newarray:
     case Bytecodes::_anewarray:         pp_new_ref(vCTS, itr->bci()); break;
@@ -1830,12 +1830,8 @@
 
 
 void GenerateOopMap::do_ldc(int idx, int bci) {
-  constantPoolOop cp = method()->constants();
-  constantTag tag    = cp->tag_at(idx);
-
-  CellTypeState cts = (tag.is_string() || tag.is_unresolved_string() ||
-                       tag.is_klass()  || tag.is_unresolved_klass())
-                    ? CellTypeState::make_line_ref(bci) : valCTS;
+  constantPoolOop cp  = method()->constants();
+  CellTypeState   cts = cp->is_pointer_entry(idx) ? CellTypeState::make_line_ref(bci) : valCTS;
   ppush1(cts);
 }
 
@@ -1900,11 +1896,9 @@
 }
 
 void GenerateOopMap::do_method(int is_static, int is_interface, int idx, int bci) {
-  // Dig up signature for field in constant pool
-  constantPoolOop cp    = _method->constants();
-  int nameAndTypeIdx    = cp->name_and_type_ref_index_at(idx);
-  int signatureIdx      = cp->signature_ref_index_at(nameAndTypeIdx);  // @@@@@
-  symbolOop signature   = cp->symbol_at(signatureIdx);
+ // Dig up signature for field in constant pool
+  constantPoolOop cp  = _method->constants();
+  symbolOop signature = cp->signature_ref_at(idx);
 
   // Parse method signature
   CellTypeState out[4];
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/instanceKlass.cpp
--- a/src/share/vm/oops/instanceKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/instanceKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -25,6 +25,58 @@
 # include "incls/_precompiled.incl"
 # include "incls/_instanceKlass.cpp.incl"
 
+#ifdef DTRACE_ENABLED
+
+HS_DTRACE_PROBE_DECL4(hotspot, class__initialization__required,
+  char*, intptr_t, oop, intptr_t);
+HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__recursive,
+  char*, intptr_t, oop, intptr_t, int);
+HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__concurrent,
+  char*, intptr_t, oop, intptr_t, int);
+HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__erroneous,
+  char*, intptr_t, oop, intptr_t, int);
+HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__super__failed,
+  char*, intptr_t, oop, intptr_t, int);
+HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__clinit,
+  char*, intptr_t, oop, intptr_t, int);
+HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__error,
+  char*, intptr_t, oop, intptr_t, int);
+HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end,
+  char*, intptr_t, oop, intptr_t, int);
+
+#define DTRACE_CLASSINIT_PROBE(type, clss, thread_type)          \
+  {                                                              \
+    char* data = NULL;                                           \
+    int len = 0;                                                 \
+    symbolOop name = (clss)->name();                             \
+    if (name != NULL) {                                          \
+      data = (char*)name->bytes();                               \
+      len = name->utf8_length();                                 \
+    }                                                            \
+    HS_DTRACE_PROBE4(hotspot, class__initialization__##type,     \
+      data, len, (clss)->class_loader(), thread_type);           \
+  }
+
+#define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \
+  {                                                              \
+    char* data = NULL;                                           \
+    int len = 0;                                                 \
+    symbolOop name = (clss)->name();                             \
+    if (name != NULL) {                                          \
+      data = (char*)name->bytes();                               \
+      len = name->utf8_length();                                 \
+    }                                                            \
+    HS_DTRACE_PROBE5(hotspot, class__initialization__##type,     \
+      data, len, (clss)->class_loader(), thread_type, wait);     \
+  }
+
+#else //  ndef DTRACE_ENABLED
+
+#define DTRACE_CLASSINIT_PROBE(type, clss, thread_type)
+#define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait)
+
+#endif //  ndef DTRACE_ENABLED
+
 bool instanceKlass::should_be_initialized() const {
   return !is_initialized();
 }
@@ -110,7 +162,7 @@
   // 1) Verify the bytecodes
   Verifier::Mode mode =
     throw_verifyerror ? Verifier::ThrowException : Verifier::NoException;
-  return Verifier::verify(this_oop, mode, CHECK_false);
+  return Verifier::verify(this_oop, mode, this_oop->should_verify_class(), CHECK_false);
 }
 
 
@@ -292,6 +344,10 @@
   // A class could already be verified, since it has been reflected upon.
   this_oop->link_class(CHECK);
 
+  DTRACE_CLASSINIT_PROBE(required, instanceKlass::cast(this_oop()), -1);
+
+  bool wait = false;
+
   // refer to the JVM book page 47 for description of steps
   // Step 1
   { ObjectLocker ol(this_oop, THREAD);
@@ -303,19 +359,25 @@
     // we might end up throwing IE from link/symbol resolution sites
     // that aren't expected to throw.  This would wreak havoc.  See 6320309.
     while(this_oop->is_being_initialized() && !this_oop->is_reentrant_initialization(self)) {
+        wait = true;
       ol.waitUninterruptibly(CHECK);
     }
 
     // Step 3
-    if (this_oop->is_being_initialized() && this_oop->is_reentrant_initialization(self))
+    if (this_oop->is_being_initialized() && this_oop->is_reentrant_initialization(self)) {
+      DTRACE_CLASSINIT_PROBE_WAIT(recursive, instanceKlass::cast(this_oop()), -1,wait);
       return;
+    }
 
     // Step 4
-    if (this_oop->is_initialized())
+    if (this_oop->is_initialized()) {
+      DTRACE_CLASSINIT_PROBE_WAIT(concurrent, instanceKlass::cast(this_oop()), -1,wait);
       return;
+    }
 
     // Step 5
     if (this_oop->is_in_error_state()) {
+      DTRACE_CLASSINIT_PROBE_WAIT(erroneous, instanceKlass::cast(this_oop()), -1,wait);
       ResourceMark rm(THREAD);
       const char* desc = "Could not initialize class ";
       const char* className = this_oop->external_name();
@@ -348,6 +410,7 @@
         this_oop->set_initialization_state_and_notify(initialization_error, THREAD); // Locks object, set state, and notify all waiting threads
         CLEAR_PENDING_EXCEPTION;   // ignore any exception thrown, superclass initialization error is thrown below
       }
+      DTRACE_CLASSINIT_PROBE_WAIT(super__failed, instanceKlass::cast(this_oop()), -1,wait);
       THROW_OOP(e());
     }
   }
@@ -356,6 +419,7 @@
   {
     assert(THREAD->is_Java_thread(), "non-JavaThread in initialize_impl");
     JavaThread* jt = (JavaThread*)THREAD;
+    DTRACE_CLASSINIT_PROBE_WAIT(clinit, instanceKlass::cast(this_oop()), -1,wait);
     // Timer includes any side effects of class initialization (resolution,
     // etc), but not recursive entry into call_class_initializer().
     PerfClassTraceTime timer(ClassLoader::perf_class_init_time(),
@@ -383,7 +447,8 @@
       this_oop->set_initialization_state_and_notify(initialization_error, THREAD);
       CLEAR_PENDING_EXCEPTION;   // ignore any exception thrown, class initialization error is thrown below
     }
-    if (e->is_a(SystemDictionary::error_klass())) {
+    DTRACE_CLASSINIT_PROBE_WAIT(error, instanceKlass::cast(this_oop()), -1,wait);
+    if (e->is_a(SystemDictionary::Error_klass())) {
       THROW_OOP(e());
     } else {
       JavaCallArguments args(e);
@@ -392,6 +457,7 @@
                 &args);
     }
   }
+  DTRACE_CLASSINIT_PROBE_WAIT(end, instanceKlass::cast(this_oop()), -1,wait);
 }
 
 
@@ -568,7 +634,7 @@
     THROW_MSG(throwError ? vmSymbols::java_lang_InstantiationError()
               : vmSymbols::java_lang_InstantiationException(), external_name());
   }
-  if (as_klassOop() == SystemDictionary::class_klass()) {
+  if (as_klassOop() == SystemDictionary::Class_klass()) {
     ResourceMark rm(THREAD);
     THROW_MSG(throwError ? vmSymbols::java_lang_IllegalAccessError()
               : vmSymbols::java_lang_IllegalAccessException(), external_name());
@@ -967,33 +1033,78 @@
 
 
 // Lookup or create a jmethodID.
-// This code can be called by the VM thread.  For this reason it is critical that
-// there are no blocking operations (safepoints) while the lock is held -- or a
-// deadlock can occur.
-jmethodID instanceKlass::jmethod_id_for_impl(instanceKlassHandle ik_h, methodHandle method_h) {
+// This code is called by the VMThread and JavaThreads so the
+// locking has to be done very carefully to avoid deadlocks
+// and/or other cache consistency problems.
+//
+jmethodID instanceKlass::get_jmethod_id(instanceKlassHandle ik_h, methodHandle method_h) {
   size_t idnum = (size_t)method_h->method_idnum();
   jmethodID* jmeths = ik_h->methods_jmethod_ids_acquire();
   size_t length = 0;
   jmethodID id = NULL;
-  // array length stored in first element, other elements offset by one
-  if (jmeths == NULL ||                         // If there is no jmethodID array,
-      (length = (size_t)jmeths[0]) <= idnum ||  // or if it is too short,
-      (id = jmeths[idnum+1]) == NULL) {         // or if this jmethodID isn't allocated
-
-    // Do all the safepointing things (allocations) before grabbing the lock.
-    // These allocations will have to be freed if they are unused.
-
-    // Allocate a new array of methods.
+
+  // We use a double-check locking idiom here because this cache is
+  // performance sensitive. In the normal system, this cache only
+  // transitions from NULL to non-NULL which is safe because we use
+  // release_set_methods_jmethod_ids() to advertise the new cache.
+  // A partially constructed cache should never be seen by a racing
+  // thread. We also use release_store_ptr() to save a new jmethodID
+  // in the cache so a partially constructed jmethodID should never be
+  // seen either. Cache reads of existing jmethodIDs proceed without a
+  // lock, but cache writes of a new jmethodID requires uniqueness and
+  // creation of the cache itself requires no leaks so a lock is
+  // generally acquired in those two cases.
+  //
+  // If the RedefineClasses() API has been used, then this cache can
+  // grow and we'll have transitions from non-NULL to bigger non-NULL.
+  // Cache creation requires no leaks and we require safety between all
+  // cache accesses and freeing of the old cache so a lock is generally
+  // acquired when the RedefineClasses() API has been used.
+
+  if (jmeths != NULL) {
+    // the cache already exists
+    if (!ik_h->idnum_can_increment()) {
+      // the cache can't grow so we can just get the current values
+      get_jmethod_id_length_value(jmeths, idnum, &length, &id);
+    } else {
+      // cache can grow so we have to be more careful
+      if (Threads::number_of_threads() == 0 ||
+          SafepointSynchronize::is_at_safepoint()) {
+        // we're single threaded or at a safepoint - no locking needed
+        get_jmethod_id_length_value(jmeths, idnum, &length, &id);
+      } else {
+        MutexLocker ml(JmethodIdCreation_lock);
+        get_jmethod_id_length_value(jmeths, idnum, &length, &id);
+      }
+    }
+  }
+  // implied else:
+  // we need to allocate a cache so default length and id values are good
+
+  if (jmeths == NULL ||   // no cache yet
+      length <= idnum ||  // cache is too short
+      id == NULL) {       // cache doesn't contain entry
+
+    // This function can be called by the VMThread so we have to do all
+    // things that might block on a safepoint before grabbing the lock.
+    // Otherwise, we can deadlock with the VMThread or have a cache
+    // consistency issue. These vars keep track of what we might have
+    // to free after the lock is dropped.
+    jmethodID  to_dealloc_id     = NULL;
+    jmethodID* to_dealloc_jmeths = NULL;
+
+    // may not allocate new_jmeths or use it if we allocate it
     jmethodID* new_jmeths = NULL;
     if (length <= idnum) {
-      // A new array will be needed (unless some other thread beats us to it)
+      // allocate a new cache that might be used
       size_t size = MAX2(idnum+1, (size_t)ik_h->idnum_allocated_count());
       new_jmeths = NEW_C_HEAP_ARRAY(jmethodID, size+1);
       memset(new_jmeths, 0, (size+1)*sizeof(jmethodID));
-      new_jmeths[0] =(jmethodID)size;  // array size held in the first element
+      // cache size is stored in element[0], other elements offset by one
+      new_jmeths[0] = (jmethodID)size;
     }
 
-    // Allocate a new method ID.
+    // allocate a new jmethodID that might be used
     jmethodID new_id = NULL;
     if (method_h->is_old() && !method_h->is_obsolete()) {
       // The method passed in is old (but not obsolete), we need to use the current version
@@ -1007,63 +1118,111 @@
       new_id = JNIHandles::make_jmethod_id(method_h);
     }
 
-    if (Threads::number_of_threads() == 0 || SafepointSynchronize::is_at_safepoint()) {
-      // No need and unsafe to lock the JmethodIdCreation_lock at safepoint.
-      id = get_jmethod_id(ik_h, idnum, new_id, new_jmeths);
+    if (Threads::number_of_threads() == 0 ||
+        SafepointSynchronize::is_at_safepoint()) {
+      // we're single threaded or at a safepoint - no locking needed
+      id = get_jmethod_id_fetch_or_update(ik_h, idnum, new_id, new_jmeths,
+                                          &to_dealloc_id, &to_dealloc_jmeths);
     } else {
       MutexLocker ml(JmethodIdCreation_lock);
-      id = get_jmethod_id(ik_h, idnum, new_id, new_jmeths);
+      id = get_jmethod_id_fetch_or_update(ik_h, idnum, new_id, new_jmeths,
+                                          &to_dealloc_id, &to_dealloc_jmeths);
+    }
+
+    // The lock has been dropped so we can free resources.
+    // Free up either the old cache or the new cache if we allocated one.
+    if (to_dealloc_jmeths != NULL) {
+      FreeHeap(to_dealloc_jmeths);
+    }
+    // free up the new ID since it wasn't needed
+    if (to_dealloc_id != NULL) {
+      JNIHandles::destroy_jmethod_id(to_dealloc_id);
     }
   }
   return id;
 }
 
 
-jmethodID instanceKlass::get_jmethod_id(instanceKlassHandle ik_h, size_t idnum,
-                                        jmethodID new_id, jmethodID* new_jmeths) {
-  // Retry lookup after we got the lock or ensured we are at safepoint
+// Common code to fetch the jmethodID from the cache or update the
+// cache with the new jmethodID. This function should never do anything
+// that causes the caller to go to a safepoint or we can deadlock with
+// the VMThread or have cache consistency issues.
+//
+jmethodID instanceKlass::get_jmethod_id_fetch_or_update(
+            instanceKlassHandle ik_h, size_t idnum, jmethodID new_id,
+            jmethodID* new_jmeths, jmethodID* to_dealloc_id_p,
+            jmethodID** to_dealloc_jmeths_p) {
+  assert(new_id != NULL, "sanity check");
+  assert(to_dealloc_id_p != NULL, "sanity check");
+  assert(to_dealloc_jmeths_p != NULL, "sanity check");
+  assert(Threads::number_of_threads() == 0 ||
+         SafepointSynchronize::is_at_safepoint() ||
+         JmethodIdCreation_lock->owned_by_self(), "sanity check");
+
+  // reacquire the cache - we are locked, single threaded or at a safepoint
   jmethodID* jmeths = ik_h->methods_jmethod_ids_acquire();
-  jmethodID  id                = NULL;
-  jmethodID  to_dealloc_id     = NULL;
-  jmethodID* to_dealloc_jmeths = NULL;
-  size_t     length;
-
-  if (jmeths == NULL || (length = (size_t)jmeths[0]) <= idnum) {
+  jmethodID  id     = NULL;
+  size_t     length = 0;
+
+  if (jmeths == NULL ||                         // no cache yet
+      (length = (size_t)jmeths[0]) <= idnum) {  // cache is too short
     if (jmeths != NULL) {
-      // We have grown the array: copy the existing entries, and delete the old array
+      // copy any existing entries from the old cache
       for (size_t index = 0; index < length; index++) {
         new_jmeths[index+1] = jmeths[index+1];
       }
-      to_dealloc_jmeths = jmeths; // using the new jmeths, deallocate the old one
+      *to_dealloc_jmeths_p = jmeths;  // save old cache for later delete
     }
     ik_h->release_set_methods_jmethod_ids(jmeths = new_jmeths);
   } else {
+    // fetch jmethodID (if any) from the existing cache
     id = jmeths[idnum+1];
-    to_dealloc_jmeths = new_jmeths; // using the old jmeths, deallocate the new one
+    *to_dealloc_jmeths_p = new_jmeths;  // save new cache for later delete
   }
   if (id == NULL) {
+    // No matching jmethodID in the existing cache or we have a new
+    // cache or we just grew the cache. This cache write is done here
+    // by the first thread to win the foot race because a jmethodID
+    // needs to be unique once it is generally available.
     id = new_id;
-    jmeths[idnum+1] = id;  // install the new method ID
+
+    // The jmethodID cache can be read while unlocked so we have to
+    // make sure the new jmethodID is complete before installing it
+    // in the cache.
+    OrderAccess::release_store_ptr(&jmeths[idnum+1], id);
   } else {
-    to_dealloc_id = new_id; // the new id wasn't used, mark it for deallocation
-  }
-
-  // Free up unneeded or no longer needed resources
-  FreeHeap(to_dealloc_jmeths);
-  if (to_dealloc_id != NULL) {
-    JNIHandles::destroy_jmethod_id(to_dealloc_id);
+    *to_dealloc_id_p = new_id; // save new id for later delete
   }
   return id;
 }
 
 
+// Common code to get the jmethodID cache length and the jmethodID
+// value at index idnum if there is one.
+//
+void instanceKlass::get_jmethod_id_length_value(jmethodID* cache,
+       size_t idnum, size_t *length_p, jmethodID* id_p) {
+  assert(cache != NULL, "sanity check");
+  assert(length_p != NULL, "sanity check");
+  assert(id_p != NULL, "sanity check");
+
+  // cache size is stored in element[0], other elements offset by one
+  *length_p = (size_t)cache[0];
+  if (*length_p <= idnum) {  // cache is too short
+    *id_p = NULL;
+  } else {
+    *id_p = cache[idnum+1];  // fetch jmethodID (if any)
+  }
+}
+
+
 // Lookup a jmethodID, NULL if not found.  Do no blocking, no allocations, no handles
 jmethodID instanceKlass::jmethod_id_or_null(methodOop method) {
   size_t idnum = (size_t)method->method_idnum();
   jmethodID* jmeths = methods_jmethod_ids_acquire();
   size_t length;                                // length assigned as debugging crumb
   jmethodID id = NULL;
-  if (jmeths != NULL &&                         // If there is a jmethodID array,
+  if (jmeths != NULL &&                         // If there is a cache
       (length = (size_t)jmeths[0]) > idnum) {   // and if it is long enough,
     id = jmeths[idnum+1];                       // Look up the id (may be NULL)
   }
@@ -1074,18 +1233,35 @@
 // Cache an itable index
 void instanceKlass::set_cached_itable_index(size_t idnum, int index) {
   int* indices = methods_cached_itable_indices_acquire();
-  if (indices == NULL ||                         // If there is no index array,
-      ((size_t)indices[0]) <= idnum) {           // or if it is too short
-    // Lock before we allocate the array so we don't leak
+  int* to_dealloc_indices = NULL;
+
+  // We use a double-check locking idiom here because this cache is
+  // performance sensitive. In the normal system, this cache only
+  // transitions from NULL to non-NULL which is safe because we use
+  // release_set_methods_cached_itable_indices() to advertise the
+  // new cache. A partially constructed cache should never be seen
+  // by a racing thread. Cache reads and writes proceed without a
+  // lock, but creation of the cache itself requires no leaks so a
+  // lock is generally acquired in that case.
+  //
+  // If the RedefineClasses() API has been used, then this cache can
+  // grow and we'll have transitions from non-NULL to bigger non-NULL.
+  // Cache creation requires no leaks and we require safety between all
+  // cache accesses and freeing of the old cache so a lock is generally
+  // acquired when the RedefineClasses() API has been used.
+
+  if (indices == NULL || idnum_can_increment()) {
+    // we need a cache or the cache can grow
     MutexLocker ml(JNICachedItableIndex_lock);
-    // Retry lookup after we got the lock
+    // reacquire the cache to see if another thread already did the work
     indices = methods_cached_itable_indices_acquire();
     size_t length = 0;
-    // array length stored in first element, other elements offset by one
+    // cache size is stored in element[0], other elements offset by one
     if (indices == NULL || (length = (size_t)indices[0]) <= idnum) {
       size_t size = MAX2(idnum+1, (size_t)idnum_allocated_count());
       int* new_indices = NEW_C_HEAP_ARRAY(int, size+1);
-      // Copy the existing entries, if any
+      new_indices[0] = (int)size;
+      // copy any existing entries
       size_t i;
       for (i = 0; i < length; i++) {
         new_indices[i+1] = indices[i+1];
@@ -1095,15 +1271,32 @@
         new_indices[i+1] = -1;
       }
       if (indices != NULL) {
-        FreeHeap(indices);  // delete any old indices
+        // We have an old cache to delete so save it for after we
+        // drop the lock.
+        to_dealloc_indices = indices;
       }
       release_set_methods_cached_itable_indices(indices = new_indices);
     }
+
+    if (idnum_can_increment()) {
+      // this cache can grow so we have to write to it safely
+      indices[idnum+1] = index;
+    }
   } else {
     CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
   }
-  // This is a cache, if there is a race to set it, it doesn't matter
-  indices[idnum+1] = index;
+
+  if (!idnum_can_increment()) {
+    // The cache cannot grow and this JNI itable index value does not
+    // have to be unique like a jmethodID. If there is a race to set it,
+    // it doesn't matter.
+    indices[idnum+1] = index;
+  }
+
+  if (to_dealloc_indices != NULL) {
+    // we allocated a new cache so free the old one
+    FreeHeap(to_dealloc_indices);
+  }
 }
 
 
@@ -1396,18 +1589,18 @@
   /* Compute oopmap block range. The common case                         \
      is nonstatic_oop_map_size == 1. */                                  \
   OopMapBlock* map           = start_of_nonstatic_oop_maps();            \
-  OopMapBlock* const end_map = map + nonstatic_oop_map_size();           \
+  OopMapBlock* const end_map = map + nonstatic_oop_map_count();          \
   if (UseCompressedOops) {                                               \
     while (map < end_map) {                                              \
       InstanceKlass_SPECIALIZED_OOP_ITERATE(narrowOop,                   \
-        obj->obj_field_addr<narrowOop>(map->offset()), map->length(),    \
+        obj->obj_field_addr<narrowOop>(map->offset()), map->count(),     \
         do_oop, assert_fn)                                               \
       ++map;                                                             \
     }                                                                    \
   } else {                                                               \
     while (map < end_map) {                                              \
       InstanceKlass_SPECIALIZED_OOP_ITERATE(oop,                         \
-        obj->obj_field_addr<oop>(map->offset()), map->length(),          \
+        obj->obj_field_addr<oop>(map->offset()), map->count(),           \
         do_oop, assert_fn)                                               \
       ++map;                                                             \
     }                                                                    \
@@ -1417,19 +1610,19 @@
 #define InstanceKlass_OOP_MAP_REVERSE_ITERATE(obj, do_oop, assert_fn)    \
 {                                                                        \
   OopMapBlock* const start_map = start_of_nonstatic_oop_maps();          \
-  OopMapBlock* map             = start_map + nonstatic_oop_map_size();   \
+  OopMapBlock* map             = start_map + nonstatic_oop_map_count();  \
   if (UseCompressedOops) {                                               \
     while (start_map < map) {                                            \
       --map;                                                             \
       InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE(narrowOop,           \
-        obj->obj_field_addr<narrowOop>(map->offset()), map->length(),    \
+        obj->obj_field_addr<narrowOop>(map->offset()), map->count(),     \
         do_oop, assert_fn)                                               \
     }                                                                    \
   } else {                                                               \
     while (start_map < map) {                                            \
       --map;                                                             \
       InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE(oop,                 \
-        obj->obj_field_addr<oop>(map->offset()), map->length(),          \
+        obj->obj_field_addr<oop>(map->offset()), map->count(),           \
         do_oop, assert_fn)                                               \
     }                                                                    \
   }                                                                      \
@@ -1443,11 +1636,11 @@
      usually non-existent extra overhead of examining                    \
      all the maps. */                                                    \
   OopMapBlock* map           = start_of_nonstatic_oop_maps();            \
-  OopMapBlock* const end_map = map + nonstatic_oop_map_size();           \
+  OopMapBlock* const end_map = map + nonstatic_oop_map_count();          \
   if (UseCompressedOops) {                                               \
     while (map < end_map) {                                              \
       InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(narrowOop,           \
-        obj->obj_field_addr<narrowOop>(map->offset()), map->length(),    \
+        obj->obj_field_addr<narrowOop>(map->offset()), map->count(),     \
         low, high,                                                       \
         do_oop, assert_fn)                                               \
       ++map;                                                             \
@@ -1455,7 +1648,7 @@
   } else {                                                               \
     while (map < end_map) {                                              \
       InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(oop,                 \
-        obj->obj_field_addr<oop>(map->offset()), map->length(),          \
+        obj->obj_field_addr<oop>(map->offset()), map->count(),           \
         low, high,                                                       \
         do_oop, assert_fn)                                               \
       ++map;                                                             \
@@ -1773,7 +1966,7 @@
   }
 }
 
-char* instanceKlass::signature_name() const {
+const char* instanceKlass::signature_name() const {
   const char* src = (const char*) (name()->as_C_string());
   const int src_length = (int)strlen(src);
   char* dest = NEW_RESOURCE_ARRAY(char, src_length + 3);
@@ -1918,8 +2111,9 @@
     // As we walk along, look for equalities between outer1 and class2.
     // Eventually, the walks will terminate as outer1 stops
     // at the top-level class around the original class.
-    symbolOop ignore_name;
-    klassOop next = outer1->compute_enclosing_class(ignore_name, CHECK_false);
+    bool ignore_inner_is_member;
+    klassOop next = outer1->compute_enclosing_class(&ignore_inner_is_member,
+                                                    CHECK_false);
     if (next == NULL)  break;
     if (next == class2())  return true;
     outer1 = instanceKlassHandle(THREAD, next);
@@ -1928,8 +2122,9 @@
   // Now do the same for class2.
   instanceKlassHandle outer2 = class2;
   for (;;) {
-    symbolOop ignore_name;
-    klassOop next = outer2->compute_enclosing_class(ignore_name, CHECK_false);
+    bool ignore_inner_is_member;
+    klassOop next = outer2->compute_enclosing_class(&ignore_inner_is_member,
+                                                    CHECK_false);
     if (next == NULL)  break;
     // Might as well check the new outer against all available values.
     if (next == class1())  return true;
@@ -2025,7 +2220,7 @@
   // This is a short non-blocking critical region, so the no safepoint check is ok.
   OsrList_lock->lock_without_safepoint_check();
   assert(n->is_osr_method(), "wrong kind of nmethod");
-  n->set_link(osr_nmethods_head());
+  n->set_osr_link(osr_nmethods_head());
   set_osr_nmethods_head(n);
   // Remember to unlock again
   OsrList_lock->unlock();
@@ -2041,17 +2236,17 @@
   // Search for match
   while(cur != NULL && cur != n) {
     last = cur;
-    cur = cur->link();
+    cur = cur->osr_link();
   }
   if (cur == n) {
     if (last == NULL) {
       // Remove first element
-      set_osr_nmethods_head(osr_nmethods_head()->link());
+      set_osr_nmethods_head(osr_nmethods_head()->osr_link());
     } else {
-      last->set_link(cur->link());
+      last->set_osr_link(cur->osr_link());
     }
   }
-  n->set_link(NULL);
+  n->set_osr_link(NULL);
   // Remember to unlock again
   OsrList_lock->unlock();
 }
@@ -2068,7 +2263,7 @@
       OsrList_lock->unlock();
       return osr;
     }
-    osr = osr->link();
+    osr = osr->osr_link();
   }
   OsrList_lock->unlock();
   return NULL;
@@ -2096,7 +2291,7 @@
 void instanceKlass::oop_print_on(oop obj, outputStream* st) {
   Klass::oop_print_on(obj, st);
 
-  if (as_klassOop() == SystemDictionary::string_klass()) {
+  if (as_klassOop() == SystemDictionary::String_klass()) {
     typeArrayOop value  = java_lang_String::value(obj);
     juint        offset = java_lang_String::offset(obj);
     juint        length = java_lang_String::length(obj);
@@ -2116,7 +2311,7 @@
   FieldPrinter print_nonstatic_field(st, obj);
   do_nonstatic_fields(&print_nonstatic_field);
 
-  if (as_klassOop() == SystemDictionary::class_klass()) {
+  if (as_klassOop() == SystemDictionary::Class_klass()) {
     st->print(BULLET"signature: ");
     java_lang_Class::print_signature(obj, st);
     st->cr();
@@ -2132,14 +2327,20 @@
     st->print(BULLET"fake entry for array: ");
     array_klass->print_value_on(st);
     st->cr();
+  } else if (as_klassOop() == SystemDictionary::MethodType_klass()) {
+    st->print(BULLET"signature: ");
+    java_dyn_MethodType::print_signature(obj, st);
+    st->cr();
   }
 }
 
+#endif //PRODUCT
+
 void instanceKlass::oop_print_value_on(oop obj, outputStream* st) {
   st->print("a ");
   name()->print_value_on(st);
   obj->print_address_on(st);
-  if (as_klassOop() == SystemDictionary::string_klass()
+  if (as_klassOop() == SystemDictionary::String_klass()
       && java_lang_String::value(obj) != NULL) {
     ResourceMark rm;
     int len = java_lang_String::length(obj);
@@ -2148,7 +2349,7 @@
     st->print(" = \"%s\"", str);
     if (len > plen)
       st->print("...[%d]", len);
-  } else if (as_klassOop() == SystemDictionary::class_klass()) {
+  } else if (as_klassOop() == SystemDictionary::Class_klass()) {
     klassOop k = java_lang_Class::as_klassOop(obj);
     st->print(" = ");
     if (k != NULL) {
@@ -2157,14 +2358,15 @@
       const char* tname = type2name(java_lang_Class::primitive_type(obj));
       st->print("%s", tname ? tname : "type?");
     }
+  } else if (as_klassOop() == SystemDictionary::MethodType_klass()) {
+    st->print(" = ");
+    java_dyn_MethodType::print_signature(obj, st);
   } else if (java_lang_boxing_object::is_instance(obj)) {
     st->print(" = ");
     java_lang_boxing_object::print(obj, st);
   }
 }
 
-#endif // ndef PRODUCT
-
 const char* instanceKlass::internal_name() const {
   return external_name();
 }
@@ -2212,18 +2414,19 @@
 
     // Check that we have the right class
     static bool first_time = true;
-    guarantee(k == SystemDictionary::class_klass() && first_time, "Invalid verify of maps");
+    guarantee(k == SystemDictionary::Class_klass() && first_time, "Invalid verify of maps");
     first_time = false;
     const int extra = java_lang_Class::number_of_fake_oop_fields;
     guarantee(ik->nonstatic_field_size() == extra, "just checking");
-    guarantee(ik->nonstatic_oop_map_size() == 1, "just checking");
+    guarantee(ik->nonstatic_oop_map_count() == 1, "just checking");
     guarantee(ik->size_helper() == align_object_size(instanceOopDesc::header_size() + extra), "just checking");
 
     // Check that the map is (2,extra)
     int offset = java_lang_Class::klass_offset;
 
     OopMapBlock* map = ik->start_of_nonstatic_oop_maps();
-    guarantee(map->offset() == offset && map->length() == extra, "just checking");
+    guarantee(map->offset() == offset && map->count() == (unsigned int) extra,
+              "sanity");
   }
 }
 
@@ -2298,6 +2501,11 @@
 
 // Add an information node that contains weak references to the
 // interesting parts of the previous version of the_class.
+// This is also where we clean out any unused weak references.
+// Note that while we delete nodes from the _previous_versions
+// array, we never delete the array itself until the klass is
+// unloaded. The has_been_redefined() query depends on that fact.
+//
 void instanceKlass::add_previous_version(instanceKlassHandle ikh,
        BitMap* emcp_methods, int emcp_method_count) {
   assert(Thread::current()->is_VM_thread(),
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/instanceKlass.hpp
--- a/src/share/vm/oops/instanceKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/instanceKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -71,7 +71,6 @@
 
 // forward declaration for class -- see below for definition
 class SuperTypeClosure;
-class OopMapBlock;
 class JNIid;
 class jniIdMapBase;
 class BreakpointInfo;
@@ -99,6 +98,29 @@
 };
 #endif  // !PRODUCT
 
+// ValueObjs embedded in klass. Describes where oops are located in instances of
+// this klass.
+class OopMapBlock VALUE_OBJ_CLASS_SPEC {
+ public:
+  // Byte offset of the first oop mapped by this block.
+  int offset() const          { return _offset; }
+  void set_offset(int offset) { _offset = offset; }
+
+  // Number of oops in this block.
+  uint count() const         { return _count; }
+  void set_count(uint count) { _count = count; }
+
+  // sizeof(OopMapBlock) in HeapWords.
+  static const int size_in_words() {
+    return align_size_up(int(sizeof(OopMapBlock)), HeapWordSize) >>
+      LogHeapWordSize;
+  }
+
+ private:
+  int  _offset;
+  uint _count;
+};
+
 class instanceKlass: public Klass {
   friend class VMStructs;
  public:
@@ -191,10 +213,11 @@
   int             _nonstatic_field_size;
   int             _static_field_size;    // number words used by static fields (oop and non-oop) in this klass
   int             _static_oop_field_size;// number of static oop fields in this klass
-  int             _nonstatic_oop_map_size;// number of nonstatic oop-map blocks allocated at end of this klass
+  int             _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks
   bool            _is_marked_dependent;  // used for marking during flushing and deoptimization
   bool            _rewritten;            // methods rewritten.
   bool            _has_nonstatic_fields; // for sizing with UseCompressedOops
+  bool            _should_verify_class;  // allow caching of preverification
   u2              _minor_version;        // minor version number of class file
   u2              _major_version;        // major version number of class file
   ClassState      _init_state;           // state of class
@@ -314,12 +337,12 @@
   static bool is_same_class_package(oop class_loader1, symbolOop class_name1, oop class_loader2, symbolOop class_name2);
 
   // find an enclosing class (defined where original code was, in jvm.cpp!)
-  klassOop compute_enclosing_class(symbolOop& simple_name_result, TRAPS) {
+  klassOop compute_enclosing_class(bool* inner_is_member, TRAPS) {
     instanceKlassHandle self(THREAD, this->as_klassOop());
-    return compute_enclosing_class_impl(self, simple_name_result, THREAD);
+    return compute_enclosing_class_impl(self, inner_is_member, THREAD);
   }
   static klassOop compute_enclosing_class_impl(instanceKlassHandle self,
-                                               symbolOop& simple_name_result, TRAPS);
+                                               bool* inner_is_member, TRAPS);
 
   // tell if two classes have the same enclosing class (at package level)
   bool is_same_package_member(klassOop class2, TRAPS) {
@@ -340,6 +363,10 @@
   int  get_init_state()                    { return _init_state; } // Useful for debugging
   bool is_rewritten() const                { return _rewritten; }
 
+  // defineClass specified verification
+  bool should_verify_class() const         { return _should_verify_class; }
+  void set_should_verify_class(bool value) { _should_verify_class = value; }
+
   // marking
   bool is_marked_dependent() const         { return _is_marked_dependent; }
   void set_is_marked_dependent(bool value) { _is_marked_dependent = value; }
@@ -424,12 +451,24 @@
   void set_source_debug_extension(symbolOop n){ oop_store_without_check((oop*) &_source_debug_extension, (oop) n); }
 
   // nonstatic oop-map blocks
-  int nonstatic_oop_map_size() const        { return _nonstatic_oop_map_size; }
-  void set_nonstatic_oop_map_size(int size) { _nonstatic_oop_map_size = size; }
+  static int nonstatic_oop_map_size(unsigned int oop_map_count) {
+    return oop_map_count * OopMapBlock::size_in_words();
+  }
+  unsigned int nonstatic_oop_map_count() const {
+    return _nonstatic_oop_map_size / OopMapBlock::size_in_words();
+  }
+  int nonstatic_oop_map_size() const { return _nonstatic_oop_map_size; }
+  void set_nonstatic_oop_map_size(int words) {
+    _nonstatic_oop_map_size = words;
+  }
 
   // RedefineClasses() support for previous versions:
   void add_previous_version(instanceKlassHandle ikh, BitMap *emcp_methods,
          int emcp_method_count);
+  // If the _previous_versions array is non-NULL, then this klass
+  // has been redefined at least once even if we aren't currently
+  // tracking a previous version.
+  bool has_been_redefined() const { return _previous_versions != NULL; }
   bool has_previous_version() const;
   void init_previous_versions() {
     _previous_versions = NULL;
@@ -471,9 +510,14 @@
   void set_bootstrap_method(oop mh)                   { oop_store(&_bootstrap_method, mh); }
 
   // jmethodID support
-  static jmethodID get_jmethod_id(instanceKlassHandle ik_h, size_t idnum,
-                                  jmethodID new_id, jmethodID* new_jmeths);
-  static jmethodID jmethod_id_for_impl(instanceKlassHandle ik_h, methodHandle method_h);
+  static jmethodID get_jmethod_id(instanceKlassHandle ik_h,
+                     methodHandle method_h);
+  static jmethodID get_jmethod_id_fetch_or_update(instanceKlassHandle ik_h,
+                     size_t idnum, jmethodID new_id, jmethodID* new_jmeths,
+                     jmethodID* to_dealloc_id_p,
+                     jmethodID** to_dealloc_jmeths_p);
+  static void get_jmethod_id_length_value(jmethodID* cache, size_t idnum,
+                size_t *length_p, jmethodID* id_p);
   jmethodID jmethod_id_or_null(methodOop method);
 
   // cached itable index support
@@ -678,7 +722,7 @@
 #endif // SERIALGC
 
   // Naming
-  char* signature_name() const;
+  const char* signature_name() const;
 
   // Iterators
   int oop_oop_iterate(oop obj, OopClosure* blk) {
@@ -719,6 +763,11 @@
   void set_init_thread(Thread *thread)  { _init_thread = thread; }
 
   u2 idnum_allocated_count() const      { return _idnum_allocated_count; }
+  // The RedefineClasses() API can cause new method idnums to be needed
+  // which will cause the caches to grow. Safety requires different
+  // cache management logic if the caches can grow instead of just
+  // going from NULL to non-NULL.
+  bool idnum_can_increment() const      { return has_been_redefined(); }
   jmethodID* methods_jmethod_ids_acquire() const
          { return (jmethodID*)OrderAccess::load_ptr_acquire(&_methods_jmethod_ids); }
   void release_set_methods_jmethod_ids(jmethodID* jmeths)
@@ -790,17 +839,16 @@
   // JVMTI support
   jint jvmti_class_status() const;
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on      (oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
 
   void print_dependent_nmethods(bool verbose = false);
   bool is_dependent_nmethod(nmethod* nm);
 #endif
 
- public:
   // Verification
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
@@ -839,21 +887,6 @@
 }
 
 
-// ValueObjs embedded in klass. Describes where oops are located in instances of this klass.
-
-class OopMapBlock VALUE_OBJ_CLASS_SPEC {
- private:
-  jushort _offset;    // Offset of first oop in oop-map block
-  jushort _length;    // Length of oop-map block
- public:
-  // Accessors
-  jushort offset() const          { return _offset; }
-  void set_offset(jushort offset) { _offset = offset; }
-
-  jushort length() const          { return _length; }
-  void set_length(jushort length) { _length = length; }
-};
-
 /* JNIid class for jfieldIDs only */
 class JNIid: public CHeapObj {
   friend class VMStructs;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/instanceKlassKlass.cpp
--- a/src/share/vm/oops/instanceKlassKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/instanceKlassKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -317,6 +317,11 @@
     pm->claim_or_forward_breadth(sg_addr);
   }
 
+  oop* bsm_addr = ik->adr_bootstrap_method();
+  if (PSScavenge::should_scavenge(bsm_addr)) {
+    pm->claim_or_forward_breadth(bsm_addr);
+  }
+
   klassKlass::oop_copy_contents(pm, obj);
 }
 
@@ -345,6 +350,11 @@
     pm->claim_or_forward_depth(sg_addr);
   }
 
+  oop* bsm_addr = ik->adr_bootstrap_method();
+  if (PSScavenge::should_scavenge(bsm_addr)) {
+    pm->claim_or_forward_depth(bsm_addr);
+  }
+
   klassKlass::oop_copy_contents(pm, obj);
 }
 
@@ -402,9 +412,14 @@
 }
 #endif // SERIALGC
 
-klassOop instanceKlassKlass::allocate_instance_klass(int vtable_len, int itable_len, int static_field_size,
-                                                     int nonstatic_oop_map_size, ReferenceType rt, TRAPS) {
+klassOop
+instanceKlassKlass::allocate_instance_klass(int vtable_len, int itable_len,
+                                            int static_field_size,
+                                            unsigned nonstatic_oop_map_count,
+                                            ReferenceType rt, TRAPS) {
 
+  const int nonstatic_oop_map_size =
+    instanceKlass::nonstatic_oop_map_size(nonstatic_oop_map_count);
   int size = instanceKlass::object_size(align_object_offset(vtable_len) + align_object_offset(itable_len) + static_field_size + nonstatic_oop_map_size);
 
   // Allocation
@@ -615,14 +630,15 @@
 
   st->print(BULLET"non-static oop maps: ");
   OopMapBlock* map     = ik->start_of_nonstatic_oop_maps();
-  OopMapBlock* end_map = map + ik->nonstatic_oop_map_size();
+  OopMapBlock* end_map = map + ik->nonstatic_oop_map_count();
   while (map < end_map) {
-    st->print("%d-%d ", map->offset(), map->offset() + heapOopSize*(map->length() - 1));
+    st->print("%d-%d ", map->offset(), map->offset() + heapOopSize*(map->count() - 1));
     map++;
   }
   st->cr();
 }
 
+#endif //PRODUCT
 
 void instanceKlassKlass::oop_print_value_on(oop obj, outputStream* st) {
   assert(obj->is_klass(), "must be klass");
@@ -630,8 +646,6 @@
   ik->name()->print_value_on(st);
 }
 
-#endif // PRODUCT
-
 const char* instanceKlassKlass::internal_name() const {
   return "{instance class}";
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/instanceKlassKlass.hpp
--- a/src/share/vm/oops/instanceKlassKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/instanceKlassKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -39,7 +39,7 @@
   klassOop allocate_instance_klass(int vtable_len,
                                    int itable_len,
                                    int static_field_size,
-                                   int nonstatic_oop_map_size,
+                                   unsigned int nonstatic_oop_map_count,
                                    ReferenceType rt,
                                    TRAPS);
 
@@ -69,14 +69,13 @@
   // Apply closure to the InstanceKlass oops that are outside the java heap.
   inline void iterate_c_heap_oops(instanceKlass* ik, OopClosure* closure);
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on(oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
 #endif
 
- public:
   // Verification
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/instanceRefKlass.cpp
--- a/src/share/vm/oops/instanceRefKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/instanceRefKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -78,9 +78,9 @@
 
 #ifndef SERIALGC
 template <class T>
-static void specialized_oop_follow_contents(instanceRefKlass* ref,
-                                            ParCompactionManager* cm,
-                                            oop obj) {
+void specialized_oop_follow_contents(instanceRefKlass* ref,
+                                     ParCompactionManager* cm,
+                                     oop obj) {
   T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
   T heap_oop = oopDesc::load_heap_oop(referent_addr);
   debug_only(
@@ -397,29 +397,29 @@
 
   // Check that we have the right class
   debug_only(static bool first_time = true);
-  assert(k == SystemDictionary::reference_klass() && first_time,
+  assert(k == SystemDictionary::Reference_klass() && first_time,
          "Invalid update of maps");
   debug_only(first_time = false);
-  assert(ik->nonstatic_oop_map_size() == 1, "just checking");
+  assert(ik->nonstatic_oop_map_count() == 1, "just checking");
 
   OopMapBlock* map = ik->start_of_nonstatic_oop_maps();
 
   // Check that the current map is (2,4) - currently points at field with
   // offset 2 (words) and has 4 map entries.
   debug_only(int offset = java_lang_ref_Reference::referent_offset);
-  debug_only(int length = ((java_lang_ref_Reference::discovered_offset -
+  debug_only(unsigned int count = ((java_lang_ref_Reference::discovered_offset -
     java_lang_ref_Reference::referent_offset)/heapOopSize) + 1);
 
   if (UseSharedSpaces) {
     assert(map->offset() == java_lang_ref_Reference::queue_offset &&
-           map->length() == 1, "just checking");
+           map->count() == 1, "just checking");
   } else {
-    assert(map->offset() == offset && map->length() == length,
+    assert(map->offset() == offset && map->count() == count,
            "just checking");
 
     // Update map to (3,1) - point to offset of 3 (words) with 1 map entry.
     map->set_offset(java_lang_ref_Reference::queue_offset);
-    map->set_length(1);
+    map->set_count(1);
   }
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/klass.cpp
--- a/src/share/vm/oops/klass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/klass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -217,8 +217,8 @@
     set_super(NULL);
     oop_store_without_check((oop*) &_primary_supers[0], (oop) this->as_klassOop());
     assert(super_depth() == 0, "Object must already be initialized properly");
-  } else if (k != super() || k == SystemDictionary::object_klass()) {
-    assert(super() == NULL || super() == SystemDictionary::object_klass(),
+  } else if (k != super() || k == SystemDictionary::Object_klass()) {
+    assert(super() == NULL || super() == SystemDictionary::Object_klass(),
            "initialize this only once to a non-trivial value");
     set_super(k);
     Klass* sup = k->klass_part();
@@ -370,7 +370,7 @@
 void Klass::remove_from_sibling_list() {
   // remove receiver from sibling list
   instanceKlass* super = superklass();
-  assert(super != NULL || as_klassOop() == SystemDictionary::object_klass(), "should have super");
+  assert(super != NULL || as_klassOop() == SystemDictionary::Object_klass(), "should have super");
   if (super == NULL) return;        // special case: class Object
   if (super->subklass() == this) {
     // first subklass
@@ -496,11 +496,13 @@
       return result;
     }
   }
+  if (name() == NULL)  return "<unknown>";
   return name()->as_klass_external_name();
 }
 
 
-char* Klass::signature_name() const {
+const char* Klass::signature_name() const {
+  if (name() == NULL)  return "<unknown>";
   return name()->as_C_string();
 }
 
@@ -539,6 +541,7 @@
   st->cr();
 }
 
+#endif //PRODUCT
 
 void Klass::oop_print_value_on(oop obj, outputStream* st) {
   // print title
@@ -547,8 +550,6 @@
   obj->print_address_on(st);
 }
 
-#endif
-
 // Verification
 
 void Klass::oop_verify_on(oop obj, outputStream* st) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/klass.hpp
--- a/src/share/vm/oops/klass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/klass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -546,7 +546,7 @@
   // For arrays, this returns the name of the element with a leading '['.
   // For classes, this returns the name with a leading 'L' and a trailing ';'
   //     and the package separators as '/'.
-  virtual char* signature_name() const;
+  virtual const char* signature_name() const;
 
   // garbage collection support
   virtual void oop_follow_contents(oop obj) = 0;
@@ -776,14 +776,13 @@
   // JVMTI support
   virtual jint jvmti_class_status() const;
 
-#ifndef PRODUCT
  public:
   // Printing
+  virtual void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   virtual void oop_print_on      (oop obj, outputStream* st);
-  virtual void oop_print_value_on(oop obj, outputStream* st);
-#endif
+#endif //PRODUCT
 
- public:
   // Verification
   virtual const char* internal_name() const = 0;
   virtual void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/klassKlass.cpp
--- a/src/share/vm/oops/klassKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/klassKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -202,13 +202,12 @@
   Klass::oop_print_on(obj, st);
 }
 
+#endif //PRODUCT
 
 void klassKlass::oop_print_value_on(oop obj, outputStream* st) {
   Klass::oop_print_value_on(obj, st);
 }
 
-#endif
-
 const char* klassKlass::internal_name() const {
   return "{other class}";
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/klassKlass.hpp
--- a/src/share/vm/oops/klassKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/klassKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -67,14 +67,13 @@
   juint alloc_size() const              { return _alloc_size; }
   void set_alloc_size(juint n)          { _alloc_size = n; }
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on      (oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
-#endif
+#endif //PRODUCT
 
- public:
   // Verification
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/markOop.cpp
--- a/src/share/vm/oops/markOop.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/markOop.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -31,8 +31,9 @@
     st->print("locked(0x%lx)->", value());
     markOop(*(markOop*)value())->print_on(st);
   } else {
-    assert(is_unlocked(), "just checking");
+    assert(is_unlocked() || has_bias_pattern(), "just checking");
     st->print("mark(");
+    if (has_bias_pattern())  st->print("biased,");
     st->print("hash %#lx,", hash());
     st->print("age %d)", age());
   }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/methodDataKlass.cpp
--- a/src/share/vm/oops/methodDataKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/methodDataKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -214,6 +214,8 @@
   m->print_data_on(st);
 }
 
+#endif //PRODUCT
+
 void methodDataKlass::oop_print_value_on(oop obj, outputStream* st) {
   assert(obj->is_methodData(), "should be method data");
   methodDataOop m = methodDataOop(obj);
@@ -221,8 +223,6 @@
   m->method()->print_value_on(st);
 }
 
-#endif // !PRODUCT
-
 const char* methodDataKlass::internal_name() const {
   return "{method data}";
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/methodDataKlass.hpp
--- a/src/share/vm/oops/methodDataKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/methodDataKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -71,14 +71,13 @@
   int oop_oop_iterate(oop obj, OopClosure* blk);
   int oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr);
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on      (oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
-#endif // !PRODUCT
+#endif //PRODUCT
 
- public:
   // Verify operations
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/methodDataOop.cpp
--- a/src/share/vm/oops/methodDataOop.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/methodDataOop.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -49,6 +49,12 @@
   }
 }
 
+void DataLayout::follow_weak_refs(BoolObjectClosure* cl) {
+  ResourceMark m;
+  data_in()->follow_weak_refs(cl);
+}
+
+
 // ==================================================================
 // ProfileData
 //
@@ -145,42 +151,92 @@
 // which are used to store a type profile for the receiver of the check.
 
 void ReceiverTypeData::follow_contents() {
-  for (uint row = 0; row < row_limit(); row++) {
-    if (receiver(row) != NULL) {
-      MarkSweep::mark_and_push(adr_receiver(row));
-    }
-  }
+  // This is a set of weak references that need
+  // to be followed at the end of the strong marking
+  // phase. Memoize this object so it can be visited
+  // in the weak roots processing phase.
+  MarkSweep::revisit_mdo(data());
 }
 
 #ifndef SERIALGC
 void ReceiverTypeData::follow_contents(ParCompactionManager* cm) {
-  for (uint row = 0; row < row_limit(); row++) {
-    if (receiver(row) != NULL) {
-      PSParallelCompact::mark_and_push(cm, adr_receiver(row));
-    }
-  }
+  // This is a set of weak references that need
+  // to be followed at the end of the strong marking
+  // phase. Memoize this object so it can be visited
+  // in the weak roots processing phase.
+  PSParallelCompact::revisit_mdo(cm, data());
 }
 #endif // SERIALGC
 
 void ReceiverTypeData::oop_iterate(OopClosure* blk) {
-  for (uint row = 0; row < row_limit(); row++) {
-    if (receiver(row) != NULL) {
-      blk->do_oop(adr_receiver(row));
-    }
-  }
-}
-
-void ReceiverTypeData::oop_iterate_m(OopClosure* blk, MemRegion mr) {
-  for (uint row = 0; row < row_limit(); row++) {
-    if (receiver(row) != NULL) {
-      oop* adr = adr_receiver(row);
-      if (mr.contains(adr)) {
+  if (blk->should_remember_mdo()) {
+    // This is a set of weak references that need
+    // to be followed at the end of the strong marking
+    // phase. Memoize this object so it can be visited
+    // in the weak roots processing phase.
+    blk->remember_mdo(data());
+  } else { // normal scan
+    for (uint row = 0; row < row_limit(); row++) {
+      if (receiver(row) != NULL) {
+        oop* adr = adr_receiver(row);
         blk->do_oop(adr);
       }
     }
   }
 }
 
+void ReceiverTypeData::oop_iterate_m(OopClosure* blk, MemRegion mr) {
+  // Currently, this interface is called only during card-scanning for
+  // a young gen gc, in which case this object cannot contribute anything,
+  // since it does not contain any references that cross out of
+  // the perm gen. However, for future more general use we allow
+  // the possibility of calling for instance from more general
+  // iterators (for example, a future regionalized perm gen for G1,
+  // or the possibility of moving some references out of perm in
+  // the case of other collectors). In that case, you will need
+  // to relax or remove some of the assertions below.
+#ifdef ASSERT
+  // Verify that none of the embedded oop references cross out of
+  // this generation.
+  for (uint row = 0; row < row_limit(); row++) {
+    if (receiver(row) != NULL) {
+      oop* adr = adr_receiver(row);
+      CollectedHeap* h = Universe::heap();
+      assert(h->is_permanent(adr) && h->is_permanent_or_null(*adr), "Not intra-perm");
+    }
+  }
+#endif // ASSERT
+  assert(!blk->should_remember_mdo(), "Not expected to remember MDO");
+  return;   // Nothing to do, see comment above
+#if 0
+  if (blk->should_remember_mdo()) {
+    // This is a set of weak references that need
+    // to be followed at the end of the strong marking
+    // phase. Memoize this object so it can be visited
+    // in the weak roots processing phase.
+    blk->remember_mdo(data());
+  } else { // normal scan
+    for (uint row = 0; row < row_limit(); row++) {
+      if (receiver(row) != NULL) {
+        oop* adr = adr_receiver(row);
+        if (mr.contains(adr)) {
+          blk->do_oop(adr);
+        } else if ((HeapWord*)adr >= mr.end()) {
+          // Test that the current cursor and the two ends of the range
+          // that we may have skipped iterating over are monotonically ordered;
+          // this is just a paranoid assertion, just in case represetations
+          // should change in the future rendering the short-circuit return
+          // here invalid.
+          assert((row+1 >= row_limit() || adr_receiver(row+1) > adr) &&
+                 (row+2 >= row_limit() || adr_receiver(row_limit()-1) > adr_receiver(row+1)), "Reducing?");
+          break; // remaining should be outside this mr too
+        }
+      }
+    }
+  }
+#endif
+}
+
 void ReceiverTypeData::adjust_pointers() {
   for (uint row = 0; row < row_limit(); row++) {
     if (receiver(row) != NULL) {
@@ -189,6 +245,15 @@
   }
 }
 
+void ReceiverTypeData::follow_weak_refs(BoolObjectClosure* is_alive_cl) {
+  for (uint row = 0; row < row_limit(); row++) {
+    klassOop p = receiver(row);
+    if (p != NULL && !is_alive_cl->do_object_b(p)) {
+      clear_row(row);
+    }
+  }
+}
+
 #ifndef SERIALGC
 void ReceiverTypeData::update_pointers() {
   for (uint row = 0; row < row_limit(); row++) {
@@ -625,30 +690,33 @@
     return NULL;
   }
   DataLayout* data_layout = data_layout_at(data_index);
+  return data_layout->data_in();
+}
 
-  switch (data_layout->tag()) {
+ProfileData* DataLayout::data_in() {
+  switch (tag()) {
   case DataLayout::no_tag:
   default:
     ShouldNotReachHere();
     return NULL;
   case DataLayout::bit_data_tag:
-    return new BitData(data_layout);
+    return new BitData(this);
   case DataLayout::counter_data_tag:
-    return new CounterData(data_layout);
+    return new CounterData(this);
   case DataLayout::jump_data_tag:
-    return new JumpData(data_layout);
+    return new JumpData(this);
   case DataLayout::receiver_type_data_tag:
-    return new ReceiverTypeData(data_layout);
+    return new ReceiverTypeData(this);
   case DataLayout::virtual_call_data_tag:
-    return new VirtualCallData(data_layout);
+    return new VirtualCallData(this);
   case DataLayout::ret_data_tag:
-    return new RetData(data_layout);
+    return new RetData(this);
   case DataLayout::branch_data_tag:
-    return new BranchData(data_layout);
+    return new BranchData(this);
   case DataLayout::multi_branch_data_tag:
-    return new MultiBranchData(data_layout);
+    return new MultiBranchData(this);
   case DataLayout::arg_info_data_tag:
-    return new ArgInfoData(data_layout);
+    return new ArgInfoData(this);
   };
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/methodDataOop.hpp
--- a/src/share/vm/oops/methodDataOop.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/methodDataOop.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2010 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
@@ -55,6 +55,9 @@
 // with invocation counter incrementation.  None of these races harm correct
 // execution of the compiled code.
 
+// forward decl
+class ProfileData;
+
 // DataLayout
 //
 // Overlay for generic profiling data.
@@ -231,6 +234,10 @@
     temp._header._struct._flags = byte_constant;
     return temp._header._bits;
   }
+
+  // GC support
+  ProfileData* data_in();
+  void follow_weak_refs(BoolObjectClosure* cl);
 };
 
 
@@ -430,6 +437,7 @@
   virtual void oop_iterate(OopClosure* blk) {}
   virtual void oop_iterate_m(OopClosure* blk, MemRegion mr) {}
   virtual void adjust_pointers() {}
+  virtual void follow_weak_refs(BoolObjectClosure* is_alive_closure) {}
 
 #ifndef SERIALGC
   // Parallel old support
@@ -537,6 +545,10 @@
     return cell_offset(counter_cell_count);
   }
 
+  void set_count(uint count) {
+    set_uint_at(count_off, count);
+  }
+
 #ifndef PRODUCT
   void print_data_on(outputStream* st);
 #endif
@@ -667,11 +679,44 @@
     return recv;
   }
 
+  void set_receiver(uint row, oop p) {
+    assert((uint)row < row_limit(), "oob");
+    set_oop_at(receiver_cell_index(row), p);
+  }
+
   uint receiver_count(uint row) {
     assert(row < row_limit(), "oob");
     return uint_at(receiver_count_cell_index(row));
   }
 
+  void set_receiver_count(uint row, uint count) {
+    assert(row < row_limit(), "oob");
+    set_uint_at(receiver_count_cell_index(row), count);
+  }
+
+  void clear_row(uint row) {
+    assert(row < row_limit(), "oob");
+    // Clear total count - indicator of polymorphic call site.
+    // The site may look like as monomorphic after that but
+    // it allow to have more accurate profiling information because
+    // there was execution phase change since klasses were unloaded.
+    // If the site is still polymorphic then MDO will be updated
+    // to reflect it. But it could be the case that the site becomes
+    // only bimorphic. Then keeping total count not 0 will be wrong.
+    // Even if we use monomorphic (when it is not) for compilation
+    // we will only have trap, deoptimization and recompile again
+    // with updated MDO after executing method in Interpreter.
+    // An additional receiver will be recorded in the cleaned row
+    // during next call execution.
+    //
+    // Note: our profiling logic works with empty rows in any slot.
+    // We do sorting a profiling info (ciCallProfile) for compilation.
+    //
+    set_count(0);
+    set_receiver(row, NULL);
+    set_receiver_count(row, 0);
+  }
+
   // Code generation support
   static ByteSize receiver_offset(uint row) {
     return cell_offset(receiver_cell_index(row));
@@ -688,6 +733,7 @@
   virtual void oop_iterate(OopClosure* blk);
   virtual void oop_iterate_m(OopClosure* blk, MemRegion mr);
   virtual void adjust_pointers();
+  virtual void follow_weak_refs(BoolObjectClosure* is_alive_closure);
 
 #ifndef SERIALGC
   // Parallel old support
@@ -1366,6 +1412,9 @@
   }
   void inc_decompile_count() {
     _nof_decompiles += 1;
+    if (decompile_count() > (uint)PerMethodRecompilationCutoff) {
+      method()->set_not_compilable();
+    }
   }
 
   // Support for code generation
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/methodKlass.cpp
--- a/src/share/vm/oops/methodKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/methodKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -308,6 +308,7 @@
   }
 }
 
+#endif //PRODUCT
 
 void methodKlass::oop_print_value_on(oop obj, outputStream* st) {
   assert(obj->is_method(), "must be method");
@@ -323,8 +324,6 @@
   if (WizardMode && m->code() != NULL) st->print(" ((nmethod*)%p)", m->code());
 }
 
-#endif // PRODUCT
-
 const char* methodKlass::internal_name() const {
   return "{method}";
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/methodKlass.hpp
--- a/src/share/vm/oops/methodKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/methodKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -68,14 +68,13 @@
   int oop_oop_iterate(oop obj, OopClosure* blk);
   int oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr);
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on      (oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
-#endif
+#endif //PRODUCT
 
- public:
   // Verify operations
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/methodOop.cpp
--- a/src/share/vm/oops/methodOop.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/methodOop.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -456,12 +456,12 @@
     return objArrayHandle(THREAD, Universe::the_empty_class_klass_array());
   } else {
     methodHandle h_this(THREAD, this_oop);
-    objArrayOop m_oop = oopFactory::new_objArray(SystemDictionary::class_klass(), length, CHECK_(objArrayHandle()));
+    objArrayOop m_oop = oopFactory::new_objArray(SystemDictionary::Class_klass(), length, CHECK_(objArrayHandle()));
     objArrayHandle mirrors (THREAD, m_oop);
     for (int i = 0; i < length; i++) {
       CheckedExceptionElement* table = h_this->checked_exceptions_start(); // recompute on each iteration, not gc safe
       klassOop k = h_this->constants()->klass_at(table[i].class_cp_index, CHECK_(objArrayHandle()));
-      assert(Klass::cast(k)->is_subclass_of(SystemDictionary::throwable_klass()), "invalid exception class");
+      assert(Klass::cast(k)->is_subclass_of(SystemDictionary::Throwable_klass()), "invalid exception class");
       mirrors->obj_at_put(i, Klass::cast(k)->java_mirror());
     }
     return mirrors;
@@ -575,12 +575,6 @@
     return true;
   }
 
-  methodDataOop mdo = method_data();
-  if (mdo != NULL
-      && (uint)mdo->decompile_count() > (uint)PerMethodRecompilationCutoff) {
-    // Since (uint)-1 is large, -1 really means 'no cutoff'.
-    return true;
-  }
 #ifdef COMPILER2
   if (is_tier1_compile(comp_level)) {
     if (is_not_tier1_compilable()) {
@@ -593,7 +587,16 @@
 }
 
 // call this when compiler finds that this method is not compilable
-void methodOopDesc::set_not_compilable(int comp_level) {
+void methodOopDesc::set_not_compilable(int comp_level, bool report) {
+  if (PrintCompilation && report) {
+    ttyLocker ttyl;
+    tty->print("made not compilable ");
+    this->print_short_name(tty);
+    int size = this->code_size();
+    if (size > 0)
+      tty->print(" (%d bytes)", size);
+    tty->cr();
+  }
   if ((TraceDeoptimization || LogCompilation) && (xtty != NULL)) {
     ttyLocker ttyl;
     xtty->begin_elem("make_not_compilable thread='%d'", (int) os::current_thread_id());
@@ -688,7 +691,7 @@
   // so making them eagerly shouldn't be too expensive.
   AdapterHandlerEntry* adapter = AdapterHandlerLibrary::get_adapter(mh);
   if (adapter == NULL ) {
-    THROW_0(vmSymbols::java_lang_OutOfMemoryError());
+    THROW_MSG_NULL(vmSymbols::java_lang_VirtualMachineError(), "out of space in CodeCache for adapters");
   }
 
   mh->set_adapter_entry(adapter);
@@ -705,6 +708,16 @@
 // This function must not hit a safepoint!
 address methodOopDesc::verified_code_entry() {
   debug_only(No_Safepoint_Verifier nsv;)
+  nmethod *code = (nmethod *)OrderAccess::load_ptr_acquire(&_code);
+  if (code == NULL && UseCodeCacheFlushing) {
+    nmethod *saved_code = CodeCache::find_and_remove_saved_code(this);
+    if (saved_code != NULL) {
+      methodHandle method(this);
+      assert( ! saved_code->is_osr_method(), "should not get here for osr" );
+      set_code( method, saved_code );
+    }
+  }
+
   assert(_from_compiled_entry != NULL, "must be set");
   return _from_compiled_entry;
 }
@@ -733,8 +746,8 @@
   int comp_level = code->comp_level();
   // In theory there could be a race here. In practice it is unlikely
   // and not worth worrying about.
-  if (comp_level > highest_tier_compile()) {
-    set_highest_tier_compile(comp_level);
+  if (comp_level > mh->highest_tier_compile()) {
+    mh->set_highest_tier_compile(comp_level);
   }
 
   OrderAccess::storestore();
@@ -821,6 +834,18 @@
   return pchase;
 }
 
+//------------------------------------------------------------------------------
+// methodOopDesc::is_method_handle_adapter
+//
+// Tests if this method is an internal adapter frame from the
+// MethodHandleCompiler.
+bool methodOopDesc::is_method_handle_adapter() const {
+  return ((name() == vmSymbols::invoke_name() &&
+           method_holder() == SystemDictionary::MethodHandle_klass())
+          ||
+          method_holder() == SystemDictionary::InvokeDynamic_klass());
+}
+
 methodHandle methodOopDesc::make_invoke_method(KlassHandle holder,
                                                symbolHandle signature,
                                                Handle method_type, TRAPS) {
@@ -881,7 +906,7 @@
   assert((oop)p == method_type(), "pointer chase is correct");
 #endif
 
-  if (TraceMethodHandles)
+  if (TraceMethodHandles && (Verbose || WizardMode))
     m->print_on(tty);
 
   return m;
@@ -1032,8 +1057,8 @@
       // We are loading classes eagerly. If a ClassNotFoundException or
       // a LinkageError was generated, be sure to ignore it.
       if (HAS_PENDING_EXCEPTION) {
-        if (PENDING_EXCEPTION->is_a(SystemDictionary::classNotFoundException_klass()) ||
-            PENDING_EXCEPTION->is_a(SystemDictionary::linkageError_klass())) {
+        if (PENDING_EXCEPTION->is_a(SystemDictionary::ClassNotFoundException_klass()) ||
+            PENDING_EXCEPTION->is_a(SystemDictionary::LinkageError_klass())) {
           CLEAR_PENDING_EXCEPTION;
         } else {
           return false;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/methodOop.hpp
--- a/src/share/vm/oops/methodOop.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/methodOop.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -303,7 +303,7 @@
   bool check_code() const;      // Not inline to avoid circular ref
   nmethod* volatile code() const                 { assert( check_code(), "" ); return (nmethod *)OrderAccess::load_ptr_acquire(&_code); }
   void clear_code();            // Clear out any compiled code
-  void set_code(methodHandle mh, nmethod* code);
+  static void set_code(methodHandle mh, nmethod* code);
   void set_adapter_entry(AdapterHandlerEntry* adapter) {  _adapter = adapter; }
   address get_i2c_entry();
   address get_c2i_entry();
@@ -365,6 +365,7 @@
 #endif
 
   // byte codes
+  void    set_code(address code)      { return constMethod()->set_code(code); }
   address code_base() const           { return constMethod()->code_base(); }
   bool    contains(address bcp) const { return constMethod()->contains(bcp); }
 
@@ -524,6 +525,9 @@
 
   // JSR 292 support
   bool is_method_handle_invoke() const              { return access_flags().is_method_handle_invoke(); }
+  // Tests if this method is an internal adapter frame from the
+  // MethodHandleCompiler.
+  bool is_method_handle_adapter() const;
   static methodHandle make_invoke_method(KlassHandle holder,
                                          symbolHandle signature,
                                          Handle method_type,
@@ -537,6 +541,7 @@
   // all without checking for a stack overflow
   static int extra_stack_entries() { return (EnableMethodHandles ? (int)MethodHandlePushLimit : 0) + (EnableInvokeDynamic ? 3 : 0); }
   static int extra_stack_words();  // = extra_stack_entries() * Interpreter::stackElementSize()
+
   // RedefineClasses() support:
   bool is_old() const                               { return access_flags().is_old(); }
   void set_is_old()                                 { _access_flags.set_is_old(); }
@@ -555,7 +560,7 @@
 
   // Get this method's jmethodID -- allocate if it doesn't exist
   jmethodID jmethod_id()                            { methodHandle this_h(this);
-                                                      return instanceKlass::jmethod_id_for_impl(method_holder(), this_h); }
+                                                      return instanceKlass::get_jmethod_id(method_holder(), this_h); }
 
   // Lookup the jmethodID for this method.  Return NULL if not found.
   // NOTE that this function can be called from a signal handler
@@ -591,7 +596,10 @@
   // whether it is not compilable for another reason like having a
   // breakpoint set in it.
   bool is_not_compilable(int comp_level = CompLevel_highest_tier) const;
-  void set_not_compilable(int comp_level = CompLevel_highest_tier);
+  void set_not_compilable(int comp_level = CompLevel_highest_tier, bool report = true);
+  void set_not_compilable_quietly(int comp_level = CompLevel_highest_tier) {
+    set_not_compilable(comp_level, false);
+  }
 
   bool is_not_osr_compilable() const             { return is_not_compilable() || access_flags().is_not_osr_compilable(); }
   void set_not_osr_compilable()                  { _access_flags.set_not_osr_compilable(); }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/objArrayKlass.cpp
--- a/src/share/vm/oops/objArrayKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/objArrayKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -127,16 +127,14 @@
           // pointer delta is scaled to number of elements (length field in
           // objArrayOop) which we assume is 32 bit.
           assert(pd == (size_t)(int)pd, "length field overflow");
-          const size_t done_word_len = objArrayOopDesc::array_size((int)pd);
-          bs->write_ref_array(MemRegion((HeapWord*)dst, done_word_len));
+          bs->write_ref_array((HeapWord*)dst, pd);
           THROW(vmSymbols::java_lang_ArrayStoreException());
           return;
         }
       }
     }
   }
-  const size_t word_len = objArrayOopDesc::array_size(length);
-  bs->write_ref_array(MemRegion((HeapWord*)dst, word_len));
+  bs->write_ref_array((HeapWord*)dst, length);
 }
 
 void objArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d,
@@ -248,8 +246,8 @@
   } else {
     objArrayOop sec_oop = oopFactory::new_system_objArray(num_secondaries, CHECK_NULL);
     objArrayHandle secondaries(THREAD, sec_oop);
-    secondaries->obj_at_put(num_extra_slots+0, SystemDictionary::cloneable_klass());
-    secondaries->obj_at_put(num_extra_slots+1, SystemDictionary::serializable_klass());
+    secondaries->obj_at_put(num_extra_slots+0, SystemDictionary::Cloneable_klass());
+    secondaries->obj_at_put(num_extra_slots+1, SystemDictionary::Serializable_klass());
     for (int i = 0; i < num_elem_supers; i++) {
       klassOop elem_super = (klassOop) elem_supers->obj_at(i);
       klassOop array_super = elem_super->klass_part()->array_klass_or_null();
@@ -501,6 +499,8 @@
   }
 }
 
+#endif //PRODUCT
+
 static int max_objArray_print_length = 4;
 
 void objArrayKlass::oop_print_value_on(oop obj, outputStream* st) {
@@ -510,7 +510,7 @@
   int len = objArrayOop(obj)->length();
   st->print("[%d] ", len);
   obj->print_address_on(st);
-  if (PrintOopAddress || PrintMiscellaneous && (WizardMode || Verbose)) {
+  if (NOT_PRODUCT(PrintOopAddress ||) PrintMiscellaneous && (WizardMode || Verbose)) {
     st->print("{");
     for (int i = 0; i < len; i++) {
       if (i > max_objArray_print_length) {
@@ -522,8 +522,6 @@
   }
 }
 
-#endif // PRODUCT
-
 const char* objArrayKlass::internal_name() const {
   return external_name();
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/objArrayKlass.hpp
--- a/src/share/vm/oops/objArrayKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/objArrayKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -119,14 +119,13 @@
  private:
    static klassOop array_klass_impl   (objArrayKlassHandle this_oop, bool or_null, int n, TRAPS);
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on      (oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
-#endif
+#endif //PRODUCT
 
- public:
   // Verification
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/objArrayKlassKlass.cpp
--- a/src/share/vm/oops/objArrayKlassKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/objArrayKlassKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -99,7 +99,7 @@
       }
     } else {
       // The element type is already Object.  Object[] has direct super of Object.
-      super_klass = KlassHandle(THREAD, SystemDictionary::object_klass());
+      super_klass = KlassHandle(THREAD, SystemDictionary::Object_klass());
     }
   }
 
@@ -278,6 +278,7 @@
   st->cr();
 }
 
+#endif //PRODUCT
 
 void objArrayKlassKlass::oop_print_value_on(oop obj, outputStream* st) {
   assert(obj->is_klass(), "must be klass");
@@ -287,8 +288,6 @@
   st->print("[]");
 }
 
-#endif
-
 const char* objArrayKlassKlass::internal_name() const {
   return "{object array class}";
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/objArrayKlassKlass.hpp
--- a/src/share/vm/oops/objArrayKlassKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/objArrayKlassKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -64,14 +64,13 @@
   // helpers
   static klassOop allocate_objArray_klass_impl(objArrayKlassKlassHandle this_oop, int n, KlassHandle element_klass, TRAPS);
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on(oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
-#endif
+#endif //PRODUCT
 
- public:
   // Verification
   const char* internal_name() const;
   void oop_verify_on(oop obj, outputStream* st);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/objArrayOop.hpp
--- a/src/share/vm/oops/objArrayOop.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/objArrayOop.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -37,6 +37,32 @@
     return &((T*)base())[index];
   }
 
+private:
+  // Give size of objArrayOop in HeapWords minus the header
+  static int array_size(int length) {
+    const int OopsPerHeapWord = HeapWordSize/heapOopSize;
+    assert(OopsPerHeapWord >= 1 && (HeapWordSize % heapOopSize == 0),
+           "Else the following (new) computation would be in error");
+#ifdef ASSERT
+    // The old code is left in for sanity-checking; it'll
+    // go away pretty soon. XXX
+    // Without UseCompressedOops, this is simply:
+    // oop->length() * HeapWordsPerOop;
+    // With narrowOops, HeapWordsPerOop is 1/2 or equal 0 as an integer.
+    // The oop elements are aligned up to wordSize
+    const int HeapWordsPerOop = heapOopSize/HeapWordSize;
+    int old_res;
+    if (HeapWordsPerOop > 0) {
+      old_res = length * HeapWordsPerOop;
+    } else {
+      old_res = align_size_up(length, OopsPerHeapWord)/OopsPerHeapWord;
+    }
+#endif  // ASSERT
+    int res = ((uint)length + OopsPerHeapWord - 1)/OopsPerHeapWord;
+    assert(res == old_res, "Inconsistency between old and new.");
+    return res;
+  }
+
  public:
   // Returns the offset of the first element.
   static int base_offset_in_bytes() {
@@ -67,27 +93,14 @@
   // Sizing
   static int header_size()    { return arrayOopDesc::header_size(T_OBJECT); }
   int object_size()           { return object_size(length()); }
-  int array_size()            { return array_size(length()); }
 
   static int object_size(int length) {
     // This returns the object size in HeapWords.
-    return align_object_size(header_size() + array_size(length));
-  }
-
-  // Give size of objArrayOop in HeapWords minus the header
-  static int array_size(int length) {
-    // Without UseCompressedOops, this is simply:
-    // oop->length() * HeapWordsPerOop;
-    // With narrowOops, HeapWordsPerOop is 1/2 or equal 0 as an integer.
-    // The oop elements are aligned up to wordSize
-    const int HeapWordsPerOop = heapOopSize/HeapWordSize;
-    if (HeapWordsPerOop > 0) {
-      return length * HeapWordsPerOop;
-    } else {
-      const int OopsPerHeapWord = HeapWordSize/heapOopSize;
-      int word_len = align_size_up(length, OopsPerHeapWord)/OopsPerHeapWord;
-      return word_len;
-    }
+    uint asz = array_size(length);
+    uint osz = align_object_size(header_size() + asz);
+    assert(osz >= asz,   "no overflow");
+    assert((int)osz > 0, "no overflow");
+    return (int)osz;
   }
 
   // special iterators for index ranges, returns size of object
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/oop.cpp
--- a/src/share/vm/oops/oop.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/oop.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -31,14 +31,13 @@
 
 #ifdef PRODUCT
 void oopDesc::print_on(outputStream* st) const {}
-void oopDesc::print_value_on(outputStream* st) const {}
 void oopDesc::print_address_on(outputStream* st) const {}
-char* oopDesc::print_value_string() { return NULL; }
 char* oopDesc::print_string() { return NULL; }
 void oopDesc::print()         {}
-void oopDesc::print_value()   {}
 void oopDesc::print_address() {}
-#else
+
+#else //PRODUCT
+
 void oopDesc::print_on(outputStream* st) const {
   if (this == NULL) {
     st->print_cr("NULL");
@@ -47,22 +46,6 @@
   }
 }
 
-void oopDesc::print_value_on(outputStream* st) const {
-  oop obj = oop(this);
-  if (this == NULL) {
-    st->print("NULL");
-  } else if (java_lang_String::is_instance(obj)) {
-    java_lang_String::print(obj, st);
-    if (PrintOopAddress) print_address_on(st);
-#ifdef ASSERT
-  } else if (!Universe::heap()->is_in(obj) || !Universe::heap()->is_in(klass())) {
-    st->print("### BAD OOP %p ###", (address)obj);
-#endif
-  } else {
-    blueprint()->oop_print_value_on(obj, st);
-  }
-}
-
 void oopDesc::print_address_on(outputStream* st) const {
   if (PrintOopAddress) {
     st->print("{"INTPTR_FORMAT"}", this);
@@ -71,23 +54,47 @@
 
 void oopDesc::print()         { print_on(tty);         }
 
-void oopDesc::print_value()   { print_value_on(tty);   }
-
 void oopDesc::print_address() { print_address_on(tty); }
 
 char* oopDesc::print_string() {
-  stringStream* st = new stringStream();
-  print_on(st);
-  return st->as_string();
+  stringStream st;
+  print_on(&st);
+  return st.as_string();
+}
+
+#endif // PRODUCT
+
+// The print_value functions are present in all builds, to support the disassembler.
+
+void oopDesc::print_value() {
+  print_value_on(tty);
 }
 
 char* oopDesc::print_value_string() {
-  stringStream* st = new stringStream();
-  print_value_on(st);
-  return st->as_string();
+  char buf[100];
+  stringStream st(buf, sizeof(buf));
+  print_value_on(&st);
+  return st.as_string();
 }
 
-#endif // PRODUCT
+void oopDesc::print_value_on(outputStream* st) const {
+  oop obj = oop(this);
+  if (this == NULL) {
+    st->print("NULL");
+  } else if (java_lang_String::is_instance(obj)) {
+    java_lang_String::print(obj, st);
+#ifndef PRODUCT
+    if (PrintOopAddress) print_address_on(st);
+#endif //PRODUCT
+#ifdef ASSERT
+  } else if (!Universe::heap()->is_in(obj) || !Universe::heap()->is_in(klass())) {
+    st->print("### BAD OOP %p ###", (address)obj);
+#endif //ASSERT
+  } else {
+    blueprint()->oop_print_value_on(obj, st);
+  }
+}
+
 
 void oopDesc::verify_on(outputStream* st) {
   if (this != NULL) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/oop.hpp
--- a/src/share/vm/oops/oop.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/oop.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -30,13 +30,12 @@
 // no virtual functions allowed
 
 // store into oop with store check
-template <class T> void oop_store(T* p, oop v);
-template <class T> void oop_store(volatile T* p, oop v);
+template <class T> inline void oop_store(T* p, oop v);
+template <class T> inline void oop_store(volatile T* p, oop v);
 
 // store into oop without store check
-template <class T> void oop_store_without_check(T* p, oop v);
-template <class T> void oop_store_without_check(volatile T* p, oop v);
-
+template <class T> inline void oop_store_without_check(T* p, oop v);
+template <class T> inline void oop_store_without_check(volatile T* p, oop v);
 
 extern bool always_do_update_barrier;
 
@@ -330,6 +329,7 @@
 
   bool is_perm() const;
   bool is_perm_or_null() const;
+  bool is_scavengable() const;
   bool is_shared() const;
   bool is_shared_readonly() const;
   bool is_shared_readwrite() const;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/oop.inline2.hpp
--- a/src/share/vm/oops/oop.inline2.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/oop.inline2.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -34,3 +34,7 @@
 inline bool oopDesc::is_perm_or_null() const {
   return this == NULL || is_perm();
 }
+
+inline bool oopDesc::is_scavengable() const {
+  return Universe::heap()->is_scavengable(this);
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/symbolKlass.cpp
--- a/src/share/vm/oops/symbolKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/symbolKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -213,6 +213,8 @@
   st->print("'");
 }
 
+#endif //PRODUCT
+
 void symbolKlass::oop_print_value_on(oop obj, outputStream* st) {
   symbolOop sym = symbolOop(obj);
   st->print("'");
@@ -222,8 +224,6 @@
   st->print("'");
 }
 
-#endif //PRODUCT
-
 const char* symbolKlass::internal_name() const {
   return "{symbol}";
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/symbolKlass.hpp
--- a/src/share/vm/oops/symbolKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/symbolKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -65,10 +65,10 @@
   int  oop_oop_iterate(oop obj, OopClosure* blk);
   int  oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr);
 
-#ifndef PRODUCT
   // Printing
   void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on(oop obj, outputStream* st);
-#endif
+#endif //PRODUCT
   const char* internal_name() const;
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/symbolOop.cpp
--- a/src/share/vm/oops/symbolOop.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/symbolOop.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -25,6 +25,11 @@
 # include "incls/_precompiled.incl"
 # include "incls/_symbolOop.cpp.incl"
 
+
+// ------------------------------------------------------------------
+// symbolOopDesc::equals
+//
+// Compares the symbol with a string of the given length.
 bool symbolOopDesc::equals(const char* str, int len) const {
   int l = utf8_length();
   if (l != len) return false;
@@ -36,6 +41,48 @@
   return true;
 }
 
+
+// ------------------------------------------------------------------
+// symbolOopDesc::starts_with
+//
+// Tests if the symbol starts with the specified prefix of the given
+// length.
+bool symbolOopDesc::starts_with(const char* prefix, int len) const {
+  if (len > utf8_length()) return false;
+  while (len-- > 0) {
+    if (prefix[len] != (char) byte_at(len))
+      return false;
+  }
+  assert(len == -1, "we should be at the beginning");
+  return true;
+}
+
+
+// ------------------------------------------------------------------
+// symbolOopDesc::index_of
+//
+// Finds if the given string is a substring of this symbol's utf8 bytes.
+// Return -1 on failure.  Otherwise return the first index where str occurs.
+int symbolOopDesc::index_of_at(int i, const char* str, int len) const {
+  assert(i >= 0 && i <= utf8_length(), "oob");
+  if (len <= 0)  return 0;
+  char first_char = str[0];
+  address bytes = (address) ((symbolOopDesc*)this)->base();
+  address limit = bytes + utf8_length() - len;  // inclusive limit
+  address scan = bytes + i;
+  if (scan > limit)
+    return -1;
+  for (;;) {
+    scan = (address) memchr(scan, first_char, (limit + 1 - scan));
+    if (scan == NULL)
+      return -1;  // not found
+    assert(scan >= bytes+i && scan <= limit, "scan oob");
+    if (memcmp(scan, str, len) == 0)
+      return (int)(scan - bytes);
+  }
+}
+
+
 char* symbolOopDesc::as_C_string(char* buf, int size) const {
   if (size > 0) {
     int len = MIN2(size - 1, utf8_length());
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/symbolOop.hpp
--- a/src/share/vm/oops/symbolOop.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/symbolOop.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -70,8 +70,21 @@
 
   void set_utf8_length(int len) { _length = len; }
 
-  // Compares the symbol with a string
+  // Compares the symbol with a string.
   bool equals(const char* str, int len) const;
+  bool equals(const char* str) const { return equals(str, (int) strlen(str)); }
+
+  // Tests if the symbol starts with the given prefix.
+  bool starts_with(const char* prefix, int len) const;
+  bool starts_with(const char* prefix) const {
+    return starts_with(prefix, (int) strlen(prefix));
+  }
+
+  // Tests if the symbol starts with the given prefix.
+  int index_of_at(int i, const char* str, int len) const;
+  int index_of_at(int i, const char* str) const {
+    return index_of_at(i, str, (int) strlen(str));
+  }
 
   // Three-way compare for sorting; returns -1/0/1 if receiver is </==/> than arg
   // note that the ordering is not alfabetical
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/typeArrayKlassKlass.cpp
--- a/src/share/vm/oops/typeArrayKlassKlass.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/typeArrayKlassKlass.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -45,6 +45,7 @@
   Klass:: oop_print_on(obj, st);
 }
 
+#endif //PRODUCT
 
 void typeArrayKlassKlass::oop_print_value_on(oop obj, outputStream* st) {
   assert(obj->is_klass(), "must be klass");
@@ -63,8 +64,6 @@
   st->print("}");
 }
 
-#endif
-
 const char* typeArrayKlassKlass::internal_name() const {
   return "{type array class}";
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/oops/typeArrayKlassKlass.hpp
--- a/src/share/vm/oops/typeArrayKlassKlass.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/oops/typeArrayKlassKlass.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -47,12 +47,12 @@
   static int header_size() { return oopDesc::header_size() + sizeof(typeArrayKlassKlass)/HeapWordSize; }
   int object_size() const  { return align_object_size(header_size()); }
 
-#ifndef PRODUCT
  public:
   // Printing
+  void oop_print_value_on(oop obj, outputStream* st);
+#ifndef PRODUCT
   void oop_print_on(oop obj, outputStream* st);
-  void oop_print_value_on(oop obj, outputStream* st);
-#endif
- public:
+#endif //PRODUCT
+
   const char* internal_name() const;
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/bytecodeInfo.cpp
--- a/src/share/vm/opto/bytecodeInfo.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/bytecodeInfo.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -27,11 +27,16 @@
 
 //=============================================================================
 //------------------------------InlineTree-------------------------------------
-InlineTree::InlineTree( Compile* c, const InlineTree *caller_tree, ciMethod* callee, JVMState* caller_jvms, int caller_bci, float site_invoke_ratio )
+InlineTree::InlineTree( Compile* c,
+                        const InlineTree *caller_tree, ciMethod* callee,
+                        JVMState* caller_jvms, int caller_bci,
+                        float site_invoke_ratio, int site_depth_adjust)
 : C(c), _caller_jvms(caller_jvms),
   _caller_tree((InlineTree*)caller_tree),
   _method(callee), _site_invoke_ratio(site_invoke_ratio),
-  _count_inline_bcs(method()->code_size()) {
+  _site_depth_adjust(site_depth_adjust),
+  _count_inline_bcs(method()->code_size())
+{
   NOT_PRODUCT(_count_inlines = 0;)
   if (_caller_jvms != NULL) {
     // Keep a private copy of the caller_jvms:
@@ -40,7 +45,7 @@
     assert(!caller_jvms->should_reexecute(), "there should be no reexecute bytecode with inlining");
   }
   assert(_caller_jvms->same_calls_as(caller_jvms), "consistent JVMS");
-  assert((caller_tree == NULL ? 0 : caller_tree->inline_depth() + 1) == inline_depth(), "correct (redundant) depth parameter");
+  assert((caller_tree == NULL ? 0 : caller_tree->stack_depth() + 1) == stack_depth(), "correct (redundant) depth parameter");
   assert(caller_bci == this->caller_bci(), "correct (redundant) bci parameter");
   if (UseOldInlining) {
     // Update hierarchical counts, count_inline_bcs() and count_inlines()
@@ -52,10 +57,13 @@
   }
 }
 
-InlineTree::InlineTree(Compile* c, ciMethod* callee_method, JVMState* caller_jvms, float site_invoke_ratio)
+InlineTree::InlineTree(Compile* c, ciMethod* callee_method, JVMState* caller_jvms,
+                       float site_invoke_ratio, int site_depth_adjust)
 : C(c), _caller_jvms(caller_jvms), _caller_tree(NULL),
   _method(callee_method), _site_invoke_ratio(site_invoke_ratio),
-  _count_inline_bcs(method()->code_size()) {
+  _site_depth_adjust(site_depth_adjust),
+  _count_inline_bcs(method()->code_size())
+{
   NOT_PRODUCT(_count_inlines = 0;)
   assert(!UseOldInlining, "do not use for old stuff");
 }
@@ -180,6 +188,10 @@
     return NULL;
   }
 
+  // Always inline MethodHandle methods.
+  if (callee_method->is_method_handle_invoke())
+    return NULL;
+
   // First check all inlining restrictions which are required for correctness
   if (callee_method->is_abstract())               return "abstract method";
   // note: we allow ik->is_abstract()
@@ -265,10 +277,13 @@
     return msg;
   }
 
-  bool is_accessor = InlineAccessors && callee_method->is_accessor();
+  if (InlineAccessors && callee_method->is_accessor()) {
+    // accessor methods are not subject to any of the following limits.
+    return NULL;
+  }
 
   // suppress a few checks for accessors and trivial methods
-  if (!is_accessor && callee_method->code_size() > MaxTrivialSize) {
+  if (callee_method->code_size() > MaxTrivialSize) {
 
     // don't inline into giant methods
     if (C->unique() > (uint)NodeCountInliningCutoff) {
@@ -287,7 +302,7 @@
     }
   }
 
-  if (!C->do_inlining() && InlineAccessors && !is_accessor) {
+  if (!C->do_inlining() && InlineAccessors) {
     return "not an accessor";
   }
   if( inline_depth() > MaxInlineLevel ) {
@@ -322,14 +337,17 @@
     // stricter than callee_holder->is_initialized()
     ciBytecodeStream iter(caller_method);
     iter.force_bci(caller_bci);
-    int index = iter.get_index_int();
-    if( !caller_method->is_klass_loaded(index, true) ) {
-      return false;
-    }
-    // Try to do constant pool resolution if running Xcomp
     Bytecodes::Code call_bc = iter.cur_bc();
-    if( !caller_method->check_call(index, call_bc == Bytecodes::_invokestatic) ) {
-      return false;
+    // An invokedynamic instruction does not have a klass.
+    if (call_bc != Bytecodes::_invokedynamic) {
+      int index = iter.get_index_int();
+      if (!caller_method->is_klass_loaded(index, true)) {
+        return false;
+      }
+      // Try to do constant pool resolution if running Xcomp
+      if( !caller_method->check_call(index, call_bc == Bytecodes::_invokestatic) ) {
+        return false;
+      }
     }
   }
   // We will attempt to see if a class/field/etc got properly loaded.  If it
@@ -457,7 +475,30 @@
   if (old_ilt != NULL) {
     return old_ilt;
   }
-  InlineTree *ilt = new InlineTree( C, this, callee_method, caller_jvms, caller_bci, recur_frequency );
+  int new_depth_adjust = 0;
+  if (caller_jvms->method() != NULL) {
+    if ((caller_jvms->method()->name() == ciSymbol::invoke_name() &&
+         caller_jvms->method()->holder()->name() == ciSymbol::java_dyn_MethodHandle())
+        || caller_jvms->method()->holder()->name() == ciSymbol::java_dyn_InvokeDynamic())
+      /* @@@ FIXME:
+    if (caller_jvms->method()->is_method_handle_adapter())
+      */
+      new_depth_adjust -= 1;  // don't count actions in MH or indy adapter frames
+    else if (callee_method->is_method_handle_invoke()) {
+      new_depth_adjust -= 1;  // don't count method handle calls from java.dyn implem
+    }
+    if (new_depth_adjust != 0 && PrintInlining) {
+      stringStream nm1; caller_jvms->method()->print_name(&nm1);
+      stringStream nm2; callee_method->print_name(&nm2);
+      tty->print_cr("discounting inlining depth from %s to %s", nm1.base(), nm2.base());
+    }
+    if (new_depth_adjust != 0 && C->log()) {
+      int id1 = C->log()->identify(caller_jvms->method());
+      int id2 = C->log()->identify(callee_method);
+      C->log()->elem("inline_depth_discount caller='%d' callee='%d'", id1, id2);
+    }
+  }
+  InlineTree *ilt = new InlineTree(C, this, callee_method, caller_jvms, caller_bci, recur_frequency, _site_depth_adjust + new_depth_adjust);
   _subtrees.append( ilt );
 
   NOT_PRODUCT( _count_inlines += 1; )
@@ -483,7 +524,7 @@
   Compile* C = Compile::current();
 
   // Root of inline tree
-  InlineTree *ilt = new InlineTree(C, NULL, C->method(), NULL, -1, 1.0F);
+  InlineTree *ilt = new InlineTree(C, NULL, C->method(), NULL, -1, 1.0F, 0);
 
   return ilt;
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/c2_globals.cpp
--- a/src/share/vm/opto/c2_globals.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/c2_globals.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -25,4 +25,4 @@
 # include "incls/_precompiled.incl"
 # include "incls/_c2_globals.cpp.incl"
 
-C2_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, MATERIALIZE_DIAGNOSTIC_FLAG, MATERIALIZE_NOTPRODUCT_FLAG)
+C2_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, MATERIALIZE_DIAGNOSTIC_FLAG, MATERIALIZE_EXPERIMENTAL_FLAG, MATERIALIZE_NOTPRODUCT_FLAG)
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/c2_globals.hpp
--- a/src/share/vm/opto/c2_globals.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/c2_globals.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -26,7 +26,7 @@
 // Defines all globals flags used by the server compiler.
 //
 
-#define C2_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \
+#define C2_FLAGS(develop, develop_pd, product, product_pd, diagnostic, experimental, notproduct) \
                                                                             \
   notproduct(intx, CompileZapFirst, 0,                                      \
           "If +ZapDeadCompiledLocals, "                                     \
@@ -154,6 +154,12 @@
   notproduct(bool, TraceProfileTripCount, false,                            \
           "Trace profile loop trip count information")                      \
                                                                             \
+  product(bool, UseLoopPredicate, true,                                     \
+          "Generate a predicate to select fast/slow loop versions")         \
+                                                                            \
+  develop(bool, TraceLoopPredicate, false,                                  \
+          "Trace generation of loop predicates")                            \
+                                                                            \
   develop(bool, OptoCoalesce, true,                                         \
           "Use Conservative Copy Coalescing in the Register Allocator")     \
                                                                             \
@@ -376,7 +382,7 @@
   product(intx, AutoBoxCacheMax, 128,                                       \
           "Sets max value cached by the java.lang.Integer autobox cache")   \
                                                                             \
-  product(bool, DoEscapeAnalysis, false,                                    \
+  product(bool, DoEscapeAnalysis, true,                                     \
           "Perform escape analysis")                                        \
                                                                             \
   notproduct(bool, PrintEscapeAnalysis, false,                              \
@@ -394,6 +400,12 @@
   product(bool, UseOptoBiasInlining, true,                                  \
           "Generate biased locking code in C2 ideal graph")                 \
                                                                             \
+  product(bool, OptimizeStringConcat, false,                                \
+          "Optimize the construction of Strings by StringBuilder")          \
+                                                                            \
+  notproduct(bool, PrintOptimizeStringConcat, false,                        \
+          "Print information about transformations performed on Strings")   \
+                                                                            \
   product(intx, ValueSearchLimit, 1000,                                     \
           "Recursion limit in PhaseMacroExpand::value_from_mem_phi")        \
                                                                             \
@@ -413,4 +425,4 @@
   product(bool, BlockLayoutRotateLoops, true,                               \
           "Allow back branches to be fall throughs in the block layour")    \
 
-C2_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG)
+C2_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG)
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/callGenerator.cpp
--- a/src/share/vm/opto/callGenerator.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/callGenerator.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2010 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
@@ -98,12 +98,21 @@
 //---------------------------DirectCallGenerator------------------------------
 // Internal class which handles all out-of-line calls w/o receiver type checks.
 class DirectCallGenerator : public CallGenerator {
-public:
-  DirectCallGenerator(ciMethod* method)
-    : CallGenerator(method)
+ private:
+  CallStaticJavaNode* _call_node;
+  // Force separate memory and I/O projections for the exceptional
+  // paths to facilitate late inlinig.
+  bool                _separate_io_proj;
+
+ public:
+  DirectCallGenerator(ciMethod* method, bool separate_io_proj)
+    : CallGenerator(method),
+      _separate_io_proj(separate_io_proj)
   {
   }
   virtual JVMState* generate(JVMState* jvms);
+
+  CallStaticJavaNode* call_node() const { return _call_node; }
 };
 
 JVMState* DirectCallGenerator::generate(JVMState* jvms) {
@@ -127,14 +136,85 @@
     }
     // Mark the call node as virtual, sort of:
     call->set_optimized_virtual(true);
+    if (method()->is_method_handle_invoke()) {
+      call->set_method_handle_invoke(true);
+      kit.C->set_has_method_handle_invokes(true);
+    }
   }
   kit.set_arguments_for_java_call(call);
+  kit.set_edges_for_java_call(call, false, _separate_io_proj);
+  Node* ret = kit.set_results_for_java_call(call, _separate_io_proj);
+  kit.push_node(method()->return_type()->basic_type(), ret);
+  _call_node = call;  // Save the call node in case we need it later
+  return kit.transfer_exceptions_into_jvms();
+}
+
+//---------------------------DynamicCallGenerator-----------------------------
+// Internal class which handles all out-of-line invokedynamic calls.
+class DynamicCallGenerator : public CallGenerator {
+public:
+  DynamicCallGenerator(ciMethod* method)
+    : CallGenerator(method)
+  {
+  }
+  virtual JVMState* generate(JVMState* jvms);
+};
+
+JVMState* DynamicCallGenerator::generate(JVMState* jvms) {
+  GraphKit kit(jvms);
+
+  if (kit.C->log() != NULL) {
+    kit.C->log()->elem("dynamic_call bci='%d'", jvms->bci());
+  }
+
+  // Get the constant pool cache from the caller class.
+  ciMethod* caller_method = jvms->method();
+  ciBytecodeStream str(caller_method);
+  str.force_bci(jvms->bci());  // Set the stream to the invokedynamic bci.
+  assert(str.cur_bc() == Bytecodes::_invokedynamic, "wrong place to issue a dynamic call!");
+  ciCPCache* cpcache = str.get_cpcache();
+
+  // Get the offset of the CallSite from the constant pool cache
+  // pointer.
+  int index = str.get_method_index();
+  size_t call_site_offset = cpcache->get_f1_offset(index);
+
+  // Load the CallSite object from the constant pool cache.
+  const TypeOopPtr* cpcache_ptr = TypeOopPtr::make_from_constant(cpcache);
+  Node* cpcache_adr = kit.makecon(cpcache_ptr);
+  Node* call_site_adr = kit.basic_plus_adr(cpcache_adr, cpcache_adr, call_site_offset);
+  Node* call_site = kit.make_load(kit.control(), call_site_adr, TypeInstPtr::BOTTOM, T_OBJECT, Compile::AliasIdxRaw);
+
+  // Load the target MethodHandle from the CallSite object.
+  Node* target_mh_adr = kit.basic_plus_adr(call_site, call_site, java_dyn_CallSite::target_offset_in_bytes());
+  Node* target_mh = kit.make_load(kit.control(), target_mh_adr, TypeInstPtr::BOTTOM, T_OBJECT);
+
+  address resolve_stub = SharedRuntime::get_resolve_opt_virtual_call_stub();
+
+  CallStaticJavaNode *call = new (kit.C, tf()->domain()->cnt()) CallStaticJavaNode(tf(), resolve_stub, method(), kit.bci());
+  // invokedynamic is treated as an optimized invokevirtual.
+  call->set_optimized_virtual(true);
+  // Take extra care (in the presence of argument motion) not to trash the SP:
+  call->set_method_handle_invoke(true);
+  kit.C->set_has_method_handle_invokes(true);
+
+  // Pass the target MethodHandle as first argument and shift the
+  // other arguments.
+  call->init_req(0 + TypeFunc::Parms, target_mh);
+  uint nargs = call->method()->arg_size();
+  for (uint i = 1; i < nargs; i++) {
+    Node* arg = kit.argument(i - 1);
+    call->init_req(i + TypeFunc::Parms, arg);
+  }
+
   kit.set_edges_for_java_call(call);
   Node* ret = kit.set_results_for_java_call(call);
   kit.push_node(method()->return_type()->basic_type(), ret);
   return kit.transfer_exceptions_into_jvms();
 }
 
+//--------------------------VirtualCallGenerator------------------------------
+// Internal class which handles all out-of-line calls checking receiver type.
 class VirtualCallGenerator : public CallGenerator {
 private:
   int _vtable_index;
@@ -149,8 +229,6 @@
   virtual JVMState* generate(JVMState* jvms);
 };
 
-//--------------------------VirtualCallGenerator------------------------------
-// Internal class which handles all out-of-line calls checking receiver type.
 JVMState* VirtualCallGenerator::generate(JVMState* jvms) {
   GraphKit kit(jvms);
   Node* receiver = kit.argument(0);
@@ -238,16 +316,124 @@
   return new ParseGenerator(m, expected_uses, true);
 }
 
-CallGenerator* CallGenerator::for_direct_call(ciMethod* m) {
+CallGenerator* CallGenerator::for_direct_call(ciMethod* m, bool separate_io_proj) {
   assert(!m->is_abstract(), "for_direct_call mismatch");
-  return new DirectCallGenerator(m);
+  return new DirectCallGenerator(m, separate_io_proj);
+}
+
+CallGenerator* CallGenerator::for_dynamic_call(ciMethod* m) {
+  assert(m->is_method_handle_invoke(), "for_dynamic_call mismatch");
+  return new DynamicCallGenerator(m);
 }
 
 CallGenerator* CallGenerator::for_virtual_call(ciMethod* m, int vtable_index) {
   assert(!m->is_static(), "for_virtual_call mismatch");
+  assert(!m->is_method_handle_invoke(), "should be a direct call");
   return new VirtualCallGenerator(m, vtable_index);
 }
 
+// Allow inlining decisions to be delayed
+class LateInlineCallGenerator : public DirectCallGenerator {
+  CallGenerator* _inline_cg;
+
+ public:
+  LateInlineCallGenerator(ciMethod* method, CallGenerator* inline_cg) :
+    DirectCallGenerator(method, true), _inline_cg(inline_cg) {}
+
+  virtual bool      is_late_inline() const { return true; }
+
+  // Convert the CallStaticJava into an inline
+  virtual void do_late_inline();
+
+  JVMState* generate(JVMState* jvms) {
+    // Record that this call site should be revisited once the main
+    // parse is finished.
+    Compile::current()->add_late_inline(this);
+
+    // Emit the CallStaticJava and request separate projections so
+    // that the late inlining logic can distinguish between fall
+    // through and exceptional uses of the memory and io projections
+    // as is done for allocations and macro expansion.
+    return DirectCallGenerator::generate(jvms);
+  }
+
+};
+
+
+void LateInlineCallGenerator::do_late_inline() {
+  // Can't inline it
+  if (call_node() == NULL || call_node()->outcnt() == 0 ||
+      call_node()->in(0) == NULL || call_node()->in(0)->is_top())
+    return;
+
+  CallStaticJavaNode* call = call_node();
+
+  // Make a clone of the JVMState that appropriate to use for driving a parse
+  Compile* C = Compile::current();
+  JVMState* jvms     = call->jvms()->clone_shallow(C);
+  uint size = call->req();
+  SafePointNode* map = new (C, size) SafePointNode(size, jvms);
+  for (uint i1 = 0; i1 < size; i1++) {
+    map->init_req(i1, call->in(i1));
+  }
+
+  // Make sure the state is a MergeMem for parsing.
+  if (!map->in(TypeFunc::Memory)->is_MergeMem()) {
+    map->set_req(TypeFunc::Memory, MergeMemNode::make(C, map->in(TypeFunc::Memory)));
+  }
+
+  // Make enough space for the expression stack and transfer the incoming arguments
+  int nargs    = method()->arg_size();
+  jvms->set_map(map);
+  map->ensure_stack(jvms, jvms->method()->max_stack());
+  if (nargs > 0) {
+    for (int i1 = 0; i1 < nargs; i1++) {
+      map->set_req(i1 + jvms->argoff(), call->in(TypeFunc::Parms + i1));
+    }
+  }
+
+  CompileLog* log = C->log();
+  if (log != NULL) {
+    log->head("late_inline method='%d'", log->identify(method()));
+    JVMState* p = jvms;
+    while (p != NULL) {
+      log->elem("jvms bci='%d' method='%d'", p->bci(), log->identify(p->method()));
+      p = p->caller();
+    }
+    log->tail("late_inline");
+  }
+
+  // Setup default node notes to be picked up by the inlining
+  Node_Notes* old_nn = C->default_node_notes();
+  if (old_nn != NULL) {
+    Node_Notes* entry_nn = old_nn->clone(C);
+    entry_nn->set_jvms(jvms);
+    C->set_default_node_notes(entry_nn);
+  }
+
+  // Now perform the inling using the synthesized JVMState
+  JVMState* new_jvms = _inline_cg->generate(jvms);
+  if (new_jvms == NULL)  return;  // no change
+  if (C->failing())      return;
+
+  // Capture any exceptional control flow
+  GraphKit kit(new_jvms);
+
+  // Find the result object
+  Node* result = C->top();
+  int   result_size = method()->return_type()->size();
+  if (result_size != 0 && !kit.stopped()) {
+    result = (result_size == 1) ? kit.pop() : kit.pop_pair();
+  }
+
+  kit.replace_call(call, result);
+}
+
+
+CallGenerator* CallGenerator::for_late_inline(ciMethod* method, CallGenerator* inline_cg) {
+  return new LateInlineCallGenerator(method, inline_cg);
+}
+
 
 //---------------------------WarmCallGenerator--------------------------------
 // Internal class which handles initial deferral of inlining decisions.
@@ -315,70 +501,7 @@
 }
 
 void WarmCallInfo::make_hot() {
-  Compile* C = Compile::current();
-  // Replace the callnode with something better.
-  CallJavaNode* call = this->call()->as_CallJava();
-  ciMethod* method   = call->method();
-  int       nargs    = method->arg_size();
-  JVMState* jvms     = call->jvms()->clone_shallow(C);
-  uint size = TypeFunc::Parms + MAX2(2, nargs);
-  SafePointNode* map = new (C, size) SafePointNode(size, jvms);
-  for (uint i1 = 0; i1 < (uint)(TypeFunc::Parms + nargs); i1++) {
-    map->init_req(i1, call->in(i1));
-  }
-  jvms->set_map(map);
-  jvms->set_offsets(map->req());
-  jvms->set_locoff(TypeFunc::Parms);
-  jvms->set_stkoff(TypeFunc::Parms);
-  GraphKit kit(jvms);
-
-  JVMState* new_jvms = _hot_cg->generate(kit.jvms());
-  if (new_jvms == NULL)  return;  // no change
-  if (C->failing())      return;
-
-  kit.set_jvms(new_jvms);
-  Node* res = C->top();
-  int   res_size = method->return_type()->size();
-  if (res_size != 0) {
-    kit.inc_sp(-res_size);
-    res = kit.argument(0);
-  }
-  GraphKit ekit(kit.combine_and_pop_all_exception_states()->jvms());
-
-  // Replace the call:
-  for (DUIterator i = call->outs(); call->has_out(i); i++) {
-    Node* n = call->out(i);
-    Node* nn = NULL;  // replacement
-    if (n->is_Proj()) {
-      ProjNode* nproj = n->as_Proj();
-      assert(nproj->_con < (uint)(TypeFunc::Parms + (res_size ? 1 : 0)), "sane proj");
-      if (nproj->_con == TypeFunc::Parms) {
-        nn = res;
-      } else {
-        nn = kit.map()->in(nproj->_con);
-      }
-      if (nproj->_con == TypeFunc::I_O) {
-        for (DUIterator j = nproj->outs(); nproj->has_out(j); j++) {
-          Node* e = nproj->out(j);
-          if (e->Opcode() == Op_CreateEx) {
-            e->replace_by(ekit.argument(0));
-          } else if (e->Opcode() == Op_Catch) {
-            for (DUIterator k = e->outs(); e->has_out(k); k++) {
-              CatchProjNode* p = e->out(j)->as_CatchProj();
-              if (p->is_handler_proj()) {
-                p->replace_by(ekit.control());
-              } else {
-                p->replace_by(kit.control());
-              }
-            }
-          }
-        }
-      }
-    }
-    NOT_PRODUCT(if (!nn)  n->dump(2));
-    assert(nn != NULL, "don't know what to do with this user");
-    n->replace_by(nn);
-  }
+  Unimplemented();
 }
 
 void WarmCallInfo::make_cold() {
@@ -527,6 +650,155 @@
 }
 
 
+//------------------------PredictedDynamicCallGenerator-----------------------
+// Internal class which handles all out-of-line calls checking receiver type.
+class PredictedDynamicCallGenerator : public CallGenerator {
+  ciMethodHandle* _predicted_method_handle;
+  CallGenerator*  _if_missed;
+  CallGenerator*  _if_hit;
+  float           _hit_prob;
+
+public:
+  PredictedDynamicCallGenerator(ciMethodHandle* predicted_method_handle,
+                                CallGenerator* if_missed,
+                                CallGenerator* if_hit,
+                                float hit_prob)
+    : CallGenerator(if_missed->method()),
+      _predicted_method_handle(predicted_method_handle),
+      _if_missed(if_missed),
+      _if_hit(if_hit),
+      _hit_prob(hit_prob)
+  {}
+
+  virtual bool is_inline()   const { return _if_hit->is_inline(); }
+  virtual bool is_deferred() const { return _if_hit->is_deferred(); }
+
+  virtual JVMState* generate(JVMState* jvms);
+};
+
+
+CallGenerator* CallGenerator::for_predicted_dynamic_call(ciMethodHandle* predicted_method_handle,
+                                                         CallGenerator* if_missed,
+                                                         CallGenerator* if_hit,
+                                                         float hit_prob) {
+  return new PredictedDynamicCallGenerator(predicted_method_handle, if_missed, if_hit, hit_prob);
+}
+
+
+JVMState* PredictedDynamicCallGenerator::generate(JVMState* jvms) {
+  GraphKit kit(jvms);
+  PhaseGVN& gvn = kit.gvn();
+
+  CompileLog* log = kit.C->log();
+  if (log != NULL) {
+    log->elem("predicted_dynamic_call bci='%d'", jvms->bci());
+  }
+
+  // Get the constant pool cache from the caller class.
+  ciMethod* caller_method = jvms->method();
+  ciBytecodeStream str(caller_method);
+  str.force_bci(jvms->bci());  // Set the stream to the invokedynamic bci.
+  ciCPCache* cpcache = str.get_cpcache();
+
+  // Get the offset of the CallSite from the constant pool cache
+  // pointer.
+  int index = str.get_method_index();
+  size_t call_site_offset = cpcache->get_f1_offset(index);
+
+  // Load the CallSite object from the constant pool cache.
+  const TypeOopPtr* cpcache_ptr = TypeOopPtr::make_from_constant(cpcache);
+  Node* cpcache_adr   = kit.makecon(cpcache_ptr);
+  Node* call_site_adr = kit.basic_plus_adr(cpcache_adr, cpcache_adr, call_site_offset);
+  Node* call_site     = kit.make_load(kit.control(), call_site_adr, TypeInstPtr::BOTTOM, T_OBJECT, Compile::AliasIdxRaw);
+
+  // Load the target MethodHandle from the CallSite object.
+  Node* target_adr = kit.basic_plus_adr(call_site, call_site, java_dyn_CallSite::target_offset_in_bytes());
+  Node* target_mh  = kit.make_load(kit.control(), target_adr, TypeInstPtr::BOTTOM, T_OBJECT);
+
+  // Check if the MethodHandle is still the same.
+  const TypeOopPtr* predicted_mh_ptr = TypeOopPtr::make_from_constant(_predicted_method_handle, true);
+  Node* predicted_mh = kit.makecon(predicted_mh_ptr);
+
+  Node* cmp = gvn.transform(new(kit.C, 3) CmpPNode(target_mh, predicted_mh));
+  Node* bol = gvn.transform(new(kit.C, 2) BoolNode(cmp, BoolTest::eq) );
+  IfNode* iff = kit.create_and_xform_if(kit.control(), bol, _hit_prob, COUNT_UNKNOWN);
+  kit.set_control( gvn.transform(new(kit.C, 1) IfTrueNode (iff)));
+  Node* slow_ctl = gvn.transform(new(kit.C, 1) IfFalseNode(iff));
+
+  SafePointNode* slow_map = NULL;
+  JVMState* slow_jvms;
+  { PreserveJVMState pjvms(&kit);
+    kit.set_control(slow_ctl);
+    if (!kit.stopped()) {
+      slow_jvms = _if_missed->generate(kit.sync_jvms());
+      assert(slow_jvms != NULL, "miss path must not fail to generate");
+      kit.add_exception_states_from(slow_jvms);
+      kit.set_map(slow_jvms->map());
+      if (!kit.stopped())
+        slow_map = kit.stop();
+    }
+  }
+
+  if (kit.stopped()) {
+    // Instance exactly does not matches the desired type.
+    kit.set_jvms(slow_jvms);
+    return kit.transfer_exceptions_into_jvms();
+  }
+
+  // Make the hot call:
+  JVMState* new_jvms = _if_hit->generate(kit.sync_jvms());
+  if (new_jvms == NULL) {
+    // Inline failed, so make a direct call.
+    assert(_if_hit->is_inline(), "must have been a failed inline");
+    CallGenerator* cg = CallGenerator::for_direct_call(_if_hit->method());
+    new_jvms = cg->generate(kit.sync_jvms());
+  }
+  kit.add_exception_states_from(new_jvms);
+  kit.set_jvms(new_jvms);
+
+  // Need to merge slow and fast?
+  if (slow_map == NULL) {
+    // The fast path is the only path remaining.
+    return kit.transfer_exceptions_into_jvms();
+  }
+
+  if (kit.stopped()) {
+    // Inlined method threw an exception, so it's just the slow path after all.
+    kit.set_jvms(slow_jvms);
+    return kit.transfer_exceptions_into_jvms();
+  }
+
+  // Finish the diamond.
+  kit.C->set_has_split_ifs(true); // Has chance for split-if optimization
+  RegionNode* region = new (kit.C, 3) RegionNode(3);
+  region->init_req(1, kit.control());
+  region->init_req(2, slow_map->control());
+  kit.set_control(gvn.transform(region));
+  Node* iophi = PhiNode::make(region, kit.i_o(), Type::ABIO);
+  iophi->set_req(2, slow_map->i_o());
+  kit.set_i_o(gvn.transform(iophi));
+  kit.merge_memory(slow_map->merged_memory(), region, 2);
+  uint tos = kit.jvms()->stkoff() + kit.sp();
+  uint limit = slow_map->req();
+  for (uint i = TypeFunc::Parms; i < limit; i++) {
+    // Skip unused stack slots; fast forward to monoff();
+    if (i == tos) {
+      i = kit.jvms()->monoff();
+      if( i >= limit ) break;
+    }
+    Node* m = kit.map()->in(i);
+    Node* n = slow_map->in(i);
+    if (m != n) {
+      const Type* t = gvn.type(m)->meet(gvn.type(n));
+      Node* phi = PhiNode::make(region, m, t);
+      phi->set_req(2, n);
+      kit.map()->set_req(i, gvn.transform(phi));
+    }
+  }
+  return kit.transfer_exceptions_into_jvms();
+}
+
+
 //-------------------------UncommonTrapCallGenerator-----------------------------
 // Internal class which handles all out-of-line calls checking receiver type.
 class UncommonTrapCallGenerator : public CallGenerator {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/callGenerator.hpp
--- a/src/share/vm/opto/callGenerator.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/callGenerator.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -57,6 +57,13 @@
   // is_trap: Does not return to the caller.  (E.g., uncommon trap.)
   virtual bool      is_trap() const             { return false; }
 
+  // is_late_inline: supports conversion of call into an inline
+  virtual bool      is_late_inline() const      { return false; }
+  // Replace the call with an inline version of the code
+  virtual void do_late_inline() { ShouldNotReachHere(); }
+
+  virtual CallStaticJavaNode* call_node() const { ShouldNotReachHere(); return NULL; }
+
   // Note:  It is possible for a CG to be both inline and virtual.
   // (The hashCode intrinsic does a vtable check and an inlined fast path.)
 
@@ -92,9 +99,13 @@
   static CallGenerator* for_osr(ciMethod* m, int osr_bci);
 
   // How to generate vanilla out-of-line call sites:
-  static CallGenerator* for_direct_call(ciMethod* m);   // static, special
+  static CallGenerator* for_direct_call(ciMethod* m, bool separate_io_projs = false);   // static, special
+  static CallGenerator* for_dynamic_call(ciMethod* m);   // invokedynamic
   static CallGenerator* for_virtual_call(ciMethod* m, int vtable_index);  // virtual, interface
 
+  // How to generate a replace a direct call with an inline version
+  static CallGenerator* for_late_inline(ciMethod* m, CallGenerator* inline_cg);
+
   // How to make a call but defer the decision whether to inline or not.
   static CallGenerator* for_warm_call(WarmCallInfo* ci,
                                       CallGenerator* if_cold,
@@ -106,6 +117,12 @@
                                            CallGenerator* if_hit,
                                            float hit_prob);
 
+  // How to make a call that optimistically assumes a MethodHandle target:
+  static CallGenerator* for_predicted_dynamic_call(ciMethodHandle* predicted_method_handle,
+                                                   CallGenerator* if_missed,
+                                                   CallGenerator* if_hit,
+                                                   float hit_prob);
+
   // How to make a call that gives up and goes back to the interpreter:
   static CallGenerator* for_uncommon_trap(ciMethod* m,
                                           Deoptimization::DeoptReason reason,
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/callnode.cpp
--- a/src/share/vm/opto/callnode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/callnode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -421,21 +421,23 @@
         iklass = cik->as_instance_klass();
       } else if (cik->is_type_array_klass()) {
         cik->as_array_klass()->base_element_type()->print_name_on(st);
-        st->print("[%d]=", spobj->n_fields());
+        st->print("[%d]", spobj->n_fields());
       } else if (cik->is_obj_array_klass()) {
-        ciType* cie = cik->as_array_klass()->base_element_type();
-        int ndim = 1;
-        while (cie->is_obj_array_klass()) {
-          ndim += 1;
-          cie = cie->as_array_klass()->base_element_type();
+        ciKlass* cie = cik->as_obj_array_klass()->base_element_klass();
+        if (cie->is_instance_klass()) {
+          cie->print_name_on(st);
+        } else if (cie->is_type_array_klass()) {
+          cie->as_array_klass()->base_element_type()->print_name_on(st);
+        } else {
+          ShouldNotReachHere();
         }
-        cie->print_name_on(st);
+        st->print("[%d]", spobj->n_fields());
+        int ndim = cik->as_array_klass()->dimension() - 1;
         while (ndim-- > 0) {
           st->print("[]");
         }
-        st->print("[%d]=", spobj->n_fields());
       }
-      st->print("{");
+      st->print("={");
       uint nf = spobj->n_fields();
       if (nf > 0) {
         uint first_ind = spobj->first_index();
@@ -493,7 +495,8 @@
     if (!printed)
       _method->print_short_name(st);
     st->print(" @ bci:%d",_bci);
-    st->print(" reexecute:%s", _reexecute==Reexecute_True?"true":"false");
+    if(_reexecute == Reexecute_True)
+      st->print(" reexecute");
   } else {
     st->print(" runtime stub");
   }
@@ -690,6 +693,84 @@
 }
 
 
+void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj) {
+  projs->fallthrough_proj      = NULL;
+  projs->fallthrough_catchproj = NULL;
+  projs->fallthrough_ioproj    = NULL;
+  projs->catchall_ioproj       = NULL;
+  projs->catchall_catchproj    = NULL;
+  projs->fallthrough_memproj   = NULL;
+  projs->catchall_memproj      = NULL;
+  projs->resproj               = NULL;
+  projs->exobj                 = NULL;
+
+  for (DUIterator_Fast imax, i = fast_outs(imax); i < imax; i++) {
+    ProjNode *pn = fast_out(i)->as_Proj();
+    if (pn->outcnt() == 0) continue;
+    switch (pn->_con) {
+    case TypeFunc::Control:
+      {
+        // For Control (fallthrough) and I_O (catch_all_index) we have CatchProj -> Catch -> Proj
+        projs->fallthrough_proj = pn;
+        DUIterator_Fast jmax, j = pn->fast_outs(jmax);
+        const Node *cn = pn->fast_out(j);
+        if (cn->is_Catch()) {
+          ProjNode *cpn = NULL;
+          for (DUIterator_Fast kmax, k = cn->fast_outs(kmax); k < kmax; k++) {
+            cpn = cn->fast_out(k)->as_Proj();
+            assert(cpn->is_CatchProj(), "must be a CatchProjNode");
+            if (cpn->_con == CatchProjNode::fall_through_index)
+              projs->fallthrough_catchproj = cpn;
+            else {
+              assert(cpn->_con == CatchProjNode::catch_all_index, "must be correct index.");
+              projs->catchall_catchproj = cpn;
+            }
+          }
+        }
+        break;
+      }
+    case TypeFunc::I_O:
+      if (pn->_is_io_use)
+        projs->catchall_ioproj = pn;
+      else
+        projs->fallthrough_ioproj = pn;
+      for (DUIterator j = pn->outs(); pn->has_out(j); j++) {
+        Node* e = pn->out(j);
+        if (e->Opcode() == Op_CreateEx && e->in(0)->is_CatchProj()) {
+          assert(projs->exobj == NULL, "only one");
+          projs->exobj = e;
+        }
+      }
+      break;
+    case TypeFunc::Memory:
+      if (pn->_is_io_use)
+        projs->catchall_memproj = pn;
+      else
+        projs->fallthrough_memproj = pn;
+      break;
+    case TypeFunc::Parms:
+      projs->resproj = pn;
+      break;
+    default:
+      assert(false, "unexpected projection from allocation node.");
+    }
+  }
+
+  // The resproj may not exist because the result couuld be ignored
+  // and the exception object may not exist if an exception handler
+  // swallows the exception but all the other must exist and be found.
+  assert(projs->fallthrough_proj      != NULL, "must be found");
+  assert(projs->fallthrough_catchproj != NULL, "must be found");
+  assert(projs->fallthrough_memproj   != NULL, "must be found");
+  assert(projs->fallthrough_ioproj    != NULL, "must be found");
+  assert(projs->catchall_catchproj    != NULL, "must be found");
+  if (separate_io_proj) {
+    assert(projs->catchall_memproj      != NULL, "must be found");
+    assert(projs->catchall_ioproj       != NULL, "must be found");
+  }
+}
+
+
 //=============================================================================
 uint CallJavaNode::size_of() const { return sizeof(*this); }
 uint CallJavaNode::cmp( const Node &n ) const {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/callnode.hpp
--- a/src/share/vm/opto/callnode.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/callnode.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -470,6 +470,23 @@
 #endif
 };
 
+
+// Simple container for the outgoing projections of a call.  Useful
+// for serious surgery on calls.
+class CallProjections : public StackObj {
+public:
+  Node* fallthrough_proj;
+  Node* fallthrough_catchproj;
+  Node* fallthrough_memproj;
+  Node* fallthrough_ioproj;
+  Node* catchall_catchproj;
+  Node* catchall_memproj;
+  Node* catchall_ioproj;
+  Node* resproj;
+  Node* exobj;
+};
+
+
 //------------------------------CallNode---------------------------------------
 // Call nodes now subsume the function of debug nodes at callsites, so they
 // contain the functionality of a full scope chain of debug nodes.
@@ -521,6 +538,11 @@
   // or returns NULL if there is no one.
   Node *result_cast();
 
+  // Collect all the interesting edges from a call for use in
+  // replacing the call by something else.  Used by macro expansion
+  // and the late inlining support.
+  void extract_projections(CallProjections* projs, bool separate_io_proj);
+
   virtual uint match_edge(uint idx) const;
 
 #ifndef PRODUCT
@@ -529,6 +551,7 @@
 #endif
 };
 
+
 //------------------------------CallJavaNode-----------------------------------
 // Make a static or dynamic subroutine call node using Java calling
 // convention.  (The "Java" calling convention is the compiler's calling
@@ -539,12 +562,15 @@
   virtual uint size_of() const; // Size is bigger
 
   bool    _optimized_virtual;
+  bool    _method_handle_invoke;
   ciMethod* _method;            // Method being direct called
 public:
   const int       _bci;         // Byte Code Index of call byte code
   CallJavaNode(const TypeFunc* tf , address addr, ciMethod* method, int bci)
     : CallNode(tf, addr, TypePtr::BOTTOM),
-      _method(method), _bci(bci), _optimized_virtual(false)
+      _method(method), _bci(bci),
+      _optimized_virtual(false),
+      _method_handle_invoke(false)
   {
     init_class_id(Class_CallJava);
   }
@@ -554,6 +580,8 @@
   void  set_method(ciMethod *m)           { _method = m; }
   void  set_optimized_virtual(bool f)     { _optimized_virtual = f; }
   bool  is_optimized_virtual() const      { return _optimized_virtual; }
+  void  set_method_handle_invoke(bool f)  { _method_handle_invoke = f; }
+  bool  is_method_handle_invoke() const   { return _method_handle_invoke; }
 
 #ifndef PRODUCT
   virtual void  dump_spec(outputStream *st) const;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/cfgnode.cpp
--- a/src/share/vm/opto/cfgnode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/cfgnode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1531,6 +1531,8 @@
     return NULL;                // No change
 
   Node *top = phase->C->top();
+  bool new_phi = (outcnt() == 0); // transforming new Phi
+  assert(!can_reshape || !new_phi, "for igvn new phi should be hooked");
 
   // The are 2 situations when only one valid phi's input is left
   // (in addition to Region input).
@@ -1550,6 +1552,12 @@
     }
   }
 
+  if (can_reshape && outcnt() == 0) {
+    // set_req() above may kill outputs if Phi is referenced
+    // only by itself on the dead (top) control path.
+    return top;
+  }
+
   Node* uin = unique_input(phase);
   if (uin == top) {             // Simplest case: no alive inputs.
     if (can_reshape)            // IGVN transformation
@@ -1684,8 +1692,7 @@
             // Equivalent code is in MemNode::Ideal_common
             Node *m  = phase->transform(n);
             if (outcnt() == 0) {  // Above transform() may kill us!
-              progress = phase->C->top();
-              break;
+              return top;
             }
             // If transformed to a MergeMem, get the desired slice
             // Otherwise the returned node represents memory for every slice
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/chaitin.cpp
--- a/src/share/vm/opto/chaitin.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/chaitin.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -985,6 +985,8 @@
     uint lo_score = _hi_degree;
     double score = lrgs(lo_score).score();
     double area = lrgs(lo_score)._area;
+    double cost = lrgs(lo_score)._cost;
+    bool bound = lrgs(lo_score)._is_bound;
 
     // Find cheapest guy
     debug_only( int lo_no_simplify=0; );
@@ -1002,17 +1004,27 @@
       debug_only( if( lrgs(i)._was_lo ) lo_no_simplify=i; );
       double iscore = lrgs(i).score();
       double iarea = lrgs(i)._area;
+      double icost = lrgs(i)._cost;
+      bool ibound = lrgs(i)._is_bound;
 
       // Compare cost/area of i vs cost/area of lo_score.  Smaller cost/area
       // wins.  Ties happen because all live ranges in question have spilled
       // a few times before and the spill-score adds a huge number which
       // washes out the low order bits.  We are choosing the lesser of 2
       // evils; in this case pick largest area to spill.
+      // Ties also happen when live ranges are defined and used only inside
+      // one block. In which case their area is 0 and score set to max.
+      // In such case choose bound live range over unbound to free registers
+      // or with smaller cost to spill.
       if( iscore < score ||
-          (iscore == score && iarea > area && lrgs(lo_score)._was_spilled2) ) {
+          (iscore == score && iarea > area && lrgs(lo_score)._was_spilled2) ||
+          (iscore == score && iarea == area &&
+           ( (ibound && !bound) || ibound == bound && (icost < cost) )) ) {
         lo_score = i;
         score = iscore;
         area = iarea;
+        cost = icost;
+        bound = ibound;
       }
     }
     LRG *lo_lrg = &lrgs(lo_score);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/chaitin.hpp
--- a/src/share/vm/opto/chaitin.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/chaitin.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -458,6 +458,16 @@
   // Post-Allocation peephole copy removal
   void post_allocate_copy_removal();
   Node *skip_copies( Node *c );
+  // Replace the old node with the current live version of that value
+  // and yank the old value if it's dead.
+  int replace_and_yank_if_dead( Node *old, OptoReg::Name nreg,
+                                Block *current_block, Node_List& value, Node_List& regnd ) {
+    Node* v = regnd[nreg];
+    assert(v->outcnt() != 0, "no dead values");
+    old->replace_by(v);
+    return yank_if_dead(old, current_block, &value, &regnd);
+  }
+
   int yank_if_dead( Node *old, Block *current_block, Node_List *value, Node_List *regnd );
   int elide_copy( Node *n, int k, Block *current_block, Node_List &value, Node_List &regnd, bool can_change_regs );
   int use_prior_register( Node *copy, uint idx, Node *def, Block *current_block, Node_List &value, Node_List &regnd );
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/compile.cpp
--- a/src/share/vm/opto/compile.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/compile.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -224,6 +224,32 @@
 }
 
 
+void Compile::gvn_replace_by(Node* n, Node* nn) {
+  for (DUIterator_Last imin, i = n->last_outs(imin); i >= imin; ) {
+    Node* use = n->last_out(i);
+    bool is_in_table = initial_gvn()->hash_delete(use);
+    uint uses_found = 0;
+    for (uint j = 0; j < use->len(); j++) {
+      if (use->in(j) == n) {
+        if (j < use->req())
+          use->set_req(j, nn);
+        else
+          use->set_prec(j, nn);
+        uses_found++;
+      }
+    }
+    if (is_in_table) {
+      // reinsert into table
+      initial_gvn()->hash_find_insert(use);
+    }
+    record_for_igvn(use);
+    i -= uses_found;    // we deleted 1 or more copies of this edge
+  }
+}
+
+
+
+
 // Identify all nodes that are reachable from below, useful.
 // Use breadth-first pass that records state in a Unique_Node_List,
 // recursive traversal is slower.
@@ -439,6 +465,7 @@
                   _code_buffer("Compile::Fill_buffer"),
                   _orig_pc_slot(0),
                   _orig_pc_slot_offset_in_bytes(0),
+                  _has_method_handle_invokes(false),
                   _node_bundling_limit(0),
                   _node_bundling_base(NULL),
                   _java_calls(0),
@@ -554,6 +581,28 @@
       rethrow_exceptions(kit.transfer_exceptions_into_jvms());
     }
 
+    if (!failing() && has_stringbuilder()) {
+      {
+        // remove useless nodes to make the usage analysis simpler
+        ResourceMark rm;
+        PhaseRemoveUseless pru(initial_gvn(), &for_igvn);
+      }
+
+      {
+        ResourceMark rm;
+        print_method("Before StringOpts", 3);
+        PhaseStringOpts pso(initial_gvn(), &for_igvn);
+        print_method("After StringOpts", 3);
+      }
+
+      // now inline anything that we skipped the first time around
+      while (_late_inlines.length() > 0) {
+        CallGenerator* cg = _late_inlines.pop();
+        cg->do_late_inline();
+      }
+    }
+    assert(_late_inlines.length() == 0, "should have been processed");
+
     print_method("Before RemoveUseless", 3);
 
     // Remove clutter produced by parsing.
@@ -711,6 +760,7 @@
     _do_escape_analysis(false),
     _failure_reason(NULL),
     _code_buffer("Compile::Fill_buffer"),
+    _has_method_handle_invokes(false),
     _node_bundling_limit(0),
     _node_bundling_base(NULL),
     _java_calls(0),
@@ -820,6 +870,7 @@
   _fixed_slots = 0;
   set_has_split_ifs(false);
   set_has_loops(has_method() && method()->has_loops()); // first approximation
+  set_has_stringbuilder(false);
   _deopt_happens = true;  // start out assuming the worst
   _trap_can_recompile = false;  // no traps emitted yet
   _major_progress = true; // start out assuming good things will happen
@@ -883,6 +934,7 @@
 
   _intrinsics = NULL;
   _macro_nodes = new GrowableArray<Node*>(comp_arena(), 8,  0, NULL);
+  _predicate_opaqs = new GrowableArray<Node*>(comp_arena(), 8,  0, NULL);
   register_library_intrinsics();
 }
 
@@ -1504,6 +1556,19 @@
   }
 }
 
+//---------------------cleanup_loop_predicates-----------------------
+// Remove the opaque nodes that protect the predicates so that all unused
+// checks and uncommon_traps will be eliminated from the ideal graph
+void Compile::cleanup_loop_predicates(PhaseIterGVN &igvn) {
+  if (predicate_count()==0) return;
+  for (int i = predicate_count(); i > 0; i--) {
+    Node * n = predicate_opaque1_node(i-1);
+    assert(n->Opcode() == Op_Opaque1, "must be");
+    igvn.replace_node(n, n->in(1));
+  }
+  assert(predicate_count()==0, "should be clean!");
+  igvn.optimize();
+}
 
 //------------------------------Optimize---------------------------------------
 // Given a graph, optimize it.
@@ -1545,7 +1610,7 @@
   if((loop_opts_cnt > 0) && (has_loops() || has_split_ifs())) {
     {
       TracePhase t2("idealLoop", &_t_idealLoop, true);
-      PhaseIdealLoop ideal_loop( igvn, NULL, true );
+      PhaseIdealLoop ideal_loop( igvn, true, UseLoopPredicate);
       loop_opts_cnt--;
       if (major_progress()) print_method("PhaseIdealLoop 1", 2);
       if (failing())  return;
@@ -1553,7 +1618,7 @@
     // Loop opts pass if partial peeling occurred in previous pass
     if(PartialPeelLoop && major_progress() && (loop_opts_cnt > 0)) {
       TracePhase t3("idealLoop", &_t_idealLoop, true);
-      PhaseIdealLoop ideal_loop( igvn, NULL, false );
+      PhaseIdealLoop ideal_loop( igvn, false, UseLoopPredicate);
       loop_opts_cnt--;
       if (major_progress()) print_method("PhaseIdealLoop 2", 2);
       if (failing())  return;
@@ -1561,10 +1626,15 @@
     // Loop opts pass for loop-unrolling before CCP
     if(major_progress() && (loop_opts_cnt > 0)) {
       TracePhase t4("idealLoop", &_t_idealLoop, true);
-      PhaseIdealLoop ideal_loop( igvn, NULL, false );
+      PhaseIdealLoop ideal_loop( igvn, false, UseLoopPredicate);
       loop_opts_cnt--;
       if (major_progress()) print_method("PhaseIdealLoop 3", 2);
     }
+    if (!failing()) {
+      // Verify that last round of loop opts produced a valid graph
+      NOT_PRODUCT( TracePhase t2("idealLoopVerify", &_t_idealLoopVerify, TimeCompiler); )
+      PhaseIdealLoop::verify(igvn);
+    }
   }
   if (failing())  return;
 
@@ -1594,15 +1664,31 @@
   // peeling, unrolling, etc.
   if(loop_opts_cnt > 0) {
     debug_only( int cnt = 0; );
+    bool loop_predication = UseLoopPredicate;
     while(major_progress() && (loop_opts_cnt > 0)) {
       TracePhase t2("idealLoop", &_t_idealLoop, true);
       assert( cnt++ < 40, "infinite cycle in loop optimization" );
-      PhaseIdealLoop ideal_loop( igvn, NULL, true );
+      PhaseIdealLoop ideal_loop( igvn, true, loop_predication);
       loop_opts_cnt--;
       if (major_progress()) print_method("PhaseIdealLoop iterations", 2);
       if (failing())  return;
+      // Perform loop predication optimization during first iteration after CCP.
+      // After that switch it off and cleanup unused loop predicates.
+      if (loop_predication) {
+        loop_predication = false;
+        cleanup_loop_predicates(igvn);
+        if (failing())  return;
+      }
     }
   }
+
+  {
+    // Verify that all previous optimizations produced a valid graph
+    // at least to this point, even if no loop optimizations were done.
+    NOT_PRODUCT( TracePhase t2("idealLoopVerify", &_t_idealLoopVerify, TimeCompiler); )
+    PhaseIdealLoop::verify(igvn);
+  }
+
   {
     NOT_PRODUCT( TracePhase t2("macroExpand", &_t_macroExpand, TimeCompiler); )
     PhaseMacroExpand  mex(igvn);
@@ -1790,6 +1876,7 @@
           !n->is_Phi() &&       // a few noisely useless nodes
           !n->is_Proj() &&
           !n->is_MachTemp() &&
+          !n->is_SafePointScalarObject() &&
           !n->is_Catch() &&     // Would be nice to print exception table targets
           !n->is_MergeMem() &&  // Not very interesting
           !n->is_top() &&       // Debug info table constants
@@ -2227,6 +2314,30 @@
     break;
   }
 
+  case Op_Proj: {
+    if (OptimizeStringConcat) {
+      ProjNode* p = n->as_Proj();
+      if (p->_is_io_use) {
+        // Separate projections were used for the exception path which
+        // are normally removed by a late inline.  If it wasn't inlined
+        // then they will hang around and should just be replaced with
+        // the original one.
+        Node* proj = NULL;
+        // Replace with just one
+        for (SimpleDUIterator i(p->in(0)); i.has_next(); i.next()) {
+          Node *use = i.get();
+          if (use->is_Proj() && p != use && use->as_Proj()->_con == p->_con) {
+            proj = use;
+            break;
+          }
+        }
+        assert(p != NULL, "must be found");
+        p->subsume_by(proj);
+      }
+    }
+    break;
+  }
+
   case Op_Phi:
     if (n->as_Phi()->bottom_type()->isa_narrowoop()) {
       // The EncodeP optimization may create Phi with the same edges
@@ -2520,7 +2631,7 @@
 
   // If original bytecodes contained a mixture of floats and doubles
   // check if the optimizer has made it homogenous, item (3).
-  if( Use24BitFPMode && Use24BitFP &&
+  if( Use24BitFPMode && Use24BitFP && UseSSE == 0 &&
       frc.get_float_count() > 32 &&
       frc.get_double_count() == 0 &&
       (10 * frc.get_call_count() < frc.get_float_count()) ) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/compile.hpp
--- a/src/share/vm/opto/compile.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/compile.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -38,6 +38,7 @@
 class OptoReg;
 class PhaseCFG;
 class PhaseGVN;
+class PhaseIterGVN;
 class PhaseRegAlloc;
 class PhaseCCP;
 class PhaseCCP_DCE;
@@ -149,6 +150,7 @@
   bool                  _has_loops;             // True if the method _may_ have some loops
   bool                  _has_split_ifs;         // True if the method _may_ have some split-if
   bool                  _has_unsafe_access;     // True if the method _may_ produce faults in unsafe loads or stores.
+  bool                  _has_stringbuilder;     // True StringBuffers or StringBuilders are allocated
   uint                  _trap_hist[trapHistLength];  // Cumulative traps
   bool                  _trap_can_recompile;    // Have we emitted a recompiling trap?
   uint                  _decompile_count;       // Cumulative decompilation counts.
@@ -164,6 +166,9 @@
   bool                  _parsed_irreducible_loop; // True if ciTypeFlow detected irreducible loops during parsing
 #endif
 
+  // JSR 292
+  bool                  _has_method_handle_invokes; // True if this method has MethodHandle invokes.
+
   // Compilation environment.
   Arena                 _comp_arena;            // Arena with lifetime equivalent to Compile
   ciEnv*                _env;                   // CI interface
@@ -171,6 +176,7 @@
   const char*           _failure_reason;        // for record_failure/failing pattern
   GrowableArray<CallGenerator*>* _intrinsics;   // List of intrinsics.
   GrowableArray<Node*>* _macro_nodes;           // List of nodes which need to be expanded before matching.
+  GrowableArray<Node*>* _predicate_opaqs;       // List of Opaque1 nodes for the loop predicates.
   ConnectionGraph*      _congraph;
 #ifndef PRODUCT
   IdealGraphPrinter*    _printer;
@@ -219,6 +225,9 @@
   Unique_Node_List*     _for_igvn;              // Initial work-list for next round of Iterative GVN
   WarmCallInfo*         _warm_calls;            // Sorted work-list for heat-based inlining.
 
+  GrowableArray<CallGenerator*> _late_inlines;  // List of CallGenerators to be revisited after
+                                                // main parsing has finished.
+
   // Matching, CFG layout, allocation, code generation
   PhaseCFG*             _cfg;                   // Results of CFG finding
   bool                  _select_24_bit_instr;   // We selected an instruction with a 24-bit result
@@ -298,6 +307,8 @@
   void          set_has_split_ifs(bool z)       { _has_split_ifs = z; }
   bool              has_unsafe_access() const   { return _has_unsafe_access; }
   void          set_has_unsafe_access(bool z)   { _has_unsafe_access = z; }
+  bool              has_stringbuilder() const   { return _has_stringbuilder; }
+  void          set_has_stringbuilder(bool z)   { _has_stringbuilder = z; }
   void          set_trap_count(uint r, uint c)  { assert(r < trapHistLength, "oob");        _trap_hist[r] = c; }
   uint              trap_count(uint r) const    { assert(r < trapHistLength, "oob"); return _trap_hist[r]; }
   bool              trap_can_recompile() const  { return _trap_can_recompile; }
@@ -328,6 +339,10 @@
   void          set_parsed_irreducible_loop(bool z) { _parsed_irreducible_loop = z; }
 #endif
 
+  // JSR 292
+  bool              has_method_handle_invokes() const { return _has_method_handle_invokes;     }
+  void          set_has_method_handle_invokes(bool z) {        _has_method_handle_invokes = z; }
+
   void begin_method() {
 #ifndef PRODUCT
     if (_printer) _printer->begin_method(this);
@@ -345,7 +360,9 @@
   }
 
   int           macro_count()                   { return _macro_nodes->length(); }
+  int           predicate_count()               { return _predicate_opaqs->length();}
   Node*         macro_node(int idx)             { return _macro_nodes->at(idx); }
+  Node*         predicate_opaque1_node(int idx) { return _predicate_opaqs->at(idx);}
   ConnectionGraph* congraph()                   { return _congraph;}
   void add_macro_node(Node * n) {
     //assert(n->is_macro(), "must be a macro node");
@@ -357,7 +374,19 @@
     // that the node is in the array before attempting to remove it
     if (_macro_nodes->contains(n))
       _macro_nodes->remove(n);
+    // remove from _predicate_opaqs list also if it is there
+    if (predicate_count() > 0 && _predicate_opaqs->contains(n)){
+      _predicate_opaqs->remove(n);
+    }
   }
+  void add_predicate_opaq(Node * n) {
+    assert(!_predicate_opaqs->contains(n), " duplicate entry in predicate opaque1");
+    assert(_macro_nodes->contains(n), "should have already been in macro list");
+    _predicate_opaqs->append(n);
+  }
+  // remove the opaque nodes that protect the predicates so that the unused checks and
+  // uncommon traps will be eliminated from the graph.
+  void cleanup_loop_predicates(PhaseIterGVN &igvn);
 
   // Compilation environment.
   Arena*            comp_arena()                { return &_comp_arena; }
@@ -475,6 +504,7 @@
   // Decide how to build a call.
   // The profile factor is a discount to apply to this site's interp. profile.
   CallGenerator*    call_generator(ciMethod* call_method, int vtable_index, bool call_is_virtual, JVMState* jvms, bool allow_inline, float profile_factor);
+  bool should_delay_inlining(ciMethod* call_method, JVMState* jvms);
 
   // Report if there were too many traps at a current method and bci.
   // Report if a trap was recorded, and/or PerMethodTrapLimit was exceeded.
@@ -495,6 +525,11 @@
   void          set_initial_gvn(PhaseGVN *gvn)           { _initial_gvn = gvn; }
   void          set_for_igvn(Unique_Node_List *for_igvn) { _for_igvn = for_igvn; }
 
+  // Replace n by nn using initial_gvn, calling hash_delete and
+  // record_for_igvn as needed.
+  void gvn_replace_by(Node* n, Node* nn);
+
+
   void              identify_useful_nodes(Unique_Node_List &useful);
   void              remove_useless_nodes  (Unique_Node_List &useful);
 
@@ -502,6 +537,9 @@
   void          set_warm_calls(WarmCallInfo* l) { _warm_calls = l; }
   WarmCallInfo* pop_warm_call();
 
+  // Record this CallGenerator for inlining at the end of parsing.
+  void              add_late_inline(CallGenerator* cg) { _late_inlines.push(cg); }
+
   // Matching, CFG layout, allocation, code generation
   PhaseCFG*         cfg()                       { return _cfg; }
   bool              select_24_bit_instr() const { return _select_24_bit_instr; }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/connode.cpp
--- a/src/share/vm/opto/connode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/connode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1085,6 +1085,9 @@
   switch (op) {
   case Op_SubX:
     x = in(1)->in(1);
+    // Avoid ideal transformations ping-pong between this and AddP for raw pointers.
+    if (phase->find_intptr_t_con(x, -1) == 0)
+      break;
     y = in(1)->in(2);
     if (fits_in_int(phase->type(y), true)) {
       return addP_of_X2P(phase, x, y, true);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/divnode.cpp
--- a/src/share/vm/opto/divnode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/divnode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -114,7 +114,8 @@
       if( andconi_t && andconi_t->is_con() ) {
         jint andconi = andconi_t->get_con();
         if( andconi < 0 && is_power_of_2(-andconi) && (-andconi) >= d ) {
-          dividend = dividend->in(1);
+          if( (-andconi) == d ) // Remove AND if it clears bits which will be shifted
+            dividend = dividend->in(1);
           needs_rounding = false;
         }
       }
@@ -356,7 +357,8 @@
       if( andconl_t && andconl_t->is_con() ) {
         jlong andconl = andconl_t->get_con();
         if( andconl < 0 && is_power_of_2_long(-andconl) && (-andconl) >= d ) {
-          dividend = dividend->in(1);
+          if( (-andconl) == d ) // Remove AND if it clears bits which will be shifted
+            dividend = dividend->in(1);
           needs_rounding = false;
         }
       }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/doCall.cpp
--- a/src/share/vm/opto/doCall.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/doCall.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
@@ -43,7 +43,9 @@
 }
 #endif
 
-CallGenerator* Compile::call_generator(ciMethod* call_method, int vtable_index, bool call_is_virtual, JVMState* jvms, bool allow_inline, float prof_factor) {
+CallGenerator* Compile::call_generator(ciMethod* call_method, int vtable_index, bool call_is_virtual,
+                                       JVMState* jvms, bool allow_inline,
+                                       float prof_factor) {
   CallGenerator* cg;
 
   // Dtrace currently doesn't work unless all calls are vanilla
@@ -68,7 +70,7 @@
   CompileLog* log = this->log();
   if (log != NULL) {
     int rid = (receiver_count >= 0)? log->identify(profile.receiver(0)): -1;
-    int r2id = (profile.morphism() == 2)? log->identify(profile.receiver(1)):-1;
+    int r2id = (rid != -1 && profile.has_receiver(1))? log->identify(profile.receiver(1)):-1;
     log->begin_elem("call method='%d' count='%d' prof_factor='%g'",
                     log->identify(call_method), site_count, prof_factor);
     if (call_is_virtual)  log->print(" virtual='1'");
@@ -116,7 +118,7 @@
         // TO DO:  When UseOldInlining is removed, copy the ILT code elsewhere.
         float site_invoke_ratio = prof_factor;
         // Note:  ilt is for the root of this parse, not the present call site.
-        ilt = new InlineTree(this, jvms->method(), jvms->caller(), site_invoke_ratio);
+        ilt = new InlineTree(this, jvms->method(), jvms->caller(), site_invoke_ratio, 0);
       }
       WarmCallInfo scratch_ci;
       if (!UseOldInlining)
@@ -128,6 +130,12 @@
 
       if (allow_inline) {
         CallGenerator* cg = CallGenerator::for_inline(call_method, expected_uses);
+        if (require_inline && cg != NULL && should_delay_inlining(call_method, jvms)) {
+          // Delay the inlining of this method to give us the
+          // opportunity to perform some high level optimizations
+          // first.
+          return CallGenerator::for_late_inline(call_method, cg);
+        }
         if (cg == NULL) {
           // Fall through.
         } else if (require_inline || !InlineWarmCalls) {
@@ -174,26 +182,16 @@
             }
           }
           CallGenerator* miss_cg;
+          Deoptimization::DeoptReason reason = (profile.morphism() == 2) ?
+                                    Deoptimization::Reason_bimorphic :
+                                    Deoptimization::Reason_class_check;
           if (( profile.morphism() == 1 ||
                (profile.morphism() == 2 && next_hit_cg != NULL) ) &&
-
-              !too_many_traps(Deoptimization::Reason_class_check)
-
-              // Check only total number of traps per method to allow
-              // the transition from monomorphic to bimorphic case between
-              // compilations without falling into virtual call.
-              // A monomorphic case may have the class_check trap flag is set
-              // due to the time gap between the uncommon trap processing
-              // when flags are set in MDO and the call site bytecode execution
-              // in Interpreter when MDO counters are updated.
-              // There was also class_check trap in monomorphic case due to
-              // the bug 6225440.
-
+              !too_many_traps(jvms->method(), jvms->bci(), reason)
              ) {
             // Generate uncommon trap for class check failure path
             // in case of monomorphic or bimorphic virtual call site.
-            miss_cg = CallGenerator::for_uncommon_trap(call_method,
-                        Deoptimization::Reason_class_check,
+            miss_cg = CallGenerator::for_uncommon_trap(call_method, reason,
                         Deoptimization::Action_maybe_recompile);
           } else {
             // Generate virtual call for class check failure path
@@ -218,6 +216,57 @@
     }
   }
 
+  // Do MethodHandle calls.
+  if (call_method->is_method_handle_invoke()) {
+    if (jvms->method()->java_code_at_bci(jvms->bci()) != Bytecodes::_invokedynamic) {
+      GraphKit kit(jvms);
+      Node* n = kit.argument(0);
+
+      if (n->Opcode() == Op_ConP) {
+        const TypeOopPtr* oop_ptr = n->bottom_type()->is_oopptr();
+        ciObject* const_oop = oop_ptr->const_oop();
+        ciMethodHandle* method_handle = const_oop->as_method_handle();
+
+        // Set the actually called method to have access to the class
+        // and signature in the MethodHandleCompiler.
+        method_handle->set_callee(call_method);
+
+        // Get an adapter for the MethodHandle.
+        ciMethod* target_method = method_handle->get_method_handle_adapter();
+
+        CallGenerator* hit_cg = this->call_generator(target_method, vtable_index, false, jvms, true, prof_factor);
+        if (hit_cg != NULL && hit_cg->is_inline())
+          return hit_cg;
+      }
+
+      return CallGenerator::for_direct_call(call_method);
+    }
+    else {
+      // Get the MethodHandle from the CallSite.
+      ciMethod* caller_method = jvms->method();
+      ciBytecodeStream str(caller_method);
+      str.force_bci(jvms->bci());  // Set the stream to the invokedynamic bci.
+      ciCallSite*     call_site     = str.get_call_site();
+      ciMethodHandle* method_handle = call_site->get_target();
+
+      // Set the actually called method to have access to the class
+      // and signature in the MethodHandleCompiler.
+      method_handle->set_callee(call_method);
+
+      // Get an adapter for the MethodHandle.
+      ciMethod* target_method = method_handle->get_invokedynamic_adapter();
+
+      CallGenerator* hit_cg = this->call_generator(target_method, vtable_index, false, jvms, true, prof_factor);
+      if (hit_cg != NULL && hit_cg->is_inline()) {
+        CallGenerator* miss_cg = CallGenerator::for_dynamic_call(call_method);
+        return CallGenerator::for_predicted_dynamic_call(method_handle, miss_cg, hit_cg, prof_factor);
+      }
+
+      // If something failed, generate a normal dynamic call.
+      return CallGenerator::for_dynamic_call(call_method);
+    }
+  }
+
   // There was no special inlining tactic, or it bailed out.
   // Use a more generic tactic, like a simple call.
   if (call_is_virtual) {
@@ -225,10 +274,63 @@
   } else {
     // Class Hierarchy Analysis or Type Profile reveals a unique target,
     // or it is a static or special call.
-    return CallGenerator::for_direct_call(call_method);
+    return CallGenerator::for_direct_call(call_method, should_delay_inlining(call_method, jvms));
   }
 }
 
+// Return true for methods that shouldn't be inlined early so that
+// they are easier to analyze and optimize as intrinsics.
+bool Compile::should_delay_inlining(ciMethod* call_method, JVMState* jvms) {
+  if (has_stringbuilder()) {
+
+    if ((call_method->holder() == C->env()->StringBuilder_klass() ||
+         call_method->holder() == C->env()->StringBuffer_klass()) &&
+        (jvms->method()->holder() == C->env()->StringBuilder_klass() ||
+         jvms->method()->holder() == C->env()->StringBuffer_klass())) {
+      // Delay SB calls only when called from non-SB code
+      return false;
+    }
+
+    switch (call_method->intrinsic_id()) {
+      case vmIntrinsics::_StringBuilder_void:
+      case vmIntrinsics::_StringBuilder_int:
+      case vmIntrinsics::_StringBuilder_String:
+      case vmIntrinsics::_StringBuilder_append_char:
+      case vmIntrinsics::_StringBuilder_append_int:
+      case vmIntrinsics::_StringBuilder_append_String:
+      case vmIntrinsics::_StringBuilder_toString:
+      case vmIntrinsics::_StringBuffer_void:
+      case vmIntrinsics::_StringBuffer_int:
+      case vmIntrinsics::_StringBuffer_String:
+      case vmIntrinsics::_StringBuffer_append_char:
+      case vmIntrinsics::_StringBuffer_append_int:
+      case vmIntrinsics::_StringBuffer_append_String:
+      case vmIntrinsics::_StringBuffer_toString:
+      case vmIntrinsics::_Integer_toString:
+        return true;
+
+      case vmIntrinsics::_String_String:
+        {
+          Node* receiver = jvms->map()->in(jvms->argoff() + 1);
+          if (receiver->is_Proj() && receiver->in(0)->is_CallStaticJava()) {
+            CallStaticJavaNode* csj = receiver->in(0)->as_CallStaticJava();
+            ciMethod* m = csj->method();
+            if (m != NULL &&
+                (m->intrinsic_id() == vmIntrinsics::_StringBuffer_toString ||
+                 m->intrinsic_id() == vmIntrinsics::_StringBuilder_toString))
+              // Delay String.<init>(new SB())
+              return true;
+          }
+          return false;
+        }
+
+      default:
+        return false;
+    }
+  }
+  return false;
+}
+
 
 // uncommon-trap call-sites where callee is unloaded, uninitialized or will not link
 bool Parse::can_not_compile_call_site(ciMethod *dest_method, ciInstanceKlass* klass) {
@@ -240,7 +342,7 @@
   // Interface classes can be loaded & linked and never get around to
   // being initialized.  Uncommon-trap for not-initialized static or
   // v-calls.  Let interface calls happen.
-  ciInstanceKlass* holder_klass  = dest_method->holder();
+  ciInstanceKlass* holder_klass = dest_method->holder();
   if (!holder_klass->is_initialized() &&
       !holder_klass->is_interface()) {
     uncommon_trap(Deoptimization::Reason_uninitialized,
@@ -248,14 +350,6 @@
                   holder_klass);
     return true;
   }
-  if (dest_method->is_method_handle_invoke()
-      && holder_klass->name() == ciSymbol::java_dyn_Dynamic()) {
-    // FIXME: NYI
-    uncommon_trap(Deoptimization::Reason_unhandled,
-                  Deoptimization::Action_none,
-                  holder_klass);
-    return true;
-  }
 
   assert(dest_method->will_link(method()->holder(), klass, bc()), "dest_method: typeflow responsibility");
   return false;
@@ -274,6 +368,7 @@
   bool is_virtual = bc() == Bytecodes::_invokevirtual;
   bool is_virtual_or_interface = is_virtual || bc() == Bytecodes::_invokeinterface;
   bool has_receiver = is_virtual_or_interface || bc() == Bytecodes::_invokespecial;
+  bool is_invokedynamic = bc() == Bytecodes::_invokedynamic;
 
   // Find target being called
   bool             will_link;
@@ -282,7 +377,8 @@
   ciKlass* holder = iter().get_declared_method_holder();
   ciInstanceKlass* klass = ciEnv::get_instance_klass_for_declared_method_holder(holder);
 
-  int   nargs    = dest_method->arg_size();
+  int nargs = dest_method->arg_size();
+  if (is_invokedynamic)  nargs -= 1;
 
   // uncommon-trap when callee is unloaded, uninitialized or will not link
   // bailout when too many arguments for register representation
@@ -296,7 +392,7 @@
     return;
   }
   assert(holder_klass->is_loaded(), "");
-  assert(dest_method->is_static() == !has_receiver, "must match bc");
+  assert((dest_method->is_static() || is_invokedynamic) == !has_receiver , "must match bc");
   // Note: this takes into account invokeinterface of methods declared in java/lang/Object,
   // which should be invokevirtuals but according to the VM spec may be invokeinterfaces
   assert(holder_klass->is_interface() || holder_klass->super() == NULL || (bc() != Bytecodes::_invokeinterface), "must match bc");
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/domgraph.cpp
--- a/src/share/vm/opto/domgraph.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/domgraph.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -396,7 +396,7 @@
 // nodes (using the is_CFG() call) and places them in a dominator tree.  Thus,
 // it needs a count of the CFG nodes for the mapping table. This is the
 // Lengauer & Tarjan O(E-alpha(E,V)) algorithm.
-void PhaseIdealLoop::Dominators( ) {
+void PhaseIdealLoop::Dominators() {
   ResourceMark rm;
   // Setup mappings from my Graph to Tarjan's stuff and back
   // Note: Tarjan uses 1-based arrays
@@ -454,7 +454,7 @@
     // flow into the main graph (and hence into ROOT) but are not reachable
     // from above.  Such code is dead, but requires a global pass to detect
     // it; this global pass was the 'build_loop_tree' pass run just prior.
-    if( whead->is_Region() ) {
+    if( !_verify_only && whead->is_Region() ) {
       for( uint i = 1; i < whead->req(); i++ ) {
         if (!has_node(whead->in(i))) {
           // Kill dead input path
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/escape.cpp
--- a/src/share/vm/opto/escape.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/escape.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -439,6 +439,11 @@
   Node *base = addp->in(AddPNode::Base)->uncast();
   if (base->is_top()) { // The AddP case #3 and #6.
     base = addp->in(AddPNode::Address)->uncast();
+    while (base->is_AddP()) {
+      // Case #6 (unsafe access) may have several chained AddP nodes.
+      assert(base->in(AddPNode::Base)->is_top(), "expected unsafe access address only");
+      base = base->in(AddPNode::Address)->uncast();
+    }
     assert(base->Opcode() == Op_ConP || base->Opcode() == Op_ThreadLocal ||
            base->Opcode() == Op_CastX2P || base->is_DecodeN() ||
            (base->is_Mem() && base->bottom_type() == TypeRawPtr::NOTNULL) ||
@@ -519,21 +524,26 @@
   // inlining) which was not eliminated during parsing since the exactness
   // of the allocation type was not propagated to the subclass type check.
   //
+  // Or the type 't' could be not related to 'base_t' at all.
+  // It could happened when CHA type is different from MDO type on a dead path
+  // (for example, from instanceof check) which is not collapsed during parsing.
+  //
   // Do nothing for such AddP node and don't process its users since
   // this code branch will go away.
   //
   if (!t->is_known_instance() &&
-      !t->klass()->equals(base_t->klass()) &&
-      t->klass()->is_subtype_of(base_t->klass())) {
+      !base_t->klass()->is_subtype_of(t->klass())) {
      return false; // bail out
   }
 
   const TypeOopPtr *tinst = base_t->add_offset(t->offset())->is_oopptr();
-  // Do NOT remove the next call: ensure an new alias index is allocated
-  // for the instance type
+  // Do NOT remove the next line: ensure a new alias index is allocated
+  // for the instance type. Note: C++ will not remove it since the call
+  // has side effect.
   int alias_idx = _compile->get_alias_index(tinst);
   igvn->set_type(addp, tinst);
   // record the allocation in the node map
+  assert(ptnode_adr(addp->_idx)->_node != NULL, "should be registered");
   set_map(addp->_idx, get_map(base->_idx));
 
   // Set addp's Base and Address to 'base'.
@@ -609,9 +619,14 @@
   const TypePtr *atype = C->get_adr_type(alias_idx);
   result = PhiNode::make(orig_phi->in(0), NULL, Type::MEMORY, atype);
   C->copy_node_notes_to(result, orig_phi);
-  set_map_phi(orig_phi->_idx, result);
   igvn->set_type(result, result->bottom_type());
   record_for_optimizer(result);
+
+  debug_only(Node* pn = ptnode_adr(orig_phi->_idx)->_node;)
+  assert(pn == NULL || pn == orig_phi, "wrong node");
+  set_map(orig_phi->_idx, result);
+  ptnode_adr(orig_phi->_idx)->_node = orig_phi;
+
   new_created = true;
   return result;
 }
@@ -702,6 +717,81 @@
 }
 
 //
+// Move memory users to their memory slices.
+//
+void ConnectionGraph::move_inst_mem(Node* n, GrowableArray<PhiNode *>  &orig_phis, PhaseGVN *igvn) {
+  Compile* C = _compile;
+
+  const TypePtr* tp = igvn->type(n->in(MemNode::Address))->isa_ptr();
+  assert(tp != NULL, "ptr type");
+  int alias_idx = C->get_alias_index(tp);
+  int general_idx = C->get_general_index(alias_idx);
+
+  // Move users first
+  for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+    Node* use = n->fast_out(i);
+    if (use->is_MergeMem()) {
+      MergeMemNode* mmem = use->as_MergeMem();
+      assert(n == mmem->memory_at(alias_idx), "should be on instance memory slice");
+      if (n != mmem->memory_at(general_idx) || alias_idx == general_idx) {
+        continue; // Nothing to do
+      }
+      // Replace previous general reference to mem node.
+      uint orig_uniq = C->unique();
+      Node* m = find_inst_mem(n, general_idx, orig_phis, igvn);
+      assert(orig_uniq == C->unique(), "no new nodes");
+      mmem->set_memory_at(general_idx, m);
+      --imax;
+      --i;
+    } else if (use->is_MemBar()) {
+      assert(!use->is_Initialize(), "initializing stores should not be moved");
+      if (use->req() > MemBarNode::Precedent &&
+          use->in(MemBarNode::Precedent) == n) {
+        // Don't move related membars.
+        record_for_optimizer(use);
+        continue;
+      }
+      tp = use->as_MemBar()->adr_type()->isa_ptr();
+      if (tp != NULL && C->get_alias_index(tp) == alias_idx ||
+          alias_idx == general_idx) {
+        continue; // Nothing to do
+      }
+      // Move to general memory slice.
+      uint orig_uniq = C->unique();
+      Node* m = find_inst_mem(n, general_idx, orig_phis, igvn);
+      assert(orig_uniq == C->unique(), "no new nodes");
+      igvn->hash_delete(use);
+      imax -= use->replace_edge(n, m);
+      igvn->hash_insert(use);
+      record_for_optimizer(use);
+      --i;
+#ifdef ASSERT
+    } else if (use->is_Mem()) {
+      if (use->Opcode() == Op_StoreCM && use->in(MemNode::OopStore) == n) {
+        // Don't move related cardmark.
+        continue;
+      }
+      // Memory nodes should have new memory input.
+      tp = igvn->type(use->in(MemNode::Address))->isa_ptr();
+      assert(tp != NULL, "ptr type");
+      int idx = C->get_alias_index(tp);
+      assert(get_map(use->_idx) != NULL || idx == alias_idx,
+             "Following memory nodes should have new memory input or be on the same memory slice");
+    } else if (use->is_Phi()) {
+      // Phi nodes should be split and moved already.
+      tp = use->as_Phi()->adr_type()->isa_ptr();
+      assert(tp != NULL, "ptr type");
+      int idx = C->get_alias_index(tp);
+      assert(idx == alias_idx, "Following Phi nodes should be on the same memory slice");
+    } else {
+      use->dump();
+      assert(false, "should not be here");
+#endif
+    }
+  }
+}
+
+//
 // Search memory chain of "mem" to find a MemNode whose address
 // is the specified alias index.
 //
@@ -766,10 +856,18 @@
                C->get_alias_index(result->as_Phi()->adr_type()) != alias_idx) {
       Node *un = result->as_Phi()->unique_input(phase);
       if (un != NULL) {
+        orig_phis.append_if_missing(result->as_Phi());
         result = un;
       } else {
         break;
       }
+    } else if (result->is_ClearArray()) {
+      if (!ClearArrayNode::step_through(&result, (uint)tinst->instance_id(), phase)) {
+        // Can not bypass initialization of the instance
+        // we are looking for.
+        break;
+      }
+      // Otherwise skip it (the call updated 'result' value).
     } else if (result->Opcode() == Op_SCMemProj) {
       assert(result->in(0)->is_LoadStore(), "sanity");
       const Type *at = phase->type(result->in(0)->in(MemNode::Address));
@@ -799,7 +897,6 @@
   return result;
 }
 
-
 //
 //  Convert the types of unescaped object to instance types where possible,
 //  propagate the new type information through the graph, and update memory
@@ -891,12 +988,13 @@
 //
 void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist) {
   GrowableArray<Node *>  memnode_worklist;
-  GrowableArray<Node *>  mergemem_worklist;
   GrowableArray<PhiNode *>  orig_phis;
+
   PhaseGVN  *igvn = _compile->initial_gvn();
   uint new_index_start = (uint) _compile->num_alias_types();
-  VectorSet visited(Thread::current()->resource_area());
-  VectorSet ptset(Thread::current()->resource_area());
+  Arena* arena = Thread::current()->resource_area();
+  VectorSet visited(arena);
+  VectorSet ptset(arena);
 
 
   //  Phase 1:  Process possible allocations from alloc_worklist.
@@ -972,6 +1070,8 @@
       //   - non-escaping
       //   - eligible to be a unique type
       //   - not determined to be ineligible by escape analysis
+      assert(ptnode_adr(alloc->_idx)->_node != NULL &&
+             ptnode_adr(n->_idx)->_node != NULL, "should be registered");
       set_map(alloc->_idx, n);
       set_map(n->_idx, alloc);
       const TypeOopPtr *t = igvn->type(n)->isa_oopptr();
@@ -1016,7 +1116,7 @@
               alloc_worklist.append_if_missing(addp2);
             }
             alloc_worklist.append_if_missing(use);
-          } else if (use->is_Initialize()) {
+          } else if (use->is_MemBar()) {
             memnode_worklist.append_if_missing(use);
           }
         }
@@ -1026,10 +1126,12 @@
       PointsTo(ptset, get_addp_base(n), igvn);
       assert(ptset.Size() == 1, "AddP address is unique");
       uint elem = ptset.getelem(); // Allocation node's index
-      if (elem == _phantom_object)
+      if (elem == _phantom_object) {
+        assert(false, "escaped allocation");
         continue; // Assume the value was set outside this method.
+      }
       Node *base = get_map(elem);  // CheckCastPP node
-      if (!split_AddP(n, base, igvn)) continue; // wrong type
+      if (!split_AddP(n, base, igvn)) continue; // wrong type from dead path
       tinst = igvn->type(base)->isa_oopptr();
     } else if (n->is_Phi() ||
                n->is_CheckCastPP() ||
@@ -1044,8 +1146,10 @@
       PointsTo(ptset, n, igvn);
       if (ptset.Size() == 1) {
         uint elem = ptset.getelem(); // Allocation node's index
-        if (elem == _phantom_object)
+        if (elem == _phantom_object) {
+          assert(false, "escaped allocation");
           continue; // Assume the value was set outside this method.
+        }
         Node *val = get_map(elem);   // CheckCastPP node
         TypeNode *tn = n->as_Type();
         tinst = igvn->type(val)->isa_oopptr();
@@ -1060,8 +1164,7 @@
           tn_t = tn_type->isa_oopptr();
         }
 
-        if (tn_t != NULL &&
-            tinst->cast_to_instance_id(TypeOopPtr::InstanceBot)->higher_equal(tn_t)) {
+        if (tn_t != NULL && tinst->klass()->is_subtype_of(tn_t->klass())) {
           if (tn_type->isa_narrowoop()) {
             tn_type = tinst->make_narrowoop();
           } else {
@@ -1073,33 +1176,25 @@
           igvn->hash_insert(tn);
           record_for_optimizer(n);
         } else {
-          continue; // wrong type
+          assert(tn_type == TypePtr::NULL_PTR ||
+                 tn_t != NULL && !tinst->klass()->is_subtype_of(tn_t->klass()),
+                 "unexpected type");
+          continue; // Skip dead path with different type
         }
       }
     } else {
+      debug_only(n->dump();)
+      assert(false, "EA: unexpected node");
       continue;
     }
-    // push users on appropriate worklist
+    // push allocation's users on appropriate worklist
     for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
       Node *use = n->fast_out(i);
       if(use->is_Mem() && use->in(MemNode::Address) == n) {
-        memnode_worklist.append_if_missing(use);
-      } else if (use->is_Initialize()) {
+        // Load/store to instance's field
         memnode_worklist.append_if_missing(use);
-      } else if (use->is_MergeMem()) {
-        mergemem_worklist.append_if_missing(use);
-      } else if (use->is_SafePoint() && tinst != NULL) {
-        // Look for MergeMem nodes for calls which reference unique allocation
-        // (through CheckCastPP nodes) even for debug info.
-        Node* m = use->in(TypeFunc::Memory);
-        uint iid = tinst->instance_id();
-        while (m->is_Proj() && m->in(0)->is_SafePoint() &&
-               m->in(0) != use && !m->in(0)->_idx != iid) {
-          m = m->in(0)->in(TypeFunc::Memory);
-        }
-        if (m->is_MergeMem()) {
-          mergemem_worklist.append_if_missing(m);
-        }
+      } else if (use->is_MemBar()) {
+        memnode_worklist.append_if_missing(use);
       } else if (use->is_AddP() && use->outcnt() > 0) { // No dead nodes
         Node* addp2 = find_second_addp(use, n);
         if (addp2 != NULL) {
@@ -1112,6 +1207,29 @@
                  use->is_DecodeN() ||
                  (use->is_ConstraintCast() && use->Opcode() == Op_CastPP)) {
         alloc_worklist.append_if_missing(use);
+#ifdef ASSERT
+      } else if (use->is_Mem()) {
+        assert(use->in(MemNode::Address) != n, "EA: missing allocation reference path");
+      } else if (use->is_MergeMem()) {
+        assert(_mergemem_worklist.contains(use->as_MergeMem()), "EA: missing MergeMem node in the worklist");
+      } else if (use->is_SafePoint()) {
+        // Look for MergeMem nodes for calls which reference unique allocation
+        // (through CheckCastPP nodes) even for debug info.
+        Node* m = use->in(TypeFunc::Memory);
+        if (m->is_MergeMem()) {
+          assert(_mergemem_worklist.contains(m->as_MergeMem()), "EA: missing MergeMem node in the worklist");
+        }
+      } else {
+        uint op = use->Opcode();
+        if (!(op == Op_CmpP || op == Op_Conv2B ||
+              op == Op_CastP2X || op == Op_StoreCM ||
+              op == Op_FastLock || op == Op_AryEq || op == Op_StrComp ||
+              op == Op_StrEquals || op == Op_StrIndexOf)) {
+          n->dump();
+          use->dump();
+          assert(false, "EA: missing allocation reference path");
+        }
+#endif
       }
     }
 
@@ -1129,19 +1247,16 @@
     Node *n = memnode_worklist.pop();
     if (visited.test_set(n->_idx))
       continue;
-    if (n->is_Phi()) {
-      assert(n->as_Phi()->adr_type() != TypePtr::BOTTOM, "narrow memory slice required");
-      // we don't need to do anything, but the users must be pushed if we haven't processed
-      // this Phi before
-    } else if (n->is_Initialize()) {
-      // we don't need to do anything, but the users of the memory projection must be pushed
-      n = n->as_Initialize()->proj_out(TypeFunc::Memory);
+    if (n->is_Phi() || n->is_ClearArray()) {
+      // we don't need to do anything, but the users must be pushed
+    } else if (n->is_MemBar()) { // Initialize, MemBar nodes
+      // we don't need to do anything, but the users must be pushed
+      n = n->as_MemBar()->proj_out(TypeFunc::Memory);
       if (n == NULL)
         continue;
     } else {
       assert(n->is_Mem(), "memory node required.");
       Node *addr = n->in(MemNode::Address);
-      assert(addr->is_AddP(), "AddP required");
       const Type *addr_t = igvn->type(addr);
       if (addr_t == Type::TOP)
         continue;
@@ -1153,6 +1268,10 @@
         return;
       }
       if (mem != n->in(MemNode::Memory)) {
+        // We delay the memory edge update since we need old one in
+        // MergeMem code below when instances memory slices are separated.
+        debug_only(Node* pn = ptnode_adr(n->_idx)->_node;)
+        assert(pn == NULL || pn == n, "wrong node");
         set_map(n->_idx, mem);
         ptnode_adr(n->_idx)->_node = n;
       }
@@ -1173,36 +1292,55 @@
     // push user on appropriate worklist
     for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
       Node *use = n->fast_out(i);
-      if (use->is_Phi()) {
+      if (use->is_Phi() || use->is_ClearArray()) {
         memnode_worklist.append_if_missing(use);
       } else if(use->is_Mem() && use->in(MemNode::Memory) == n) {
+        if (use->Opcode() == Op_StoreCM) // Ignore cardmark stores
+          continue;
         memnode_worklist.append_if_missing(use);
-      } else if (use->is_Initialize()) {
+      } else if (use->is_MemBar()) {
         memnode_worklist.append_if_missing(use);
+#ifdef ASSERT
+      } else if(use->is_Mem()) {
+        assert(use->in(MemNode::Memory) != n, "EA: missing memory path");
       } else if (use->is_MergeMem()) {
-        mergemem_worklist.append_if_missing(use);
+        assert(_mergemem_worklist.contains(use->as_MergeMem()), "EA: missing MergeMem node in the worklist");
+      } else {
+        uint op = use->Opcode();
+        if (!(op == Op_StoreCM ||
+              (op == Op_CallLeaf && use->as_CallLeaf()->_name != NULL &&
+               strcmp(use->as_CallLeaf()->_name, "g1_wb_pre") == 0) ||
+              op == Op_AryEq || op == Op_StrComp ||
+              op == Op_StrEquals || op == Op_StrIndexOf)) {
+          n->dump();
+          use->dump();
+          assert(false, "EA: missing memory path");
+        }
+#endif
       }
     }
   }
 
   //  Phase 3:  Process MergeMem nodes from mergemem_worklist.
-  //            Walk each memory moving the first node encountered of each
+  //            Walk each memory slice moving the first node encountered of each
   //            instance type to the the input corresponding to its alias index.
-  while (mergemem_worklist.length() != 0) {
-    Node *n = mergemem_worklist.pop();
-    assert(n->is_MergeMem(), "MergeMem node required.");
-    if (visited.test_set(n->_idx))
-      continue;
-    MergeMemNode *nmm = n->as_MergeMem();
+  uint length = _mergemem_worklist.length();
+  for( uint next = 0; next < length; ++next ) {
+    MergeMemNode* nmm = _mergemem_worklist.at(next);
+    assert(!visited.test_set(nmm->_idx), "should not be visited before");
     // Note: we don't want to use MergeMemStream here because we only want to
-    //  scan inputs which exist at the start, not ones we add during processing.
+    // scan inputs which exist at the start, not ones we add during processing.
+    // Note 2: MergeMem may already contains instance memory slices added
+    // during find_inst_mem() call when memory nodes were processed above.
+    igvn->hash_delete(nmm);
     uint nslices = nmm->req();
-    igvn->hash_delete(nmm);
     for (uint i = Compile::AliasIdxRaw+1; i < nslices; i++) {
       Node* mem = nmm->in(i);
       Node* cur = NULL;
       if (mem == NULL || mem->is_top())
         continue;
+      // First, update mergemem by moving memory nodes to corresponding slices
+      // if their type became more precise since this mergemem was created.
       while (mem->is_Mem()) {
         const Type *at = igvn->type(mem->in(MemNode::Address));
         if (at != Type::TOP) {
@@ -1221,7 +1359,7 @@
       }
       nmm->set_memory_at(i, (cur != NULL) ? cur : mem);
       // Find any instance of the current type if we haven't encountered
-      // a value of the instance along the chain.
+      // already a memory slice of the instance along the memory chain.
       for (uint ni = new_index_start; ni < new_index_end; ni++) {
         if((uint)_compile->get_general_index(ni) == i) {
           Node *m = (ni >= nmm->req()) ? nmm->empty_memory() : nmm->in(ni);
@@ -1237,11 +1375,11 @@
     }
     // Find the rest of instances values
     for (uint ni = new_index_start; ni < new_index_end; ni++) {
-      const TypeOopPtr *tinst = igvn->C->get_adr_type(ni)->isa_oopptr();
+      const TypeOopPtr *tinst = _compile->get_adr_type(ni)->isa_oopptr();
       Node* result = step_through_mergemem(nmm, ni, tinst);
       if (result == nmm->base_memory()) {
         // Didn't find instance memory, search through general slice recursively.
-        result = nmm->memory_at(igvn->C->get_general_index(ni));
+        result = nmm->memory_at(_compile->get_general_index(ni));
         result = find_inst_mem(result, ni, orig_phis, igvn);
         if (_compile->failing()) {
           return;
@@ -1251,41 +1389,6 @@
     }
     igvn->hash_insert(nmm);
     record_for_optimizer(nmm);
-
-    // Propagate new memory slices to following MergeMem nodes.
-    for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
-      Node *use = n->fast_out(i);
-      if (use->is_Call()) {
-        CallNode* in = use->as_Call();
-        if (in->proj_out(TypeFunc::Memory) != NULL) {
-          Node* m = in->proj_out(TypeFunc::Memory);
-          for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
-            Node* mm = m->fast_out(j);
-            if (mm->is_MergeMem()) {
-              mergemem_worklist.append_if_missing(mm);
-            }
-          }
-        }
-        if (use->is_Allocate()) {
-          use = use->as_Allocate()->initialization();
-          if (use == NULL) {
-            continue;
-          }
-        }
-      }
-      if (use->is_Initialize()) {
-        InitializeNode* in = use->as_Initialize();
-        if (in->proj_out(TypeFunc::Memory) != NULL) {
-          Node* m = in->proj_out(TypeFunc::Memory);
-          for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
-            Node* mm = m->fast_out(j);
-            if (mm->is_MergeMem()) {
-              mergemem_worklist.append_if_missing(mm);
-            }
-          }
-        }
-      }
-    }
   }
 
   //  Phase 4:  Update the inputs of non-instance memory Phis and
@@ -1314,19 +1417,48 @@
   }
 
   // Update the memory inputs of MemNodes with the value we computed
-  // in Phase 2.
+  // in Phase 2 and move stores memory users to corresponding memory slices.
+#ifdef ASSERT
+  visited.Clear();
+  Node_Stack old_mems(arena, _compile->unique() >> 2);
+#endif
   for (uint i = 0; i < nodes_size(); i++) {
     Node *nmem = get_map(i);
     if (nmem != NULL) {
       Node *n = ptnode_adr(i)->_node;
-      if (n != NULL && n->is_Mem()) {
+      assert(n != NULL, "sanity");
+      if (n->is_Mem()) {
+#ifdef ASSERT
+        Node* old_mem = n->in(MemNode::Memory);
+        if (!visited.test_set(old_mem->_idx)) {
+          old_mems.push(old_mem, old_mem->outcnt());
+        }
+#endif
+        assert(n->in(MemNode::Memory) != nmem, "sanity");
+        if (!n->is_Load()) {
+          // Move memory users of a store first.
+          move_inst_mem(n, orig_phis, igvn);
+        }
+        // Now update memory input
         igvn->hash_delete(n);
         n->set_req(MemNode::Memory, nmem);
         igvn->hash_insert(n);
         record_for_optimizer(n);
+      } else {
+        assert(n->is_Allocate() || n->is_CheckCastPP() ||
+               n->is_AddP() || n->is_Phi(), "unknown node used for set_map()");
       }
     }
   }
+#ifdef ASSERT
+  // Verify that memory was split correctly
+  while (old_mems.is_nonempty()) {
+    Node* old_mem = old_mems.node();
+    uint  old_cnt = old_mems.index();
+    old_mems.pop();
+    assert(old_cnt = old_mem->outcnt(), "old mem could be lost");
+  }
+#endif
 }
 
 bool ConnectionGraph::has_candidates(Compile *C) {
@@ -1373,8 +1505,20 @@
         ptnode_adr(n->_idx)->node_type() == PointsToNode::JavaObject) {
       has_allocations = true;
     }
-    if(n->is_AddP())
-      cg_worklist.append(n->_idx);
+    if(n->is_AddP()) {
+      // Collect address nodes which directly reference an allocation.
+      // Use them during stage 3 below to build initial connection graph
+      // field edges. Other field edges could be added after StoreP/LoadP
+      // nodes are processed during stage 4 below.
+      Node* base = get_addp_base(n);
+      if(base->is_Proj() && base->in(0)->is_Allocate()) {
+        cg_worklist.append(n->_idx);
+      }
+    } else if (n->is_MergeMem()) {
+      // Collect all MergeMem nodes to add memory slices for
+      // scalar replaceable objects in split_unique_types().
+      _mergemem_worklist.append(n->as_MergeMem());
+    }
     for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
       Node* m = n->fast_out(i);   // Get user
       worklist_init.push(m);
@@ -1415,12 +1559,13 @@
     }
   }
 
-  VectorSet ptset(Thread::current()->resource_area());
+  Arena* arena = Thread::current()->resource_area();
+  VectorSet ptset(arena);
   GrowableArray<uint>  deferred_edges;
-  VectorSet visited(Thread::current()->resource_area());
+  VectorSet visited(arena);
 
-  // 5. Remove deferred edges from the graph and collect
-  //    information needed for type splitting.
+  // 5. Remove deferred edges from the graph and adjust
+  //    escape state of nonescaping objects.
   cg_length = cg_worklist.length();
   for( uint next = 0; next < cg_length; ++next ) {
     int ni = cg_worklist.at(next);
@@ -1430,98 +1575,9 @@
       remove_deferred(ni, &deferred_edges, &visited);
       Node *n = ptn->_node;
       if (n->is_AddP()) {
-        // Search for objects which are not scalar replaceable.
-        // Mark their escape state as ArgEscape to propagate the state
-        // to referenced objects.
-        // Note: currently there are no difference in compiler optimizations
-        // for ArgEscape objects and NoEscape objects which are not
-        // scalar replaceable.
-
-        int offset = ptn->offset();
-        Node *base = get_addp_base(n);
-        ptset.Clear();
-        PointsTo(ptset, base, igvn);
-        int ptset_size = ptset.Size();
-
-        // Check if a field's initializing value is recorded and add
-        // a corresponding NULL field's value if it is not recorded.
-        // Connection Graph does not record a default initialization by NULL
-        // captured by Initialize node.
-        //
-        // Note: it will disable scalar replacement in some cases:
-        //
-        //    Point p[] = new Point[1];
-        //    p[0] = new Point(); // Will be not scalar replaced
-        //
-        // but it will save us from incorrect optimizations in next cases:
-        //
-        //    Point p[] = new Point[1];
-        //    if ( x ) p[0] = new Point(); // Will be not scalar replaced
-        //
-        // Without a control flow analysis we can't distinguish above cases.
-        //
-        if (offset != Type::OffsetBot && ptset_size == 1) {
-          uint elem = ptset.getelem(); // Allocation node's index
-          // It does not matter if it is not Allocation node since
-          // only non-escaping allocations are scalar replaced.
-          if (ptnode_adr(elem)->_node->is_Allocate() &&
-              ptnode_adr(elem)->escape_state() == PointsToNode::NoEscape) {
-            AllocateNode* alloc = ptnode_adr(elem)->_node->as_Allocate();
-            InitializeNode* ini = alloc->initialization();
-            Node* value = NULL;
-            if (ini != NULL) {
-              BasicType ft = UseCompressedOops ? T_NARROWOOP : T_OBJECT;
-              Node* store = ini->find_captured_store(offset, type2aelembytes(ft), igvn);
-              if (store != NULL && store->is_Store())
-                value = store->in(MemNode::ValueIn);
-            }
-            if (value == NULL || value != ptnode_adr(value->_idx)->_node) {
-              // A field's initializing value was not recorded. Add NULL.
-              uint null_idx = UseCompressedOops ? _noop_null : _oop_null;
-              add_pointsto_edge(ni, null_idx);
-            }
-          }
-        }
-
-        // An object is not scalar replaceable if the field which may point
-        // to it has unknown offset (unknown element of an array of objects).
-        //
-        if (offset == Type::OffsetBot) {
-          uint e_cnt = ptn->edge_count();
-          for (uint ei = 0; ei < e_cnt; ei++) {
-            uint npi = ptn->edge_target(ei);
-            set_escape_state(npi, PointsToNode::ArgEscape);
-            ptnode_adr(npi)->_scalar_replaceable = false;
-          }
-        }
-
-        // Currently an object is not scalar replaceable if a LoadStore node
-        // access its field since the field value is unknown after it.
-        //
-        bool has_LoadStore = false;
-        for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
-          Node *use = n->fast_out(i);
-          if (use->is_LoadStore()) {
-            has_LoadStore = true;
-            break;
-          }
-        }
-        // An object is not scalar replaceable if the address points
-        // to unknown field (unknown element for arrays, offset is OffsetBot).
-        //
-        // Or the address may point to more then one object. This may produce
-        // the false positive result (set scalar_replaceable to false)
-        // since the flow-insensitive escape analysis can't separate
-        // the case when stores overwrite the field's value from the case
-        // when stores happened on different control branches.
-        //
-        if (ptset_size > 1 || ptset_size != 0 &&
-            (has_LoadStore || offset == Type::OffsetBot)) {
-          for( VectorSetI j(&ptset); j.test(); ++j ) {
-            set_escape_state(j.elem, PointsToNode::ArgEscape);
-            ptnode_adr(j.elem)->_scalar_replaceable = false;
-          }
-        }
+        // Search for objects which are not scalar replaceable
+        // and adjust their escape state.
+        verify_escape_state(ni, ptset, igvn);
       }
     }
   }
@@ -1638,6 +1694,150 @@
   return has_non_escaping_obj;
 }
 
+// Search for objects which are not scalar replaceable.
+void ConnectionGraph::verify_escape_state(int nidx, VectorSet& ptset, PhaseTransform* phase) {
+  PointsToNode* ptn = ptnode_adr(nidx);
+  Node* n = ptn->_node;
+  assert(n->is_AddP(), "Should be called for AddP nodes only");
+  // Search for objects which are not scalar replaceable.
+  // Mark their escape state as ArgEscape to propagate the state
+  // to referenced objects.
+  // Note: currently there are no difference in compiler optimizations
+  // for ArgEscape objects and NoEscape objects which are not
+  // scalar replaceable.
+
+  Compile* C = _compile;
+
+  int offset = ptn->offset();
+  Node* base = get_addp_base(n);
+  ptset.Clear();
+  PointsTo(ptset, base, phase);
+  int ptset_size = ptset.Size();
+
+  // Check if a oop field's initializing value is recorded and add
+  // a corresponding NULL field's value if it is not recorded.
+  // Connection Graph does not record a default initialization by NULL
+  // captured by Initialize node.
+  //
+  // Note: it will disable scalar replacement in some cases:
+  //
+  //    Point p[] = new Point[1];
+  //    p[0] = new Point(); // Will be not scalar replaced
+  //
+  // but it will save us from incorrect optimizations in next cases:
+  //
+  //    Point p[] = new Point[1];
+  //    if ( x ) p[0] = new Point(); // Will be not scalar replaced
+  //
+  // Do a simple control flow analysis to distinguish above cases.
+  //
+  if (offset != Type::OffsetBot && ptset_size == 1) {
+    uint elem = ptset.getelem(); // Allocation node's index
+    // It does not matter if it is not Allocation node since
+    // only non-escaping allocations are scalar replaced.
+    if (ptnode_adr(elem)->_node->is_Allocate() &&
+        ptnode_adr(elem)->escape_state() == PointsToNode::NoEscape) {
+      AllocateNode* alloc = ptnode_adr(elem)->_node->as_Allocate();
+      InitializeNode* ini = alloc->initialization();
+
+      // Check only oop fields.
+      const Type* adr_type = n->as_AddP()->bottom_type();
+      BasicType basic_field_type = T_INT;
+      if (adr_type->isa_instptr()) {
+        ciField* field = C->alias_type(adr_type->isa_instptr())->field();
+        if (field != NULL) {
+          basic_field_type = field->layout_type();
+        } else {
+          // Ignore non field load (for example, klass load)
+        }
+      } else if (adr_type->isa_aryptr()) {
+        const Type* elemtype = adr_type->isa_aryptr()->elem();
+        basic_field_type = elemtype->array_element_basic_type();
+      } else {
+        // Raw pointers are used for initializing stores so skip it.
+        assert(adr_type->isa_rawptr() && base->is_Proj() &&
+               (base->in(0) == alloc),"unexpected pointer type");
+      }
+      if (basic_field_type == T_OBJECT ||
+          basic_field_type == T_NARROWOOP ||
+          basic_field_type == T_ARRAY) {
+        Node* value = NULL;
+        if (ini != NULL) {
+          BasicType ft = UseCompressedOops ? T_NARROWOOP : T_OBJECT;
+          Node* store = ini->find_captured_store(offset, type2aelembytes(ft), phase);
+          if (store != NULL && store->is_Store()) {
+            value = store->in(MemNode::ValueIn);
+          } else if (ptn->edge_count() > 0) { // Are there oop stores?
+            // Check for a store which follows allocation without branches.
+            // For example, a volatile field store is not collected
+            // by Initialize node. TODO: it would be nice to use idom() here.
+            for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+              store = n->fast_out(i);
+              if (store->is_Store() && store->in(0) != NULL) {
+                Node* ctrl = store->in(0);
+                while(!(ctrl == ini || ctrl == alloc || ctrl == NULL ||
+                        ctrl == C->root() || ctrl == C->top() || ctrl->is_Region() ||
+                        ctrl->is_IfTrue() || ctrl->is_IfFalse())) {
+                   ctrl = ctrl->in(0);
+                }
+                if (ctrl == ini || ctrl == alloc) {
+                  value = store->in(MemNode::ValueIn);
+                  break;
+                }
+              }
+            }
+          }
+        }
+        if (value == NULL || value != ptnode_adr(value->_idx)->_node) {
+          // A field's initializing value was not recorded. Add NULL.
+          uint null_idx = UseCompressedOops ? _noop_null : _oop_null;
+          add_pointsto_edge(nidx, null_idx);
+        }
+      }
+    }
+  }
+
+  // An object is not scalar replaceable if the field which may point
+  // to it has unknown offset (unknown element of an array of objects).
+  //
+  if (offset == Type::OffsetBot) {
+    uint e_cnt = ptn->edge_count();
+    for (uint ei = 0; ei < e_cnt; ei++) {
+      uint npi = ptn->edge_target(ei);
+      set_escape_state(npi, PointsToNode::ArgEscape);
+      ptnode_adr(npi)->_scalar_replaceable = false;
+    }
+  }
+
+  // Currently an object is not scalar replaceable if a LoadStore node
+  // access its field since the field value is unknown after it.
+  //
+  bool has_LoadStore = false;
+  for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+    Node *use = n->fast_out(i);
+    if (use->is_LoadStore()) {
+      has_LoadStore = true;
+      break;
+    }
+  }
+  // An object is not scalar replaceable if the address points
+  // to unknown field (unknown element for arrays, offset is OffsetBot).
+  //
+  // Or the address may point to more then one object. This may produce
+  // the false positive result (set scalar_replaceable to false)
+  // since the flow-insensitive escape analysis can't separate
+  // the case when stores overwrite the field's value from the case
+  // when stores happened on different control branches.
+  //
+  if (ptset_size > 1 || ptset_size != 0 &&
+      (has_LoadStore || offset == Type::OffsetBot)) {
+    for( VectorSetI j(&ptset); j.test(); ++j ) {
+      set_escape_state(j.elem, PointsToNode::ArgEscape);
+      ptnode_adr(j.elem)->_scalar_replaceable = false;
+    }
+  }
+}
+
 void ConnectionGraph::process_call_arguments(CallNode *call, PhaseTransform *phase) {
 
     switch (call->Opcode()) {
@@ -1649,6 +1849,7 @@
       assert(false, "should be done already");
       break;
 #endif
+    case Op_CallLeaf:
     case Op_CallLeafNoFP:
     {
       // Stub calls, objects do not escape but they are not scale replaceable.
@@ -1659,9 +1860,23 @@
         const Type* at = d->field_at(i);
         Node *arg = call->in(i)->uncast();
         const Type *aat = phase->type(arg);
-        if (!arg->is_top() && at->isa_ptr() && aat->isa_ptr()) {
+        if (!arg->is_top() && at->isa_ptr() && aat->isa_ptr() &&
+            ptnode_adr(arg->_idx)->escape_state() < PointsToNode::ArgEscape) {
+
           assert(aat == Type::TOP || aat == TypePtr::NULL_PTR ||
                  aat->isa_ptr() != NULL, "expecting an Ptr");
+#ifdef ASSERT
+          if (!(call->Opcode() == Op_CallLeafNoFP &&
+                call->as_CallLeaf()->_name != NULL &&
+                (strstr(call->as_CallLeaf()->_name, "arraycopy")  != 0) ||
+                call->as_CallLeaf()->_name != NULL &&
+                (strcmp(call->as_CallLeaf()->_name, "g1_wb_pre")  == 0 ||
+                 strcmp(call->as_CallLeaf()->_name, "g1_wb_post") == 0 ))
+          ) {
+            call->dump();
+            assert(false, "EA: unexpected CallLeaf");
+          }
+#endif
           set_escape_state(arg->_idx, PointsToNode::ArgEscape);
           if (arg->is_AddP()) {
             //
@@ -1698,9 +1913,10 @@
         for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
           const Type* at = d->field_at(i);
           int k = i - TypeFunc::Parms;
+          Node *arg = call->in(i)->uncast();
 
-          if (at->isa_oopptr() != NULL) {
-            Node *arg = call->in(i)->uncast();
+          if (at->isa_oopptr() != NULL &&
+              ptnode_adr(arg->_idx)->escape_state() < PointsToNode::GlobalEscape) {
 
             bool global_escapes = false;
             bool fields_escapes = false;
@@ -1934,20 +2150,23 @@
       record_for_optimizer(n);
       _processed.set(n->_idx);
     } else {
-      // Have to process call's arguments first.
+      // Don't mark as processed since call's arguments have to be processed.
       PointsToNode::NodeType nt = PointsToNode::UnknownType;
+      PointsToNode::EscapeState es = PointsToNode::UnknownEscape;
 
       // Check if a call returns an object.
       const TypeTuple *r = n->as_Call()->tf()->range();
-      if (n->is_CallStaticJava() && r->cnt() > TypeFunc::Parms &&
+      if (r->cnt() > TypeFunc::Parms &&
+          r->field_at(TypeFunc::Parms)->isa_ptr() &&
           n->as_Call()->proj_out(TypeFunc::Parms) != NULL) {
-        // Note:  use isa_ptr() instead of isa_oopptr() here because
-        //        the _multianewarray functions return a TypeRawPtr.
-        if (r->field_at(TypeFunc::Parms)->isa_ptr() != NULL) {
-          nt = PointsToNode::JavaObject;
+        nt = PointsToNode::JavaObject;
+        if (!n->is_CallStaticJava()) {
+          // Since the called mathod is statically unknown assume
+          // the worst case that the returned value globally escapes.
+          es = PointsToNode::GlobalEscape;
         }
       }
-      add_node(n, nt, PointsToNode::UnknownEscape, false);
+      add_node(n, nt, es, false);
     }
     return;
   }
@@ -2080,18 +2299,27 @@
     }
     case Op_Proj:
     {
-      // we are only interested in the result projection from a call
+      // we are only interested in the oop result projection from a call
       if (n->as_Proj()->_con == TypeFunc::Parms && n->in(0)->is_Call() ) {
-        add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false);
-        process_call_result(n->as_Proj(), phase);
-        if (!_processed.test(n->_idx)) {
-          // The call's result may need to be processed later if the call
-          // returns it's argument and the argument is not processed yet.
-          _delayed_worklist.push(n);
+        const TypeTuple *r = n->in(0)->as_Call()->tf()->range();
+        assert(r->cnt() > TypeFunc::Parms, "sanity");
+        if (r->field_at(TypeFunc::Parms)->isa_ptr() != NULL) {
+          add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false);
+          int ti = n->in(0)->_idx;
+          // The call may not be registered yet (since not all its inputs are registered)
+          // if this is the projection from backbranch edge of Phi.
+          if (ptnode_adr(ti)->node_type() != PointsToNode::UnknownType) {
+            process_call_result(n->as_Proj(), phase);
+          }
+          if (!_processed.test(n->_idx)) {
+            // The call's result may need to be processed later if the call
+            // returns it's argument and the argument is not processed yet.
+            _delayed_worklist.push(n);
+          }
+          break;
         }
-      } else {
-        _processed.set(n->_idx);
       }
+      _processed.set(n->_idx);
       break;
     }
     case Op_Return:
@@ -2152,6 +2380,15 @@
       }
       break;
     }
+    case Op_AryEq:
+    case Op_StrComp:
+    case Op_StrEquals:
+    case Op_StrIndexOf:
+    {
+      // char[] arrays passed to string intrinsics are not scalar replaceable.
+      add_node(n, PointsToNode::UnknownType, PointsToNode::UnknownEscape, false);
+      break;
+    }
     case Op_ThreadLocal:
     {
       add_node(n, PointsToNode::JavaObject, PointsToNode::ArgEscape, true);
@@ -2166,6 +2403,7 @@
 
 void ConnectionGraph::build_connection_graph(Node *n, PhaseTransform *phase) {
   uint n_idx = n->_idx;
+  assert(ptnode_adr(n_idx)->_node != NULL, "node should be registered");
 
   // Don't set processed bit for AddP, LoadP, StoreP since
   // they may need more then one pass to process.
@@ -2203,6 +2441,7 @@
     case Op_DecodeN:
     {
       int ti = n->in(1)->_idx;
+      assert(ptnode_adr(ti)->node_type() != PointsToNode::UnknownType, "all nodes should be registered");
       if (ptnode_adr(ti)->node_type() == PointsToNode::JavaObject) {
         add_pointsto_edge(n_idx, ti);
       } else {
@@ -2242,7 +2481,6 @@
 #endif
 
       Node* adr = n->in(MemNode::Address)->uncast();
-      const Type *adr_type = phase->type(adr);
       Node* adr_base;
       if (adr->is_AddP()) {
         adr_base = get_addp_base(adr);
@@ -2294,13 +2532,19 @@
     }
     case Op_Proj:
     {
-      // we are only interested in the result projection from a call
+      // we are only interested in the oop result projection from a call
       if (n->as_Proj()->_con == TypeFunc::Parms && n->in(0)->is_Call() ) {
-        process_call_result(n->as_Proj(), phase);
-        assert(_processed.test(n_idx), "all call results should be processed");
-      } else {
-        assert(false, "Op_Proj");
+        assert(ptnode_adr(n->in(0)->_idx)->node_type() != PointsToNode::UnknownType,
+               "all nodes should be registered");
+        const TypeTuple *r = n->in(0)->as_Call()->tf()->range();
+        assert(r->cnt() > TypeFunc::Parms, "sanity");
+        if (r->field_at(TypeFunc::Parms)->isa_ptr() != NULL) {
+          process_call_result(n->as_Proj(), phase);
+          assert(_processed.test(n_idx), "all call results should be processed");
+          break;
+        }
       }
+      assert(false, "Op_Proj");
       break;
     }
     case Op_Return:
@@ -2312,6 +2556,7 @@
       }
 #endif
       int ti = n->in(TypeFunc::Parms)->_idx;
+      assert(ptnode_adr(ti)->node_type() != PointsToNode::UnknownType, "node should be registered");
       if (ptnode_adr(ti)->node_type() == PointsToNode::JavaObject) {
         add_pointsto_edge(n_idx, ti);
       } else {
@@ -2346,14 +2591,38 @@
       }
       break;
     }
+    case Op_AryEq:
+    case Op_StrComp:
+    case Op_StrEquals:
+    case Op_StrIndexOf:
+    {
+      // char[] arrays passed to string intrinsic do not escape but
+      // they are not scalar replaceable. Adjust escape state for them.
+      // Start from in(2) edge since in(1) is memory edge.
+      for (uint i = 2; i < n->req(); i++) {
+        Node* adr = n->in(i)->uncast();
+        const Type *at = phase->type(adr);
+        if (!adr->is_top() && at->isa_ptr()) {
+          assert(at == Type::TOP || at == TypePtr::NULL_PTR ||
+                 at->isa_ptr() != NULL, "expecting an Ptr");
+          if (adr->is_AddP()) {
+            adr = get_addp_base(adr);
+          }
+          // Mark as ArgEscape everything "adr" could point to.
+          set_escape_state(adr->_idx, PointsToNode::ArgEscape);
+        }
+      }
+      _processed.set(n_idx);
+      break;
+    }
     case Op_ThreadLocal:
     {
       assert(false, "Op_ThreadLocal");
       break;
     }
     default:
-      ;
-      // nothing to do
+      // This method should be called only for EA specific nodes.
+      ShouldNotReachHere();
   }
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/escape.hpp
--- a/src/share/vm/opto/escape.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/escape.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -210,6 +210,8 @@
   Unique_Node_List  _delayed_worklist; // Nodes to be processed before
                                        // the call build_connection_graph().
 
+  GrowableArray<MergeMemNode *>  _mergemem_worklist; // List of all MergeMem nodes
+
   VectorSet                _processed; // Records which nodes have been
                                        // processed.
 
@@ -289,7 +291,7 @@
   bool split_AddP(Node *addp, Node *base,  PhaseGVN  *igvn);
   PhiNode *create_split_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *>  &orig_phi_worklist, PhaseGVN  *igvn, bool &new_created);
   PhiNode *split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *>  &orig_phi_worklist, PhaseGVN  *igvn);
-  Node *find_mem(Node *mem, int alias_idx, PhaseGVN  *igvn);
+  void  move_inst_mem(Node* n, GrowableArray<PhiNode *>  &orig_phis, PhaseGVN *igvn);
   Node *find_inst_mem(Node *mem, int alias_idx,GrowableArray<PhiNode *>  &orig_phi_worklist,  PhaseGVN  *igvn);
 
   // Propagate unique types created for unescaped allocated objects
@@ -298,7 +300,6 @@
 
   // manage entries in _node_map
   void  set_map(int idx, Node *n)        { _node_map.map(idx, n); }
-  void  set_map_phi(int idx, PhiNode *p) { _node_map.map(idx, (Node *) p); }
   Node *get_map(int idx)                 { return _node_map[idx]; }
   PhiNode *get_map_phi(int idx) {
     Node *phi = _node_map[idx];
@@ -315,6 +316,9 @@
   // Set the escape state of a node
   void set_escape_state(uint ni, PointsToNode::EscapeState es);
 
+  // Search for objects which are not scalar replaceable.
+  void verify_escape_state(int nidx, VectorSet& ptset, PhaseTransform* phase);
+
 public:
   ConnectionGraph(Compile *C);
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/graphKit.cpp
--- a/src/share/vm/opto/graphKit.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/graphKit.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2010 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
@@ -455,16 +455,44 @@
     return Bytecodes::_illegal;
 }
 
+void GraphKit::uncommon_trap_if_should_post_on_exceptions(Deoptimization::DeoptReason reason,
+                                                          bool must_throw) {
+    // if the exception capability is set, then we will generate code
+    // to check the JavaThread.should_post_on_exceptions flag to see
+    // if we actually need to report exception events (for this
+    // thread).  If we don't need to report exception events, we will
+    // take the normal fast path provided by add_exception_events.  If
+    // exception event reporting is enabled for this thread, we will
+    // take the uncommon_trap in the BuildCutout below.
+
+    // first must access the should_post_on_exceptions_flag in this thread's JavaThread
+    Node* jthread = _gvn.transform(new (C, 1) ThreadLocalNode());
+    Node* adr = basic_plus_adr(top(), jthread, in_bytes(JavaThread::should_post_on_exceptions_flag_offset()));
+    Node* should_post_flag = make_load(control(), adr, TypeInt::INT, T_INT, Compile::AliasIdxRaw, false);
+
+    // Test the should_post_on_exceptions_flag vs. 0
+    Node* chk = _gvn.transform( new (C, 3) CmpINode(should_post_flag, intcon(0)) );
+    Node* tst = _gvn.transform( new (C, 2) BoolNode(chk, BoolTest::eq) );
+
+    // Branch to slow_path if should_post_on_exceptions_flag was true
+    { BuildCutout unless(this, tst, PROB_MAX);
+      // Do not try anything fancy if we're notifying the VM on every throw.
+      // Cf. case Bytecodes::_athrow in parse2.cpp.
+      uncommon_trap(reason, Deoptimization::Action_none,
+                    (ciKlass*)NULL, (char*)NULL, must_throw);
+    }
+
+}
+
 //------------------------------builtin_throw----------------------------------
 void GraphKit::builtin_throw(Deoptimization::DeoptReason reason, Node* arg) {
   bool must_throw = true;
 
-  if (env()->jvmti_can_post_exceptions()) {
-    // Do not try anything fancy if we're notifying the VM on every throw.
-    // Cf. case Bytecodes::_athrow in parse2.cpp.
-    uncommon_trap(reason, Deoptimization::Action_none,
-                  (ciKlass*)NULL, (char*)NULL, must_throw);
-    return;
+  if (env()->jvmti_can_post_on_exceptions()) {
+    // check if we must post exception events, take uncommon trap if so
+    uncommon_trap_if_should_post_on_exceptions(reason, must_throw);
+    // here if should_post_on_exceptions is false
+    // continue on with the normal codegen
   }
 
   // If this particular condition has not yet happened at this
@@ -622,11 +650,13 @@
 
 //---------------------------PreserveReexecuteState----------------------------
 PreserveReexecuteState::PreserveReexecuteState(GraphKit* kit) {
+  assert(!kit->stopped(), "must call stopped() before");
   _kit    =    kit;
   _sp     =    kit->sp();
   _reexecute = kit->jvms()->_reexecute;
 }
 PreserveReexecuteState::~PreserveReexecuteState() {
+  if (_kit->stopped()) return;
   _kit->jvms()->_reexecute = _reexecute;
   _kit->set_sp(_sp);
 }
@@ -750,12 +780,20 @@
 
 // Helper function for enforcing certain bytecodes to reexecute if
 // deoptimization happens
-static bool should_reexecute_implied_by_bytecode(JVMState *jvms) {
+static bool should_reexecute_implied_by_bytecode(JVMState *jvms, bool is_anewarray) {
   ciMethod* cur_method = jvms->method();
   int       cur_bci   = jvms->bci();
   if (cur_method != NULL && cur_bci != InvocationEntryBci) {
     Bytecodes::Code code = cur_method->java_code_at_bci(cur_bci);
-    return Interpreter::bytecode_should_reexecute(code);
+    return Interpreter::bytecode_should_reexecute(code) ||
+           is_anewarray && code == Bytecodes::_multianewarray;
+    // Reexecute _multianewarray bytecode which was replaced with
+    // sequence of [a]newarray. See Parse::do_multianewarray().
+    //
+    // Note: interpreter should not have it set since this optimization
+    // is limited by dimensions and guarded by flag so in some cases
+    // multianewarray() runtime calls will be generated and
+    // the bytecode should not be reexecutes (stack will not be reset).
   } else
     return false;
 }
@@ -806,7 +844,7 @@
   // For a known set of bytecodes, the interpreter should reexecute them if
   // deoptimization happens. We set the reexecute state for them here
   if (out_jvms->is_reexecute_undefined() && //don't change if already specified
-      should_reexecute_implied_by_bytecode(out_jvms)) {
+      should_reexecute_implied_by_bytecode(out_jvms, call->is_AllocateArray())) {
     out_jvms->set_should_reexecute(true); //NOTE: youngest_jvms not changed
   }
 
@@ -979,14 +1017,19 @@
   case Bytecodes::_invokedynamic:
   case Bytecodes::_invokeinterface:
     {
-      bool is_static = (depth == 0);
       bool ignore;
       ciBytecodeStream iter(method());
       iter.reset_to_bci(bci());
       iter.next();
       ciMethod* method = iter.get_method(ignore);
       inputs = method->arg_size_no_receiver();
-      if (!is_static)  inputs += 1;
+      // Add a receiver argument, maybe:
+      if (code != Bytecodes::_invokestatic &&
+          code != Bytecodes::_invokedynamic)
+        inputs += 1;
+      // (Do not use ciMethod::arg_size(), because
+      // it might be an unloaded method, which doesn't
+      // know whether it is static or not.)
       int size = method->return_type()->size();
       depth = size - inputs;
     }
@@ -1086,7 +1129,7 @@
     alen = _gvn.transform( new (C, 3) LoadRangeNode(0, immutable_memory(), r_adr, TypeInt::POS));
   } else {
     alen = alloc->Ideal_length();
-    Node* ccast = alloc->make_ideal_length(_gvn.type(array)->is_aryptr(), &_gvn);
+    Node* ccast = alloc->make_ideal_length(_gvn.type(array)->is_oopptr(), &_gvn);
     if (ccast != alen) {
       alen = _gvn.transform(ccast);
     }
@@ -1123,8 +1166,8 @@
     case T_OBJECT : {
       const Type *t = _gvn.type( value );
 
-      const TypeInstPtr* tp = t->isa_instptr();
-      if (tp != NULL && !tp->klass()->is_loaded()
+      const TypeOopPtr* tp = t->isa_oopptr();
+      if (tp != NULL && tp->klass() != NULL && !tp->klass()->is_loaded()
           // Only for do_null_check, not any of its siblings:
           && !assert_null && null_control == NULL) {
         // Usually, any field access or invocation on an unloaded oop type
@@ -1349,8 +1392,8 @@
 }
 
 //------------------------------set_all_memory_call----------------------------
-void GraphKit::set_all_memory_call(Node* call) {
-  Node* newmem = _gvn.transform( new (C, 1) ProjNode(call, TypeFunc::Memory) );
+void GraphKit::set_all_memory_call(Node* call, bool separate_io_proj) {
+  Node* newmem = _gvn.transform( new (C, 1) ProjNode(call, TypeFunc::Memory, separate_io_proj) );
   set_all_memory(newmem);
 }
 
@@ -1448,7 +1491,7 @@
 
     case BarrierSet::CardTableModRef:
     case BarrierSet::CardTableExtension:
-      write_barrier_post(store, obj, adr, val, use_precise);
+      write_barrier_post(store, obj, adr, adr_idx, val, use_precise);
       break;
 
     case BarrierSet::ModRef:
@@ -1571,7 +1614,7 @@
 //---------------------------set_edges_for_java_call---------------------------
 // Connect a newly created call into the current JVMS.
 // A return value node (if any) is returned from set_edges_for_java_call.
-void GraphKit::set_edges_for_java_call(CallJavaNode* call, bool must_throw) {
+void GraphKit::set_edges_for_java_call(CallJavaNode* call, bool must_throw, bool separate_io_proj) {
 
   // Add the predefined inputs:
   call->init_req( TypeFunc::Control, control() );
@@ -1593,13 +1636,13 @@
   // Re-use the current map to produce the result.
 
   set_control(_gvn.transform(new (C, 1) ProjNode(call, TypeFunc::Control)));
-  set_i_o(    _gvn.transform(new (C, 1) ProjNode(call, TypeFunc::I_O    )));
-  set_all_memory_call(xcall);
+  set_i_o(    _gvn.transform(new (C, 1) ProjNode(call, TypeFunc::I_O    , separate_io_proj)));
+  set_all_memory_call(xcall, separate_io_proj);
 
   //return xcall;   // no need, caller already has it
 }
 
-Node* GraphKit::set_results_for_java_call(CallJavaNode* call) {
+Node* GraphKit::set_results_for_java_call(CallJavaNode* call, bool separate_io_proj) {
   if (stopped())  return top();  // maybe the call folded up?
 
   // Capture the return value, if any.
@@ -1612,8 +1655,15 @@
   // Note:  Since any out-of-line call can produce an exception,
   // we always insert an I_O projection from the call into the result.
 
-  make_slow_call_ex(call, env()->Throwable_klass(), false);
-
+  make_slow_call_ex(call, env()->Throwable_klass(), separate_io_proj);
+
+  if (separate_io_proj) {
+    // The caller requested separate projections be used by the fall
+    // through and exceptional paths, so replace the projections for
+    // the fall through path.
+    set_i_o(_gvn.transform( new (C, 1) ProjNode(call, TypeFunc::I_O) ));
+    set_all_memory(_gvn.transform( new (C, 1) ProjNode(call, TypeFunc::Memory) ));
+  }
   return ret;
 }
 
@@ -1676,6 +1726,64 @@
   }
 }
 
+
+// Replace the call with the current state of the kit.
+void GraphKit::replace_call(CallNode* call, Node* result) {
+  JVMState* ejvms = NULL;
+  if (has_exceptions()) {
+    ejvms = transfer_exceptions_into_jvms();
+  }
+
+  SafePointNode* final_state = stop();
+
+  // Find all the needed outputs of this call
+  CallProjections callprojs;
+  call->extract_projections(&callprojs, true);
+
+  // Replace all the old call edges with the edges from the inlining result
+  C->gvn_replace_by(callprojs.fallthrough_catchproj, final_state->in(TypeFunc::Control));
+  C->gvn_replace_by(callprojs.fallthrough_memproj,   final_state->in(TypeFunc::Memory));
+  C->gvn_replace_by(callprojs.fallthrough_ioproj,    final_state->in(TypeFunc::I_O));
+
+  // Replace the result with the new result if it exists and is used
+  if (callprojs.resproj != NULL && result != NULL) {
+    C->gvn_replace_by(callprojs.resproj, result);
+  }
+
+  if (ejvms == NULL) {
+    // No exception edges to simply kill off those paths
+    C->gvn_replace_by(callprojs.catchall_catchproj, C->top());
+    C->gvn_replace_by(callprojs.catchall_memproj,   C->top());
+    C->gvn_replace_by(callprojs.catchall_ioproj,    C->top());
+
+    // Replace the old exception object with top
+    if (callprojs.exobj != NULL) {
+      C->gvn_replace_by(callprojs.exobj, C->top());
+    }
+  } else {
+    GraphKit ekit(ejvms);
+
+    // Load my combined exception state into the kit, with all phis transformed:
+    SafePointNode* ex_map = ekit.combine_and_pop_all_exception_states();
+
+    Node* ex_oop = ekit.use_exception_state(ex_map);
+
+    C->gvn_replace_by(callprojs.catchall_catchproj, ekit.control());
+    C->gvn_replace_by(callprojs.catchall_memproj,   ekit.reset_memory());
+    C->gvn_replace_by(callprojs.catchall_ioproj,    ekit.i_o());
+
+    // Replace the old exception object with the newly created one
+    if (callprojs.exobj != NULL) {
+      C->gvn_replace_by(callprojs.exobj, ex_oop);
+    }
+  }
+
+  // Disconnect the call from the graph
+  call->disconnect_inputs(NULL);
+  C->gvn_replace_by(call, C->top());
+}
+
+
 //------------------------------increment_counter------------------------------
 // for statistics: increment a VM counter by 1
 
@@ -3163,6 +3271,7 @@
 void GraphKit::write_barrier_post(Node* oop_store,
                                   Node* obj,
                                   Node* adr,
+                                  uint  adr_idx,
                                   Node* val,
                                   bool use_precise) {
   // No store check needed if we're storing a NULL or an old object
@@ -3183,6 +3292,16 @@
       return;
   }
 
+  if (use_ReduceInitialCardMarks()
+      && obj == just_allocated_object(control())) {
+    // We can skip marks on a freshly-allocated object in Eden.
+    // Keep this code in sync with new_store_pre_barrier() in runtime.cpp.
+    // That routine informs GC to take appropriate compensating steps,
+    // upon a slow-path allocation, so as to make this card-mark
+    // elision safe.
+    return;
+  }
+
   if (!use_precise) {
     // All card marks for a (non-array) instance are in one place:
     adr = obj;
@@ -3212,7 +3331,7 @@
     __ store(__ ctrl(), card_adr, zero, bt, adr_type);
   } else {
     // Specialized path for CM store barrier
-    __ storeCM(__ ctrl(), card_adr, zero, oop_store, bt, adr_type);
+    __ storeCM(__ ctrl(), card_adr, zero, oop_store, adr_idx, bt, adr_type);
   }
 
   // Final sync IdealKit and GraphKit.
@@ -3312,6 +3431,7 @@
 void GraphKit::g1_mark_card(IdealKit& ideal,
                             Node* card_adr,
                             Node* oop_store,
+                            uint oop_alias_idx,
                             Node* index,
                             Node* index_adr,
                             Node* buffer,
@@ -3321,7 +3441,7 @@
   Node* no_base = __ top();
   BasicType card_bt = T_BYTE;
   // Smash zero into card. MUST BE ORDERED WRT TO STORE
-  __ storeCM(__ ctrl(), card_adr, zero, oop_store, card_bt, Compile::AliasIdxRaw);
+  __ storeCM(__ ctrl(), card_adr, zero, oop_store, oop_alias_idx, card_bt, Compile::AliasIdxRaw);
 
   //  Now do the queue work
   __ if_then(index, BoolTest::ne, zero); {
@@ -3433,17 +3553,16 @@
         Node* card_val = __ load(__ ctrl(), card_adr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw);
 
         __ if_then(card_val, BoolTest::ne, zero); {
-          g1_mark_card(ideal, card_adr, oop_store, index, index_adr, buffer, tf);
+          g1_mark_card(ideal, card_adr, oop_store, alias_idx, index, index_adr, buffer, tf);
         } __ end_if();
       } __ end_if();
     } __ end_if();
   } else {
     // Object.clone() instrinsic uses this path.
-    g1_mark_card(ideal, card_adr, oop_store, index, index_adr, buffer, tf);
+    g1_mark_card(ideal, card_adr, oop_store, alias_idx, index, index_adr, buffer, tf);
   }
 
   // Final sync IdealKit and GraphKit.
   sync_kit(ideal);
 }
 #undef __
-
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/graphKit.hpp
--- a/src/share/vm/opto/graphKit.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/graphKit.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2010 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
@@ -251,6 +251,11 @@
   // via an uncommon trap.
   void builtin_throw(Deoptimization::DeoptReason reason, Node* arg = NULL);
 
+  // Helper to check the JavaThread::_should_post_on_exceptions flag
+  // and branch to an uncommon_trap if it is true (with the specified reason and must_throw)
+  void uncommon_trap_if_should_post_on_exceptions(Deoptimization::DeoptReason reason,
+                                                  bool must_throw) ;
+
   // Helper Functions for adding debug information
   void kill_dead_locals();
 #ifdef ASSERT
@@ -279,6 +284,34 @@
   }
   Node* basic_plus_adr(Node* base, Node* ptr, Node* offset);
 
+
+  // Some convenient shortcuts for common nodes
+  Node* IfTrue(IfNode* iff)                   { return _gvn.transform(new (C,1) IfTrueNode(iff));      }
+  Node* IfFalse(IfNode* iff)                  { return _gvn.transform(new (C,1) IfFalseNode(iff));     }
+
+  Node* AddI(Node* l, Node* r)                { return _gvn.transform(new (C,3) AddINode(l, r));       }
+  Node* SubI(Node* l, Node* r)                { return _gvn.transform(new (C,3) SubINode(l, r));       }
+  Node* MulI(Node* l, Node* r)                { return _gvn.transform(new (C,3) MulINode(l, r));       }
+  Node* DivI(Node* ctl, Node* l, Node* r)     { return _gvn.transform(new (C,3) DivINode(ctl, l, r));  }
+
+  Node* AndI(Node* l, Node* r)                { return _gvn.transform(new (C,3) AndINode(l, r));       }
+  Node* OrI(Node* l, Node* r)                 { return _gvn.transform(new (C,3) OrINode(l, r));        }
+  Node* XorI(Node* l, Node* r)                { return _gvn.transform(new (C,3) XorINode(l, r));       }
+
+  Node* MaxI(Node* l, Node* r)                { return _gvn.transform(new (C,3) MaxINode(l, r));       }
+  Node* MinI(Node* l, Node* r)                { return _gvn.transform(new (C,3) MinINode(l, r));       }
+
+  Node* LShiftI(Node* l, Node* r)             { return _gvn.transform(new (C,3) LShiftINode(l, r));    }
+  Node* RShiftI(Node* l, Node* r)             { return _gvn.transform(new (C,3) RShiftINode(l, r));    }
+  Node* URShiftI(Node* l, Node* r)            { return _gvn.transform(new (C,3) URShiftINode(l, r));   }
+
+  Node* CmpI(Node* l, Node* r)                { return _gvn.transform(new (C,3) CmpINode(l, r));       }
+  Node* CmpL(Node* l, Node* r)                { return _gvn.transform(new (C,3) CmpLNode(l, r));       }
+  Node* CmpP(Node* l, Node* r)                { return _gvn.transform(new (C,3) CmpPNode(l, r));       }
+  Node* Bool(Node* cmp, BoolTest::mask relop) { return _gvn.transform(new (C,2) BoolNode(cmp, relop)); }
+
+  Node* AddP(Node* b, Node* a, Node* o)       { return _gvn.transform(new (C,4) AddPNode(b, a, o));    }
+
   // Convert between int and long, and size_t.
   // (See macros ConvI2X, etc., in type.hpp for ConvI2X, etc.)
   Node* ConvI2L(Node* offset);
@@ -400,7 +433,7 @@
   void set_all_memory(Node* newmem);
 
   // Create a memory projection from the call, then set_all_memory.
-  void set_all_memory_call(Node* call);
+  void set_all_memory_call(Node* call, bool separate_io_proj = false);
 
   // Create a LoadNode, reading from the parser's memory state.
   // (Note:  require_atomic_access is useful only with T_LONG.)
@@ -543,12 +576,12 @@
   // Transform the call, and update the basics: control, i_o, memory.
   // (The next step is usually to call set_results_for_java_call.)
   void set_edges_for_java_call(CallJavaNode* call,
-                               bool must_throw = false);
+                               bool must_throw = false, bool separate_io_proj = false);
 
   // Finish up a java call that was started by set_edges_for_java_call.
   // Call add_exception on any throw arising from the call.
   // Return the call result (transformed).
-  Node* set_results_for_java_call(CallJavaNode* call);
+  Node* set_results_for_java_call(CallJavaNode* call, bool separate_io_proj = false);
 
   // Similar to set_edges_for_java_call, but simplified for runtime calls.
   void  set_predefined_output_for_runtime_call(Node* call) {
@@ -559,6 +592,11 @@
                                                const TypePtr* hook_mem);
   Node* set_predefined_input_for_runtime_call(SafePointNode* call);
 
+  // Replace the call with the current state of the kit.  Requires
+  // that the call was generated with separate io_projs so that
+  // exceptional control flow can be handled properly.
+  void replace_call(CallNode* call, Node* result);
+
   // helper functions for statistics
   void increment_counter(address counter_addr);   // increment a debug counter
   void increment_counter(Node*   counter_addr);   // increment a debug counter
@@ -603,7 +641,8 @@
   void sync_kit(IdealKit& ideal);
 
   // vanilla/CMS post barrier
-  void write_barrier_post(Node *store, Node* obj, Node* adr, Node* val, bool use_precise);
+  void write_barrier_post(Node *store, Node* obj,
+                          Node* adr,  uint adr_idx, Node* val, bool use_precise);
 
   // G1 pre/post barriers
   void g1_write_barrier_pre(Node* obj,
@@ -622,7 +661,8 @@
                              bool use_precise);
   // Helper function for g1
   private:
-  void g1_mark_card(IdealKit& ideal, Node* card_adr, Node* store,  Node* index, Node* index_adr,
+  void g1_mark_card(IdealKit& ideal, Node* card_adr, Node* store, uint oop_alias_idx,
+                    Node* index, Node* index_adr,
                     Node* buffer, const TypeFunc* tf);
 
   public:
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/idealKit.cpp
--- a/src/share/vm/opto/idealKit.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/idealKit.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 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
@@ -378,7 +378,7 @@
 
 // Card mark store. Must be ordered so that it will come after the store of
 // the oop.
-Node* IdealKit::storeCM(Node* ctl, Node* adr, Node *val, Node* oop_store,
+Node* IdealKit::storeCM(Node* ctl, Node* adr, Node *val, Node* oop_store, int oop_adr_idx,
                         BasicType bt,
                         int adr_idx) {
   assert(adr_idx != Compile::AliasIdxTop, "use other store_to_memory factory" );
@@ -388,7 +388,7 @@
 
   // Add required edge to oop_store, optimizer does not support precedence edges.
   // Convert required edge to precedence edge before allocation.
-  Node* st = new (C, 5) StoreCMNode(ctl, mem, adr, adr_type, val, oop_store);
+  Node* st = new (C, 5) StoreCMNode(ctl, mem, adr, adr_type, val, oop_store, oop_adr_idx);
 
   st = transform(st);
   set_memory(st, adr_idx);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/idealKit.hpp
--- a/src/share/vm/opto/idealKit.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/idealKit.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 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
@@ -216,6 +216,7 @@
                 Node* adr,
                 Node* val,
                 Node* oop_store,
+                int oop_adr_idx,
                 BasicType bt,
                 int adr_idx);
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/ifg.cpp
--- a/src/share/vm/opto/ifg.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/ifg.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/ifnode.cpp
--- a/src/share/vm/opto/ifnode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/ifnode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 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
@@ -240,13 +240,13 @@
   // as a single huge transform.
   igvn->register_new_node_with_optimizer( region_c );
   igvn->register_new_node_with_optimizer( region_x );
-  phi_x = phase->transform( phi_x );
   // Prevent the untimely death of phi_x.  Currently he has no uses.  He is
   // about to get one.  If this only use goes away, then phi_x will look dead.
   // However, he will be picking up some more uses down below.
   Node *hook = new (igvn->C, 4) Node(4);
   hook->init_req(0, phi_x);
   hook->init_req(1, phi_c);
+  phi_x = phase->transform( phi_x );
 
   // Make the compare
   Node *cmp_c = phase->makecon(t);
@@ -322,6 +322,7 @@
         phi_s = PhiNode::make_blank(region_s,phi);
         phi_s->init_req( 1, phi_c );
         phi_s->init_req( 2, phi_x );
+        hook->add_req(phi_s);
         phi_s = phase->transform(phi_s);
       }
       proj_path_data = phi_s;
@@ -333,6 +334,7 @@
         phi_f = PhiNode::make_blank(region_f,phi);
         phi_f->init_req( 1, phi_c );
         phi_f->init_req( 2, phi_x );
+        hook->add_req(phi_f);
         phi_f = phase->transform(phi_f);
       }
       proj_path_data = phi_f;
@@ -529,6 +531,9 @@
   if (linear_only)
     return NULL;
 
+  if( dom->is_Root() )
+    return NULL;
+
   // Else hit a Region.  Check for a loop header
   if( dom->is_Loop() )
     return dom->in(1);          // Skip up thru loops
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/lcm.cpp
--- a/src/share/vm/opto/lcm.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/lcm.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -120,6 +120,7 @@
     case Op_LoadRange:
     case Op_LoadD_unaligned:
     case Op_LoadL_unaligned:
+      assert(mach->in(2) == val, "should be address");
       break;
     case Op_StoreB:
     case Op_StoreC:
@@ -146,6 +147,21 @@
     default:                    // Also check for embedded loads
       if( !mach->needs_anti_dependence_check() )
         continue;               // Not an memory op; skip it
+      {
+        // Check that value is used in memory address.
+        Node* base;
+        Node* index;
+        const MachOper* oper = mach->memory_inputs(base, index);
+        if (oper == NULL || oper == (MachOper*)-1) {
+          continue;             // Not an memory op; skip it
+        }
+        if (val == base ||
+            val == index && val->bottom_type()->isa_narrowoop()) {
+          break;                // Found it
+        } else {
+          continue;             // Skip it
+        }
+      }
       break;
     }
     // check if the offset is not too high for implicit exception
@@ -542,6 +558,16 @@
   // pointers as far as the kill mask goes.
   bool exclude_soe = op == Op_CallRuntime;
 
+  // If the call is a MethodHandle invoke, we need to exclude the
+  // register which is used to save the SP value over MH invokes from
+  // the mask.  Otherwise this register could be used for
+  // deoptimization information.
+  if (op == Op_CallStaticJava) {
+    MachCallStaticJavaNode* mcallstaticjava = (MachCallStaticJavaNode*) mcall;
+    if (mcallstaticjava->_method_handle_invoke)
+      proj->_rout.OR(Matcher::method_handle_invoke_SP_save_mask());
+  }
+
   // Fill in the kill mask for the call
   for( OptoReg::Name r = OptoReg::Name(0); r < _last_Mach_Reg; r=OptoReg::add(r,1) ) {
     if( !regs.Member(r) ) {     // Not already defined by the call
@@ -616,8 +642,9 @@
           assert(cfg->_bbs[oop_store->_idx]->_dom_depth <= this->_dom_depth, "oop_store must dominate card-mark");
         }
       }
-      if( n->is_Mach() && n->as_Mach()->ideal_Opcode() == Op_MemBarAcquire &&
-          n->req() > TypeFunc::Parms ) {
+      if( n->is_Mach() && n->req() > TypeFunc::Parms &&
+          (n->as_Mach()->ideal_Opcode() == Op_MemBarAcquire ||
+           n->as_Mach()->ideal_Opcode() == Op_MemBarVolatile) ) {
         // MemBarAcquire could be created without Precedent edge.
         // del_req() replaces the specified edge with the last input edge
         // and then removes the last edge. If the specified edge > number of
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/library_call.cpp
--- a/src/share/vm/opto/library_call.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/library_call.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -133,6 +133,7 @@
     return generate_method_call(method_id, true, false);
   }
 
+  Node* make_string_method_node(int opcode, Node* str1, Node* cnt1, Node* str2, Node* cnt2);
   bool inline_string_compareTo();
   bool inline_string_indexOf();
   Node* string_indexOf(Node* string_object, ciTypeArray* target_array, jint offset, jint cache_i, jint md2_i);
@@ -796,6 +797,64 @@
 }
 
 
+//------------------------------make_string_method_node------------------------
+// Helper method for String intrinsic finctions.
+Node* LibraryCallKit::make_string_method_node(int opcode, Node* str1, Node* cnt1, Node* str2, Node* cnt2) {
+  const int value_offset  = java_lang_String::value_offset_in_bytes();
+  const int count_offset  = java_lang_String::count_offset_in_bytes();
+  const int offset_offset = java_lang_String::offset_offset_in_bytes();
+
+  Node* no_ctrl = NULL;
+
+  ciInstanceKlass* klass = env()->String_klass();
+  const TypeInstPtr* string_type =
+        TypeInstPtr::make(TypePtr::BotPTR, klass, false, NULL, 0);
+
+  const TypeAryPtr* value_type =
+        TypeAryPtr::make(TypePtr::NotNull,
+                         TypeAry::make(TypeInt::CHAR,TypeInt::POS),
+                         ciTypeArrayKlass::make(T_CHAR), true, 0);
+
+  // Get start addr of string and substring
+  Node* str1_valuea  = basic_plus_adr(str1, str1, value_offset);
+  Node* str1_value   = make_load(no_ctrl, str1_valuea, value_type, T_OBJECT, string_type->add_offset(value_offset));
+  Node* str1_offseta = basic_plus_adr(str1, str1, offset_offset);
+  Node* str1_offset  = make_load(no_ctrl, str1_offseta, TypeInt::INT, T_INT, string_type->add_offset(offset_offset));
+  Node* str1_start   = array_element_address(str1_value, str1_offset, T_CHAR);
+
+  // Pin loads from String::equals() argument since it could be NULL.
+  Node* str2_ctrl = (opcode == Op_StrEquals) ? control() : no_ctrl;
+  Node* str2_valuea  = basic_plus_adr(str2, str2, value_offset);
+  Node* str2_value   = make_load(str2_ctrl, str2_valuea, value_type, T_OBJECT, string_type->add_offset(value_offset));
+  Node* str2_offseta = basic_plus_adr(str2, str2, offset_offset);
+  Node* str2_offset  = make_load(str2_ctrl, str2_offseta, TypeInt::INT, T_INT, string_type->add_offset(offset_offset));
+  Node* str2_start   = array_element_address(str2_value, str2_offset, T_CHAR);
+
+  Node* result = NULL;
+  switch (opcode) {
+  case Op_StrIndexOf:
+    result = new (C, 6) StrIndexOfNode(control(), memory(TypeAryPtr::CHARS),
+                                       str1_start, cnt1, str2_start, cnt2);
+    break;
+  case Op_StrComp:
+    result = new (C, 6) StrCompNode(control(), memory(TypeAryPtr::CHARS),
+                                    str1_start, cnt1, str2_start, cnt2);
+    break;
+  case Op_StrEquals:
+    result = new (C, 5) StrEqualsNode(control(), memory(TypeAryPtr::CHARS),
+                                      str1_start, str2_start, cnt1);
+    break;
+  default:
+    ShouldNotReachHere();
+    return NULL;
+  }
+
+  // All these intrinsics have checks.
+  C->set_has_split_ifs(true); // Has chance for split-if optimization
+
+  return _gvn.transform(result);
+}
+
 //------------------------------inline_string_compareTo------------------------
 bool LibraryCallKit::inline_string_compareTo() {
 
@@ -824,16 +883,16 @@
   ciInstanceKlass* klass = env()->String_klass();
   const TypeInstPtr* string_type =
     TypeInstPtr::make(TypePtr::BotPTR, klass, false, NULL, 0);
-
-  Node* compare =
-    _gvn.transform(new (C, 7) StrCompNode(
-                        control(),
-                        memory(TypeAryPtr::CHARS),
-                        memory(string_type->add_offset(value_offset)),
-                        memory(string_type->add_offset(count_offset)),
-                        memory(string_type->add_offset(offset_offset)),
-                        receiver,
-                        argument));
+  Node* no_ctrl = NULL;
+
+  // Get counts for string and argument
+  Node* receiver_cnta = basic_plus_adr(receiver, receiver, count_offset);
+  Node* receiver_cnt  = make_load(no_ctrl, receiver_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+
+  Node* argument_cnta = basic_plus_adr(argument, argument, count_offset);
+  Node* argument_cnt  = make_load(no_ctrl, argument_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+
+  Node* compare = make_string_method_node(Op_StrComp, receiver, receiver_cnt, argument, argument_cnt);
   push(compare);
   return true;
 }
@@ -865,45 +924,71 @@
     return true;
   }
 
+  // paths (plus control) merge
+  RegionNode* region = new (C, 5) RegionNode(5);
+  Node* phi = new (C, 5) PhiNode(region, TypeInt::BOOL);
+
+  // does source == target string?
+  Node* cmp = _gvn.transform(new (C, 3) CmpPNode(receiver, argument));
+  Node* bol = _gvn.transform(new (C, 2) BoolNode(cmp, BoolTest::eq));
+
+  Node* if_eq = generate_slow_guard(bol, NULL);
+  if (if_eq != NULL) {
+    // receiver == argument
+    phi->init_req(2, intcon(1));
+    region->init_req(2, if_eq);
+  }
+
   // get String klass for instanceOf
   ciInstanceKlass* klass = env()->String_klass();
 
-  // two paths (plus control) merge
-  RegionNode* region = new (C, 3) RegionNode(3);
-  Node* phi = new (C, 3) PhiNode(region, TypeInt::BOOL);
-
-  Node* inst = gen_instanceof(argument, makecon(TypeKlassPtr::make(klass)));
-  Node* cmp  = _gvn.transform(new (C, 3) CmpINode(inst, intcon(1)));
-  Node* bol  = _gvn.transform(new (C, 2) BoolNode(cmp, BoolTest::eq));
-
-  IfNode* iff = create_and_map_if(control(), bol, PROB_MAX, COUNT_UNKNOWN);
-
-  Node* if_true  = _gvn.transform(new (C, 1) IfTrueNode(iff));
-  set_control(if_true);
+  if (!stopped()) {
+    Node* inst = gen_instanceof(argument, makecon(TypeKlassPtr::make(klass)));
+    Node* cmp  = _gvn.transform(new (C, 3) CmpINode(inst, intcon(1)));
+    Node* bol  = _gvn.transform(new (C, 2) BoolNode(cmp, BoolTest::ne));
+
+    Node* inst_false = generate_guard(bol, NULL, PROB_MIN);
+    //instanceOf == true, fallthrough
+
+    if (inst_false != NULL) {
+      phi->init_req(3, intcon(0));
+      region->init_req(3, inst_false);
+    }
+  }
 
   const TypeInstPtr* string_type =
     TypeInstPtr::make(TypePtr::BotPTR, klass, false, NULL, 0);
 
-  // instanceOf == true
-  Node* equals =
-    _gvn.transform(new (C, 7) StrEqualsNode(
-                        control(),
-                        memory(TypeAryPtr::CHARS),
-                        memory(string_type->add_offset(value_offset)),
-                        memory(string_type->add_offset(count_offset)),
-                        memory(string_type->add_offset(offset_offset)),
-                        receiver,
-                        argument));
-
-  phi->init_req(1, _gvn.transform(equals));
-  region->init_req(1, if_true);
-
-  //instanceOf == false, fallthrough
-  Node* if_false = _gvn.transform(new (C, 1) IfFalseNode(iff));
-  set_control(if_false);
-
-  phi->init_req(2, _gvn.transform(intcon(0)));
-  region->init_req(2, if_false);
+  Node* no_ctrl = NULL;
+  Node* receiver_cnt;
+  Node* argument_cnt;
+
+  if (!stopped()) {
+    // Get counts for string and argument
+    Node* receiver_cnta = basic_plus_adr(receiver, receiver, count_offset);
+    receiver_cnt  = make_load(no_ctrl, receiver_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+
+    // Pin load from argument string since it could be NULL.
+    Node* argument_cnta = basic_plus_adr(argument, argument, count_offset);
+    argument_cnt  = make_load(control(), argument_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+
+    // Check for receiver count != argument count
+    Node* cmp = _gvn.transform( new(C, 3) CmpINode(receiver_cnt, argument_cnt) );
+    Node* bol = _gvn.transform( new(C, 2) BoolNode(cmp, BoolTest::ne) );
+    Node* if_ne = generate_slow_guard(bol, NULL);
+    if (if_ne != NULL) {
+      phi->init_req(4, intcon(0));
+      region->init_req(4, if_ne);
+    }
+  }
+
+  // Check for count == 0 is done by mach node StrEquals.
+
+  if (!stopped()) {
+    Node* equals = make_string_method_node(Op_StrEquals, receiver, receiver_cnt, argument, argument_cnt);
+    phi->init_req(1, equals);
+    region->init_req(1, control());
+  }
 
   // post merge
   set_control(_gvn.transform(region));
@@ -924,10 +1009,8 @@
   Node *argument1 = pop();
 
   Node* equals =
-    _gvn.transform(new (C, 3) AryEqNode(control(),
-                                        argument1,
-                                        argument2)
-                   );
+    _gvn.transform(new (C, 4) AryEqNode(control(), memory(TypeAryPtr::CHARS),
+                                        argument1, argument2) );
   push(equals);
   return true;
 }
@@ -1108,19 +1191,40 @@
       return true;
     }
 
+    // Make the merge point
+    RegionNode* result_rgn = new (C, 3) RegionNode(3);
+    Node*       result_phi = new (C, 3) PhiNode(result_rgn, TypeInt::INT);
+    Node* no_ctrl  = NULL;
+
     ciInstanceKlass* klass = env()->String_klass();
     const TypeInstPtr* string_type =
       TypeInstPtr::make(TypePtr::BotPTR, klass, false, NULL, 0);
 
-    result =
-      _gvn.transform(new (C, 7)
-                     StrIndexOfNode(control(),
-                                    memory(TypeAryPtr::CHARS),
-                                    memory(string_type->add_offset(value_offset)),
-                                    memory(string_type->add_offset(count_offset)),
-                                    memory(string_type->add_offset(offset_offset)),
-                                    receiver,
-                                    argument));
+    // Get counts for string and substr
+    Node* source_cnta = basic_plus_adr(receiver, receiver, count_offset);
+    Node* source_cnt  = make_load(no_ctrl, source_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+
+    Node* substr_cnta = basic_plus_adr(argument, argument, count_offset);
+    Node* substr_cnt  = make_load(no_ctrl, substr_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+
+    // Check for substr count > string count
+    Node* cmp = _gvn.transform( new(C, 3) CmpINode(substr_cnt, source_cnt) );
+    Node* bol = _gvn.transform( new(C, 2) BoolNode(cmp, BoolTest::gt) );
+    Node* if_gt = generate_slow_guard(bol, NULL);
+    if (if_gt != NULL) {
+      result_phi->init_req(2, intcon(-1));
+      result_rgn->init_req(2, if_gt);
+    }
+
+    if (!stopped()) {
+      result = make_string_method_node(Op_StrIndexOf, receiver, source_cnt, argument, substr_cnt);
+      result_phi->init_req(1, result);
+      result_rgn->init_req(1, control());
+    }
+    set_control(_gvn.transform(result_rgn));
+    record_for_igvn(result_rgn);
+    result = _gvn.transform(result_phi);
+
   } else { //Use LibraryCallKit::string_indexOf
     // don't intrinsify is argument isn't a constant string.
     if (!argument->is_Con()) {
@@ -3593,12 +3697,14 @@
 
 // Helper routine for above
 bool LibraryCallKit::is_method_invoke_or_aux_frame(JVMState* jvms) {
+  ciMethod* method = jvms->method();
+
   // Is this the Method.invoke method itself?
-  if (jvms->method()->intrinsic_id() == vmIntrinsics::_invoke)
+  if (method->intrinsic_id() == vmIntrinsics::_invoke)
     return true;
 
   // Is this a helper, defined somewhere underneath MethodAccessorImpl.
-  ciKlass* k = jvms->method()->holder();
+  ciKlass* k = method->holder();
   if (k->is_instance_klass()) {
     ciInstanceKlass* ik = k->as_instance_klass();
     for (; ik != NULL; ik = ik->super()) {
@@ -3608,6 +3714,10 @@
       }
     }
   }
+  else if (method->is_method_handle_adapter()) {
+    // This is an internal adapter frame from the MethodHandleCompiler -- skip it
+    return true;
+  }
 
   return false;
 }
@@ -3903,19 +4013,10 @@
     guarantee(alloc != NULL && alloc->maybe_set_complete(&_gvn), "");
   }
 
-  // Cast to Object for arraycopy.
-  // We can't use the original CheckCastPP since it should be moved
-  // after the arraycopy to prevent stores flowing above it.
-  Node* new_obj = new(C, 2) CheckCastPPNode(alloc_obj->in(0), raw_obj,
-                                            TypeInstPtr::NOTNULL);
-  new_obj = _gvn.transform(new_obj);
-  // Substitute in the locally valid dest_oop.
-  replace_in_map(alloc_obj, new_obj);
-
   // Copy the fastest available way.
   // TODO: generate fields copies for small objects instead.
   Node* src  = obj;
-  Node* dest = new_obj;
+  Node* dest = alloc_obj;
   Node* size = _gvn.transform(obj_size);
 
   // Exclude the header but include array length to copy by 8 bytes words.
@@ -3961,7 +4062,7 @@
     int raw_adr_idx = Compile::AliasIdxRaw;
     post_barrier(control(),
                  memory(raw_adr_type),
-                 new_obj,
+                 alloc_obj,
                  no_particular_field,
                  raw_adr_idx,
                  no_particular_value,
@@ -3969,16 +4070,8 @@
                  false);
   }
 
-  // Move the original CheckCastPP after arraycopy.
-  _gvn.hash_delete(alloc_obj);
-  alloc_obj->set_req(0, control());
-  // Replace raw memory edge with new CheckCastPP to have a live oop
-  // at safepoints instead of raw value.
-  assert(new_obj->is_CheckCastPP() && new_obj->in(1) == alloc_obj->in(1), "sanity");
-  alloc_obj->set_req(1, new_obj);    // cast to the original type
-  _gvn.hash_find_insert(alloc_obj);  // put back into GVN table
-  // Restore in the locally valid dest_oop.
-  replace_in_map(new_obj, alloc_obj);
+  // Do not let reads from the cloned object float above the arraycopy.
+  insert_mem_bar(Op_MemBarCPUOrder);
 }
 
 //------------------------inline_native_clone----------------------------
@@ -4073,13 +4166,13 @@
           result_mem ->set_req(_objArray_path, reset_memory());
         }
       }
-      // We can dispense with card marks if we know the allocation
-      // comes out of eden (TLAB)...  In fact, ReduceInitialCardMarks
-      // causes the non-eden paths to simulate a fresh allocation,
-      // insofar that no further card marks are required to initialize
-      // the object.
-
       // Otherwise, there are no card marks to worry about.
+      // (We can dispense with card marks if we know the allocation
+      //  comes out of eden (TLAB)...  In fact, ReduceInitialCardMarks
+      //  causes the non-eden paths to take compensating steps to
+      //  simulate a fresh allocation, so that no further
+      //  card marks are required in compiled code to initialize
+      //  the object.)
 
       if (!stopped()) {
         copy_to_clone(obj, alloc_obj, obj_size, true, false);
@@ -4448,15 +4541,6 @@
     assert(init->is_complete(), "we just did this");
     assert(dest->is_CheckCastPP(), "sanity");
     assert(dest->in(0)->in(0) == init, "dest pinned");
-
-    // Cast to Object for arraycopy.
-    // We can't use the original CheckCastPP since it should be moved
-    // after the arraycopy to prevent stores flowing above it.
-    Node* new_obj = new(C, 2) CheckCastPPNode(dest->in(0), dest->in(1),
-                                              TypeInstPtr::NOTNULL);
-    dest = _gvn.transform(new_obj);
-    // Substitute in the locally valid dest_oop.
-    replace_in_map(original_dest, dest);
     adr_type = TypeRawPtr::BOTTOM;  // all initializations are into raw memory
     // From this point on, every exit path is responsible for
     // initializing any non-copied parts of the object to zero.
@@ -4786,18 +4870,6 @@
   set_i_o(     _gvn.transform(result_i_o)    );
   set_memory(  _gvn.transform(result_memory), adr_type );
 
-  if (dest != original_dest) {
-    // Pin the "finished" array node after the arraycopy/zeroing operations.
-    _gvn.hash_delete(original_dest);
-    original_dest->set_req(0, control());
-    // Replace raw memory edge with new CheckCastPP to have a live oop
-    // at safepoints instead of raw value.
-    assert(dest->is_CheckCastPP() && dest->in(1) == original_dest->in(1), "sanity");
-    original_dest->set_req(1, dest);       // cast to the original type
-    _gvn.hash_find_insert(original_dest);  // put back into GVN table
-    // Restore in the locally valid dest_oop.
-    replace_in_map(dest, original_dest);
-  }
   // The memory edges above are precise in order to model effects around
   // array copies accurately to allow value numbering of field loads around
   // arraycopy.  Such field loads, both before and after, are common in Java
@@ -4808,7 +4880,9 @@
   // The next memory barrier is added to avoid it. If the arraycopy can be
   // optimized away (which it can, sometimes) then we can manually remove
   // the membar also.
-  if (InsertMemBarAfterArraycopy)
+  //
+  // Do not let reads from the cloned object float above the arraycopy.
+  if (InsertMemBarAfterArraycopy || alloc != NULL)
     insert_mem_bar(Op_MemBarCPUOrder);
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/loopTransform.cpp
--- a/src/share/vm/opto/loopTransform.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/loopTransform.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -549,6 +549,10 @@
       // Comparing trip+off vs limit
       Node *bol = iff->in(1);
       if( bol->req() != 2 ) continue; // dead constant test
+      if (!bol->is_Bool()) {
+        assert(UseLoopPredicate && bol->Opcode() == Op_Conv2B, "predicate check only");
+        continue;
+      }
       Node *cmp = bol->in(1);
 
       Node *rc_exp = cmp->in(1);
@@ -875,7 +879,7 @@
 //------------------------------is_invariant-----------------------------
 // Return true if n is invariant
 bool IdealLoopTree::is_invariant(Node* n) const {
-  Node *n_c = _phase->get_ctrl(n);
+  Node *n_c = _phase->has_ctrl(n) ? _phase->get_ctrl(n) : n;
   if (n_c->is_top()) return false;
   return !is_member(_phase->get_loop(n_c));
 }
@@ -1594,7 +1598,7 @@
 bool IdealLoopTree::iteration_split_impl( PhaseIdealLoop *phase, Node_List &old_new ) {
   // Check and remove empty loops (spam micro-benchmarks)
   if( policy_do_remove_empty_loop(phase) )
-    return true;                     // Here we removed an empty loop
+    return true;  // Here we removed an empty loop
 
   bool should_peel = policy_peeling(phase); // Should we peel?
 
@@ -1688,8 +1692,8 @@
     // an even number of trips).  If we are peeling, we might enable some RCE
     // and we'd rather unroll the post-RCE'd loop SO... do not unroll if
     // peeling.
-    if( should_unroll && !should_peel )
-      phase->do_unroll(this,old_new, true);
+      if( should_unroll && !should_peel )
+        phase->do_unroll(this,old_new, true);
 
     // Adjust the pre-loop limits to align the main body
     // iterations.
@@ -1731,9 +1735,9 @@
       _allow_optimizations &&
       !tail()->is_top() ) {     // Also ignore the occasional dead backedge
     if (!_has_call) {
-      if (!iteration_split_impl( phase, old_new )) {
-        return false;
-      }
+        if (!iteration_split_impl( phase, old_new )) {
+          return false;
+        }
     } else if (policy_unswitching(phase)) {
       phase->do_unswitching(this, old_new);
     }
@@ -1746,3 +1750,583 @@
     return false;
   return true;
 }
+
+//-------------------------------is_uncommon_trap_proj----------------------------
+// Return true if proj is the form of "proj->[region->..]call_uct"
+bool PhaseIdealLoop::is_uncommon_trap_proj(ProjNode* proj, bool must_reason_predicate) {
+  int path_limit = 10;
+  assert(proj, "invalid argument");
+  Node* out = proj;
+  for (int ct = 0; ct < path_limit; ct++) {
+    out = out->unique_ctrl_out();
+    if (out == NULL || out->is_Root() || out->is_Start())
+      return false;
+    if (out->is_CallStaticJava()) {
+      int req = out->as_CallStaticJava()->uncommon_trap_request();
+      if (req != 0) {
+        Deoptimization::DeoptReason reason = Deoptimization::trap_request_reason(req);
+        if (!must_reason_predicate || reason == Deoptimization::Reason_predicate){
+           return true;
+        }
+      }
+      return false; // don't do further after call
+    }
+  }
+  return false;
+}
+
+//-------------------------------is_uncommon_trap_if_pattern-------------------------
+// Return true  for "if(test)-> proj -> ...
+//                          |
+//                          V
+//                      other_proj->[region->..]call_uct"
+//
+// "must_reason_predicate" means the uct reason must be Reason_predicate
+bool PhaseIdealLoop::is_uncommon_trap_if_pattern(ProjNode *proj, bool must_reason_predicate) {
+  Node *in0 = proj->in(0);
+  if (!in0->is_If()) return false;
+  // Variation of a dead If node.
+  if (in0->outcnt() < 2)  return false;
+  IfNode* iff = in0->as_If();
+
+  // we need "If(Conv2B(Opaque1(...)))" pattern for must_reason_predicate
+  if (must_reason_predicate) {
+    if (iff->in(1)->Opcode() != Op_Conv2B ||
+       iff->in(1)->in(1)->Opcode() != Op_Opaque1) {
+      return false;
+    }
+  }
+
+  ProjNode* other_proj = iff->proj_out(1-proj->_con)->as_Proj();
+  return is_uncommon_trap_proj(other_proj, must_reason_predicate);
+}
+
+//------------------------------create_new_if_for_predicate------------------------
+// create a new if above the uct_if_pattern for the predicate to be promoted.
+//
+//          before                                after
+//        ----------                           ----------
+//           ctrl                                 ctrl
+//            |                                     |
+//            |                                     |
+//            v                                     v
+//           iff                                 new_iff
+//          /    \                                /      \
+//         /      \                              /        \
+//        v        v                            v          v
+//  uncommon_proj cont_proj                   if_uct     if_cont
+// \      |        |                           |          |
+//  \     |        |                           |          |
+//   v    v        v                           |          v
+//     rgn       loop                          |         iff
+//      |                                      |        /     \
+//      |                                      |       /       \
+//      v                                      |      v         v
+// uncommon_trap                               | uncommon_proj cont_proj
+//                                           \  \    |           |
+//                                            \  \   |           |
+//                                             v  v  v           v
+//                                               rgn           loop
+//                                                |
+//                                                |
+//                                                v
+//                                           uncommon_trap
+//
+//
+// We will create a region to guard the uct call if there is no one there.
+// The true projecttion (if_cont) of the new_iff is returned.
+ProjNode* PhaseIdealLoop::create_new_if_for_predicate(ProjNode* cont_proj) {
+  assert(is_uncommon_trap_if_pattern(cont_proj, true), "must be a uct if pattern!");
+  IfNode* iff = cont_proj->in(0)->as_If();
+
+  ProjNode *uncommon_proj = iff->proj_out(1 - cont_proj->_con);
+  Node     *rgn   = uncommon_proj->unique_ctrl_out();
+  assert(rgn->is_Region() || rgn->is_Call(), "must be a region or call uct");
+
+  if (!rgn->is_Region()) { // create a region to guard the call
+    assert(rgn->is_Call(), "must be call uct");
+    CallNode* call = rgn->as_Call();
+    rgn = new (C, 1) RegionNode(1);
+    _igvn.set_type(rgn, rgn->bottom_type());
+    rgn->add_req(uncommon_proj);
+    set_idom(rgn, idom(uncommon_proj), dom_depth(uncommon_proj)+1);
+    _igvn.hash_delete(call);
+    call->set_req(0, rgn);
+  }
+
+  // Create new_iff
+  uint  iffdd  = dom_depth(iff);
+  IdealLoopTree* lp = get_loop(iff);
+  IfNode *new_iff = new (C, 2) IfNode(iff->in(0), NULL, iff->_prob, iff->_fcnt);
+  register_node(new_iff, lp, idom(iff), iffdd);
+  Node *if_cont = new (C, 1) IfTrueNode(new_iff);
+  Node *if_uct  = new (C, 1) IfFalseNode(new_iff);
+  if (cont_proj->is_IfFalse()) {
+    // Swap
+    Node* tmp = if_uct; if_uct = if_cont; if_cont = tmp;
+  }
+  register_node(if_cont, lp, new_iff, iffdd);
+  register_node(if_uct, get_loop(rgn), new_iff, iffdd);
+
+  // if_cont to iff
+  _igvn.hash_delete(iff);
+  iff->set_req(0, if_cont);
+  set_idom(iff, if_cont, dom_depth(iff));
+
+  // if_uct to rgn
+  _igvn.hash_delete(rgn);
+  rgn->add_req(if_uct);
+  Node* ridom = idom(rgn);
+  Node* nrdom = dom_lca(ridom, new_iff);
+  set_idom(rgn, nrdom, dom_depth(rgn));
+
+  // rgn must have no phis
+  assert(!rgn->as_Region()->has_phi(), "region must have no phis");
+
+  return if_cont->as_Proj();
+}
+
+//------------------------------find_predicate_insertion_point--------------------------
+// Find a good location to insert a predicate
+ProjNode* PhaseIdealLoop::find_predicate_insertion_point(Node* start_c) {
+  if (start_c == C->root() || !start_c->is_Proj())
+    return NULL;
+  if (is_uncommon_trap_if_pattern(start_c->as_Proj(), true/*Reason_Predicate*/)) {
+    return start_c->as_Proj();
+  }
+  return NULL;
+}
+
+//------------------------------Invariance-----------------------------------
+// Helper class for loop_predication_impl to compute invariance on the fly and
+// clone invariants.
+class Invariance : public StackObj {
+  VectorSet _visited, _invariant;
+  Node_Stack _stack;
+  VectorSet _clone_visited;
+  Node_List _old_new; // map of old to new (clone)
+  IdealLoopTree* _lpt;
+  PhaseIdealLoop* _phase;
+
+  // Helper function to set up the invariance for invariance computation
+  // If n is a known invariant, set up directly. Otherwise, look up the
+  // the possibility to push n onto the stack for further processing.
+  void visit(Node* use, Node* n) {
+    if (_lpt->is_invariant(n)) { // known invariant
+      _invariant.set(n->_idx);
+    } else if (!n->is_CFG()) {
+      Node *n_ctrl = _phase->ctrl_or_self(n);
+      Node *u_ctrl = _phase->ctrl_or_self(use); // self if use is a CFG
+      if (_phase->is_dominator(n_ctrl, u_ctrl)) {
+        _stack.push(n, n->in(0) == NULL ? 1 : 0);
+      }
+    }
+  }
+
+  // Compute invariance for "the_node" and (possibly) all its inputs recursively
+  // on the fly
+  void compute_invariance(Node* n) {
+    assert(_visited.test(n->_idx), "must be");
+    visit(n, n);
+    while (_stack.is_nonempty()) {
+      Node*  n = _stack.node();
+      uint idx = _stack.index();
+      if (idx == n->req()) { // all inputs are processed
+        _stack.pop();
+        // n is invariant if it's inputs are all invariant
+        bool all_inputs_invariant = true;
+        for (uint i = 0; i < n->req(); i++) {
+          Node* in = n->in(i);
+          if (in == NULL) continue;
+          assert(_visited.test(in->_idx), "must have visited input");
+          if (!_invariant.test(in->_idx)) { // bad guy
+            all_inputs_invariant = false;
+            break;
+          }
+        }
+        if (all_inputs_invariant) {
+          _invariant.set(n->_idx); // I am a invariant too
+        }
+      } else { // process next input
+        _stack.set_index(idx + 1);
+        Node* m = n->in(idx);
+        if (m != NULL && !_visited.test_set(m->_idx)) {
+          visit(n, m);
+        }
+      }
+    }
+  }
+
+  // Helper function to set up _old_new map for clone_nodes.
+  // If n is a known invariant, set up directly ("clone" of n == n).
+  // Otherwise, push n onto the stack for real cloning.
+  void clone_visit(Node* n) {
+    assert(_invariant.test(n->_idx), "must be invariant");
+    if (_lpt->is_invariant(n)) { // known invariant
+      _old_new.map(n->_idx, n);
+    } else{ // to be cloned
+      assert (!n->is_CFG(), "should not see CFG here");
+      _stack.push(n, n->in(0) == NULL ? 1 : 0);
+    }
+  }
+
+  // Clone "n" and (possibly) all its inputs recursively
+  void clone_nodes(Node* n, Node* ctrl) {
+    clone_visit(n);
+    while (_stack.is_nonempty()) {
+      Node*  n = _stack.node();
+      uint idx = _stack.index();
+      if (idx == n->req()) { // all inputs processed, clone n!
+        _stack.pop();
+        // clone invariant node
+        Node* n_cl = n->clone();
+        _old_new.map(n->_idx, n_cl);
+        _phase->register_new_node(n_cl, ctrl);
+        for (uint i = 0; i < n->req(); i++) {
+          Node* in = n_cl->in(i);
+          if (in == NULL) continue;
+          n_cl->set_req(i, _old_new[in->_idx]);
+        }
+      } else { // process next input
+        _stack.set_index(idx + 1);
+        Node* m = n->in(idx);
+        if (m != NULL && !_clone_visited.test_set(m->_idx)) {
+          clone_visit(m); // visit the input
+        }
+      }
+    }
+  }
+
+ public:
+  Invariance(Arena* area, IdealLoopTree* lpt) :
+    _lpt(lpt), _phase(lpt->_phase),
+    _visited(area), _invariant(area), _stack(area, 10 /* guess */),
+    _clone_visited(area), _old_new(area)
+  {}
+
+  // Map old to n for invariance computation and clone
+  void map_ctrl(Node* old, Node* n) {
+    assert(old->is_CFG() && n->is_CFG(), "must be");
+    _old_new.map(old->_idx, n); // "clone" of old is n
+    _invariant.set(old->_idx);  // old is invariant
+    _clone_visited.set(old->_idx);
+  }
+
+  // Driver function to compute invariance
+  bool is_invariant(Node* n) {
+    if (!_visited.test_set(n->_idx))
+      compute_invariance(n);
+    return (_invariant.test(n->_idx) != 0);
+  }
+
+  // Driver function to clone invariant
+  Node* clone(Node* n, Node* ctrl) {
+    assert(ctrl->is_CFG(), "must be");
+    assert(_invariant.test(n->_idx), "must be an invariant");
+    if (!_clone_visited.test(n->_idx))
+      clone_nodes(n, ctrl);
+    return _old_new[n->_idx];
+  }
+};
+
+//------------------------------is_range_check_if -----------------------------------
+// Returns true if the predicate of iff is in "scale*iv + offset u< load_range(ptr)" format
+// Note: this function is particularly designed for loop predication. We require load_range
+//       and offset to be loop invariant computed on the fly by "invar"
+bool IdealLoopTree::is_range_check_if(IfNode *iff, PhaseIdealLoop *phase, Invariance& invar) const {
+  if (!is_loop_exit(iff)) {
+    return false;
+  }
+  if (!iff->in(1)->is_Bool()) {
+    return false;
+  }
+  const BoolNode *bol = iff->in(1)->as_Bool();
+  if (bol->_test._test != BoolTest::lt) {
+    return false;
+  }
+  if (!bol->in(1)->is_Cmp()) {
+    return false;
+  }
+  const CmpNode *cmp = bol->in(1)->as_Cmp();
+  if (cmp->Opcode() != Op_CmpU ) {
+    return false;
+  }
+  if (cmp->in(2)->Opcode() != Op_LoadRange) {
+    return false;
+  }
+  LoadRangeNode* lr = (LoadRangeNode*)cmp->in(2);
+  if (!invar.is_invariant(lr)) { // loadRange must be invariant
+    return false;
+  }
+  Node *iv     = _head->as_CountedLoop()->phi();
+  int   scale  = 0;
+  Node *offset = NULL;
+  if (!phase->is_scaled_iv_plus_offset(cmp->in(1), iv, &scale, &offset)) {
+    return false;
+  }
+  if(offset && !invar.is_invariant(offset)) { // offset must be invariant
+    return false;
+  }
+  return true;
+}
+
+//------------------------------rc_predicate-----------------------------------
+// Create a range check predicate
+//
+// for (i = init; i < limit; i += stride) {
+//    a[scale*i+offset]
+// }
+//
+// Compute max(scale*i + offset) for init <= i < limit and build the predicate
+// as "max(scale*i + offset) u< a.length".
+//
+// There are two cases for max(scale*i + offset):
+// (1) stride*scale > 0
+//   max(scale*i + offset) = scale*(limit-stride) + offset
+// (2) stride*scale < 0
+//   max(scale*i + offset) = scale*init + offset
+BoolNode* PhaseIdealLoop::rc_predicate(Node* ctrl,
+                                       int scale, Node* offset,
+                                       Node* init, Node* limit, Node* stride,
+                                       Node* range) {
+  Node* max_idx_expr  = init;
+  int stride_con = stride->get_int();
+  if ((stride_con > 0) == (scale > 0)) {
+    max_idx_expr = new (C, 3) SubINode(limit, stride);
+    register_new_node(max_idx_expr, ctrl);
+  }
+
+  if (scale != 1) {
+    ConNode* con_scale = _igvn.intcon(scale);
+    max_idx_expr = new (C, 3) MulINode(max_idx_expr, con_scale);
+    register_new_node(max_idx_expr, ctrl);
+  }
+
+  if (offset && (!offset->is_Con() || offset->get_int() != 0)){
+    max_idx_expr = new (C, 3) AddINode(max_idx_expr, offset);
+    register_new_node(max_idx_expr, ctrl);
+  }
+
+  CmpUNode* cmp = new (C, 3) CmpUNode(max_idx_expr, range);
+  register_new_node(cmp, ctrl);
+  BoolNode* bol = new (C, 2) BoolNode(cmp, BoolTest::lt);
+  register_new_node(bol, ctrl);
+  return bol;
+}
+
+//------------------------------ loop_predication_impl--------------------------
+// Insert loop predicates for null checks and range checks
+bool PhaseIdealLoop::loop_predication_impl(IdealLoopTree *loop) {
+  if (!UseLoopPredicate) return false;
+
+  if (!loop->_head->is_Loop()) {
+    // Could be a simple region when irreducible loops are present.
+    return false;
+  }
+
+  CountedLoopNode *cl = NULL;
+  if (loop->_head->is_CountedLoop()) {
+    cl = loop->_head->as_CountedLoop();
+    // do nothing for iteration-splitted loops
+    if (!cl->is_normal_loop()) return false;
+  }
+
+  // Too many traps seen?
+  bool tmt = C->too_many_traps(C->method(), 0, Deoptimization::Reason_predicate);
+  int tc = C->trap_count(Deoptimization::Reason_predicate);
+  if (tmt || tc > 0) {
+    if (TraceLoopPredicate) {
+      tty->print_cr("too many predicate traps: %d", tc);
+      C->method()->print(); // which method has too many predicate traps
+      tty->print_cr("");
+    }
+    return false;
+  }
+
+  LoopNode *lpn  = loop->_head->as_Loop();
+  Node* entry = lpn->in(LoopNode::EntryControl);
+
+  ProjNode *predicate_proj = find_predicate_insertion_point(entry);
+  if (!predicate_proj){
+#ifndef PRODUCT
+    if (TraceLoopPredicate) {
+      tty->print("missing predicate:");
+      loop->dump_head();
+    }
+#endif
+    return false;
+  }
+
+  ConNode* zero = _igvn.intcon(0);
+  set_ctrl(zero, C->root());
+  Node *cond_false = new (C, 2) Conv2BNode(zero);
+  register_new_node(cond_false, C->root());
+  ConNode* one = _igvn.intcon(1);
+  set_ctrl(one, C->root());
+  Node *cond_true = new (C, 2) Conv2BNode(one);
+  register_new_node(cond_true, C->root());
+
+  ResourceArea *area = Thread::current()->resource_area();
+  Invariance invar(area, loop);
+
+  // Create list of if-projs such that a newer proj dominates all older
+  // projs in the list, and they all dominate loop->tail()
+  Node_List if_proj_list(area);
+  LoopNode *head  = loop->_head->as_Loop();
+  Node *current_proj = loop->tail(); //start from tail
+  while ( current_proj != head ) {
+    if (loop == get_loop(current_proj) && // still in the loop ?
+        current_proj->is_Proj()        && // is a projection  ?
+        current_proj->in(0)->Opcode() == Op_If) { // is a if projection ?
+      if_proj_list.push(current_proj);
+    }
+    current_proj = idom(current_proj);
+  }
+
+  bool hoisted = false; // true if at least one proj is promoted
+  while (if_proj_list.size() > 0) {
+    // Following are changed to nonnull when a predicate can be hoisted
+    ProjNode* new_predicate_proj = NULL;
+    BoolNode* new_predicate_bol   = NULL;
+
+    ProjNode* proj = if_proj_list.pop()->as_Proj();
+    IfNode*   iff  = proj->in(0)->as_If();
+
+    if (!is_uncommon_trap_if_pattern(proj)) {
+      if (loop->is_loop_exit(iff)) {
+        // stop processing the remaining projs in the list because the execution of them
+        // depends on the condition of "iff" (iff->in(1)).
+        break;
+      } else {
+        // Both arms are inside the loop. There are two cases:
+        // (1) there is one backward branch. In this case, any remaining proj
+        //     in the if_proj list post-dominates "iff". So, the condition of "iff"
+        //     does not determine the execution the remining projs directly, and we
+        //     can safely continue.
+        // (2) both arms are forwarded, i.e. a diamond shape. In this case, "proj"
+        //     does not dominate loop->tail(), so it can not be in the if_proj list.
+        continue;
+      }
+    }
+
+    Node*     test = iff->in(1);
+    if (!test->is_Bool()){ //Conv2B, ...
+      continue;
+    }
+    BoolNode* bol = test->as_Bool();
+    if (invar.is_invariant(bol)) {
+      // Invariant test
+      new_predicate_proj = create_new_if_for_predicate(predicate_proj);
+      Node* ctrl = new_predicate_proj->in(0)->as_If()->in(0);
+      new_predicate_bol  = invar.clone(bol, ctrl)->as_Bool();
+      if (TraceLoopPredicate) tty->print("invariant");
+    } else if (cl != NULL && loop->is_range_check_if(iff, this, invar)) {
+      // Range check (only for counted loops)
+      new_predicate_proj = create_new_if_for_predicate(predicate_proj);
+      Node *ctrl = new_predicate_proj->in(0)->as_If()->in(0);
+      const Node*    cmp    = bol->in(1)->as_Cmp();
+      Node*          idx    = cmp->in(1);
+      assert(!invar.is_invariant(idx), "index is variant");
+      assert(cmp->in(2)->Opcode() == Op_LoadRange, "must be");
+      LoadRangeNode* ld_rng = (LoadRangeNode*)cmp->in(2); // LoadRangeNode
+      assert(invar.is_invariant(ld_rng), "load range must be invariant");
+      ld_rng = (LoadRangeNode*)invar.clone(ld_rng, ctrl);
+      int scale    = 1;
+      Node* offset = zero;
+      bool ok = is_scaled_iv_plus_offset(idx, cl->phi(), &scale, &offset);
+      assert(ok, "must be index expression");
+      if (offset && offset != zero) {
+        assert(invar.is_invariant(offset), "offset must be loop invariant");
+        offset = invar.clone(offset, ctrl);
+      }
+      Node* init    = cl->init_trip();
+      Node* limit   = cl->limit();
+      Node* stride  = cl->stride();
+      new_predicate_bol = rc_predicate(ctrl, scale, offset, init, limit, stride, ld_rng);
+      if (TraceLoopPredicate) tty->print("range check");
+    }
+
+    if (new_predicate_proj == NULL) {
+      // The other proj of the "iff" is a uncommon trap projection, and we can assume
+      // the other proj will not be executed ("executed" means uct raised).
+      continue;
+    } else {
+      // Success - attach condition (new_predicate_bol) to predicate if
+      invar.map_ctrl(proj, new_predicate_proj); // so that invariance test can be appropriate
+      IfNode* new_iff = new_predicate_proj->in(0)->as_If();
+
+      // Negate test if necessary
+      if (proj->_con != predicate_proj->_con) {
+        new_predicate_bol = new (C, 2) BoolNode(new_predicate_bol->in(1), new_predicate_bol->_test.negate());
+        register_new_node(new_predicate_bol, new_iff->in(0));
+        if (TraceLoopPredicate) tty->print_cr(" if negated: %d", iff->_idx);
+      } else {
+        if (TraceLoopPredicate) tty->print_cr(" if: %d", iff->_idx);
+      }
+
+      _igvn.hash_delete(new_iff);
+      new_iff->set_req(1, new_predicate_bol);
+
+      _igvn.hash_delete(iff);
+      iff->set_req(1, proj->is_IfFalse() ? cond_false : cond_true);
+
+      Node* ctrl = new_predicate_proj; // new control
+      ProjNode* dp = proj;     // old control
+      assert(get_loop(dp) == loop, "guarenteed at the time of collecting proj");
+      // Find nodes (depends only on the test) off the surviving projection;
+      // move them outside the loop with the control of proj_clone
+      for (DUIterator_Fast imax, i = dp->fast_outs(imax); i < imax; i++) {
+        Node* cd = dp->fast_out(i); // Control-dependent node
+        if (cd->depends_only_on_test()) {
+          assert(cd->in(0) == dp, "");
+          _igvn.hash_delete(cd);
+          cd->set_req(0, ctrl); // ctrl, not NULL
+          set_early_ctrl(cd);
+          _igvn._worklist.push(cd);
+          IdealLoopTree *new_loop = get_loop(get_ctrl(cd));
+          if (new_loop != loop) {
+            if (!loop->_child) loop->_body.yank(cd);
+            if (!new_loop->_child ) new_loop->_body.push(cd);
+          }
+          --i;
+          --imax;
+        }
+      }
+
+      hoisted = true;
+      C->set_major_progress();
+    }
+  } // end while
+
+#ifndef PRODUCT
+    // report that the loop predication has been actually performed
+    // for this loop
+    if (TraceLoopPredicate && hoisted) {
+      tty->print("Loop Predication Performed:");
+      loop->dump_head();
+    }
+#endif
+
+  return hoisted;
+}
+
+//------------------------------loop_predication--------------------------------
+// driver routine for loop predication optimization
+bool IdealLoopTree::loop_predication( PhaseIdealLoop *phase) {
+  bool hoisted = false;
+  // Recursively promote predicates
+  if ( _child ) {
+    hoisted = _child->loop_predication( phase);
+  }
+
+  // self
+  if (!_irreducible && !tail()->is_top()) {
+    hoisted |= phase->loop_predication_impl(this);
+  }
+
+  if ( _next ) { //sibling
+    hoisted |= _next->loop_predication( phase);
+  }
+
+  return hoisted;
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/loopnode.cpp
--- a/src/share/vm/opto/loopnode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/loopnode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1279,7 +1279,8 @@
     // Visit all children, looking for Phis
     for (DUIterator i = cl->outs(); cl->has_out(i); i++) {
       Node *out = cl->out(i);
-      if (!out->is_Phi() || out == phi)  continue; // Looking for other phis
+      // Look for other phis (secondary IVs). Skip dead ones
+      if (!out->is_Phi() || out == phi || !phase->has_node(out)) continue;
       PhiNode* phi2 = out->as_Phi();
       Node *incr2 = phi2->in( LoopNode::LoopBackControl );
       // Look for induction variables of the form:  X += constant
@@ -1419,14 +1420,59 @@
   }
 }
 
+//---------------------collect_potentially_useful_predicates-----------------------
+// Helper function to collect potentially useful predicates to prevent them from
+// being eliminated by PhaseIdealLoop::eliminate_useless_predicates
+void PhaseIdealLoop::collect_potentially_useful_predicates(
+                         IdealLoopTree * loop, Unique_Node_List &useful_predicates) {
+  if (loop->_child) { // child
+    collect_potentially_useful_predicates(loop->_child, useful_predicates);
+  }
+
+  // self (only loops that we can apply loop predication may use their predicates)
+  if (loop->_head->is_Loop()     &&
+      !loop->_irreducible        &&
+      !loop->tail()->is_top()) {
+    LoopNode *lpn  = loop->_head->as_Loop();
+    Node* entry = lpn->in(LoopNode::EntryControl);
+    ProjNode *predicate_proj = find_predicate_insertion_point(entry);
+    if (predicate_proj != NULL ) { // right pattern that can be used by loop predication
+      assert(entry->in(0)->in(1)->in(1)->Opcode()==Op_Opaque1, "must be");
+      useful_predicates.push(entry->in(0)->in(1)->in(1)); // good one
+    }
+  }
+
+  if ( loop->_next ) { // sibling
+    collect_potentially_useful_predicates(loop->_next, useful_predicates);
+  }
+}
+
+//------------------------eliminate_useless_predicates-----------------------------
+// Eliminate all inserted predicates if they could not be used by loop predication.
+void PhaseIdealLoop::eliminate_useless_predicates() {
+  if (C->predicate_count() == 0) return; // no predicate left
+
+  Unique_Node_List useful_predicates; // to store useful predicates
+  if (C->has_loops()) {
+    collect_potentially_useful_predicates(_ltree_root->_child, useful_predicates);
+  }
+
+  for (int i = C->predicate_count(); i > 0; i--) {
+     Node * n = C->predicate_opaque1_node(i-1);
+     assert(n->Opcode() == Op_Opaque1, "must be");
+     if (!useful_predicates.member(n)) { // not in the useful list
+       _igvn.replace_node(n, n->in(1));
+     }
+  }
+}
+
 //=============================================================================
-//------------------------------PhaseIdealLoop---------------------------------
+//----------------------------build_and_optimize-------------------------------
 // Create a PhaseLoop.  Build the ideal Loop tree.  Map each Ideal Node to
 // its corresponding LoopNode.  If 'optimize' is true, do some loop cleanups.
-PhaseIdealLoop::PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify_me, bool do_split_ifs )
-  : PhaseTransform(Ideal_Loop),
-    _igvn(igvn),
-    _dom_lca_tags(C->comp_arena()) {
+void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool do_loop_pred) {
+  int old_progress = C->major_progress();
+
   // Reset major-progress flag for the driver's heuristics
   C->clear_major_progress();
 
@@ -1465,18 +1511,20 @@
   }
 
   // No loops after all
-  if( !_ltree_root->_child ) C->set_has_loops(false);
+  if( !_ltree_root->_child && !_verify_only ) C->set_has_loops(false);
 
   // There should always be an outer loop containing the Root and Return nodes.
   // If not, we have a degenerate empty program.  Bail out in this case.
   if (!has_node(C->root())) {
-    C->clear_major_progress();
-    C->record_method_not_compilable("empty program detected during loop optimization");
+    if (!_verify_only) {
+      C->clear_major_progress();
+      C->record_method_not_compilable("empty program detected during loop optimization");
+    }
     return;
   }
 
   // Nothing to do, so get out
-  if( !C->has_loops() && !do_split_ifs && !verify_me) {
+  if( !C->has_loops() && !do_split_ifs && !_verify_me && !_verify_only ) {
     _igvn.optimize();           // Cleanup NeverBranches
     return;
   }
@@ -1486,7 +1534,7 @@
 
   // Split shared headers and insert loop landing pads.
   // Do not bother doing this on the Root loop of course.
-  if( !verify_me && _ltree_root->_child ) {
+  if( !_verify_me && !_verify_only && _ltree_root->_child ) {
     if( _ltree_root->_child->beautify_loops( this ) ) {
       // Re-build loop tree!
       _ltree_root->_child = NULL;
@@ -1515,24 +1563,26 @@
 
   Dominators();
 
-  // As a side effect, Dominators removed any unreachable CFG paths
-  // into RegionNodes.  It doesn't do this test against Root, so
-  // we do it here.
-  for( uint i = 1; i < C->root()->req(); i++ ) {
-    if( !_nodes[C->root()->in(i)->_idx] ) {    // Dead path into Root?
-      _igvn.hash_delete(C->root());
-      C->root()->del_req(i);
-      _igvn._worklist.push(C->root());
-      i--;                      // Rerun same iteration on compressed edges
+  if (!_verify_only) {
+    // As a side effect, Dominators removed any unreachable CFG paths
+    // into RegionNodes.  It doesn't do this test against Root, so
+    // we do it here.
+    for( uint i = 1; i < C->root()->req(); i++ ) {
+      if( !_nodes[C->root()->in(i)->_idx] ) {    // Dead path into Root?
+        _igvn.hash_delete(C->root());
+        C->root()->del_req(i);
+        _igvn._worklist.push(C->root());
+        i--;                      // Rerun same iteration on compressed edges
+      }
     }
+
+    // Given dominators, try to find inner loops with calls that must
+    // always be executed (call dominates loop tail).  These loops do
+    // not need a separate safepoint.
+    Node_List cisstack(a);
+    _ltree_root->check_safepts(visited, cisstack);
   }
 
-  // Given dominators, try to find inner loops with calls that must
-  // always be executed (call dominates loop tail).  These loops do
-  // not need a separate safepoint.
-  Node_List cisstack(a);
-  _ltree_root->check_safepts(visited, cisstack);
-
   // Walk the DATA nodes and place into loops.  Find earliest control
   // node.  For CFG nodes, the _nodes array starts out and remains
   // holding the associated IdealLoopTree pointer.  For DATA nodes, the
@@ -1548,11 +1598,11 @@
   // it will be processed among C->top() inputs
   worklist.push( C->top() );
   visited.set( C->top()->_idx ); // Set C->top() as visited now
-  build_loop_early( visited, worklist, nstack, verify_me );
+  build_loop_early( visited, worklist, nstack );
 
   // Given early legal placement, try finding counted loops.  This placement
   // is good enough to discover most loop invariants.
-  if( !verify_me )
+  if( !_verify_me && !_verify_only )
     _ltree_root->counted_loop( this );
 
   // Find latest loop placement.  Find ideal loop placement.
@@ -1562,16 +1612,31 @@
   worklist.push( C->root() );
   NOT_PRODUCT( C->verify_graph_edges(); )
   worklist.push( C->top() );
-  build_loop_late( visited, worklist, nstack, verify_me );
+  build_loop_late( visited, worklist, nstack );
+
+  if (_verify_only) {
+    // restore major progress flag
+    for (int i = 0; i < old_progress; i++)
+      C->set_major_progress();
+    assert(C->unique() == unique, "verification mode made Nodes? ? ?");
+    assert(_igvn._worklist.size() == 0, "shouldn't push anything");
+    return;
+  }
+
+  // some parser-inserted loop predicates could never be used by loop
+  // predication. Eliminate them before loop optimization
+  if (UseLoopPredicate) {
+    eliminate_useless_predicates();
+  }
 
   // clear out the dead code
   while(_deadlist.size()) {
-    igvn.remove_globally_dead_node(_deadlist.pop());
+    _igvn.remove_globally_dead_node(_deadlist.pop());
   }
 
 #ifndef PRODUCT
   C->verify_graph_edges();
-  if( verify_me ) {             // Nested verify pass?
+  if( _verify_me ) {             // Nested verify pass?
     // Check to see if the verify mode is broken
     assert(C->unique() == unique, "non-optimize mode made Nodes? ? ?");
     return;
@@ -1590,7 +1655,7 @@
       // Because RCE opportunities can be masked by split_thru_phi,
       // look for RCE candidates and inhibit split_thru_phi
       // on just their loop-phi's for this pass of loop opts
-      if( SplitIfBlocks && do_split_ifs ) {
+      if (SplitIfBlocks && do_split_ifs) {
         if (lpt->policy_range_check(this)) {
           lpt->_rce_candidate = 1; // = true
         }
@@ -1606,12 +1671,17 @@
     NOT_PRODUCT( if( VerifyLoopOptimizations ) verify(); );
   }
 
+  // Perform loop predication before iteration splitting
+  if (do_loop_pred && C->has_loops() && !C->major_progress()) {
+    _ltree_root->_child->loop_predication(this);
+  }
+
   // Perform iteration-splitting on inner loops.  Split iterations to avoid
   // range checks or one-shot null checks.
 
   // If split-if's didn't hack the graph too bad (no CFG changes)
   // then do loop opts.
-  if( C->has_loops() && !C->major_progress() ) {
+  if (C->has_loops() && !C->major_progress()) {
     memset( worklist.adr(), 0, worklist.Size()*sizeof(Node*) );
     _ltree_root->_child->iteration_split( this, worklist );
     // No verify after peeling!  GCM has hoisted code out of the loop.
@@ -1623,7 +1693,7 @@
   // Do verify graph edges in any case
   NOT_PRODUCT( C->verify_graph_edges(); );
 
-  if( !do_split_ifs ) {
+  if (!do_split_ifs) {
     // We saw major progress in Split-If to get here.  We forced a
     // pass with unrolling and not split-if, however more split-if's
     // might make progress.  If the unrolling didn't make progress
@@ -1678,7 +1748,7 @@
 void PhaseIdealLoop::verify() const {
   int old_progress = C->major_progress();
   ResourceMark rm;
-  PhaseIdealLoop loop_verify( _igvn, this, false );
+  PhaseIdealLoop loop_verify( _igvn, this );
   VectorSet visited(Thread::current()->resource_area());
 
   fail = 0;
@@ -2138,54 +2208,58 @@
         // optimizing an infinite loop?
         l = _ltree_root;        // Oops, found infinite loop
 
-        // Insert the NeverBranch between 'm' and it's control user.
-        NeverBranchNode *iff = new (C, 1) NeverBranchNode( m );
-        _igvn.register_new_node_with_optimizer(iff);
-        set_loop(iff, l);
-        Node *if_t = new (C, 1) CProjNode( iff, 0 );
-        _igvn.register_new_node_with_optimizer(if_t);
-        set_loop(if_t, l);
+        if (!_verify_only) {
+          // Insert the NeverBranch between 'm' and it's control user.
+          NeverBranchNode *iff = new (C, 1) NeverBranchNode( m );
+          _igvn.register_new_node_with_optimizer(iff);
+          set_loop(iff, l);
+          Node *if_t = new (C, 1) CProjNode( iff, 0 );
+          _igvn.register_new_node_with_optimizer(if_t);
+          set_loop(if_t, l);
 
-        Node* cfg = NULL;       // Find the One True Control User of m
-        for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
-          Node* x = m->fast_out(j);
-          if (x->is_CFG() && x != m && x != iff)
-            { cfg = x; break; }
+          Node* cfg = NULL;       // Find the One True Control User of m
+          for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
+            Node* x = m->fast_out(j);
+            if (x->is_CFG() && x != m && x != iff)
+              { cfg = x; break; }
+          }
+          assert(cfg != NULL, "must find the control user of m");
+          uint k = 0;             // Probably cfg->in(0)
+          while( cfg->in(k) != m ) k++; // But check incase cfg is a Region
+          cfg->set_req( k, if_t ); // Now point to NeverBranch
+
+          // Now create the never-taken loop exit
+          Node *if_f = new (C, 1) CProjNode( iff, 1 );
+          _igvn.register_new_node_with_optimizer(if_f);
+          set_loop(if_f, l);
+          // Find frame ptr for Halt.  Relies on the optimizer
+          // V-N'ing.  Easier and quicker than searching through
+          // the program structure.
+          Node *frame = new (C, 1) ParmNode( C->start(), TypeFunc::FramePtr );
+          _igvn.register_new_node_with_optimizer(frame);
+          // Halt & Catch Fire
+          Node *halt = new (C, TypeFunc::Parms) HaltNode( if_f, frame );
+          _igvn.register_new_node_with_optimizer(halt);
+          set_loop(halt, l);
+          C->root()->add_req(halt);
         }
-        assert(cfg != NULL, "must find the control user of m");
-        uint k = 0;             // Probably cfg->in(0)
-        while( cfg->in(k) != m ) k++; // But check incase cfg is a Region
-        cfg->set_req( k, if_t ); // Now point to NeverBranch
-
-        // Now create the never-taken loop exit
-        Node *if_f = new (C, 1) CProjNode( iff, 1 );
-        _igvn.register_new_node_with_optimizer(if_f);
-        set_loop(if_f, l);
-        // Find frame ptr for Halt.  Relies on the optimizer
-        // V-N'ing.  Easier and quicker than searching through
-        // the program structure.
-        Node *frame = new (C, 1) ParmNode( C->start(), TypeFunc::FramePtr );
-        _igvn.register_new_node_with_optimizer(frame);
-        // Halt & Catch Fire
-        Node *halt = new (C, TypeFunc::Parms) HaltNode( if_f, frame );
-        _igvn.register_new_node_with_optimizer(halt);
-        set_loop(halt, l);
-        C->root()->add_req(halt);
         set_loop(C->root(), _ltree_root);
       }
     }
     // Weeny check for irreducible.  This child was already visited (this
     // IS the post-work phase).  Is this child's loop header post-visited
     // as well?  If so, then I found another entry into the loop.
-    while( is_postvisited(l->_head) ) {
-      // found irreducible
-      l->_irreducible = 1; // = true
-      l = l->_parent;
-      _has_irreducible_loops = true;
-      // Check for bad CFG here to prevent crash, and bailout of compile
-      if (l == NULL) {
-        C->record_method_not_compilable("unhandled CFG detected during loop optimization");
-        return pre_order;
+    if (!_verify_only) {
+      while( is_postvisited(l->_head) ) {
+        // found irreducible
+        l->_irreducible = 1; // = true
+        l = l->_parent;
+        _has_irreducible_loops = true;
+        // Check for bad CFG here to prevent crash, and bailout of compile
+        if (l == NULL) {
+          C->record_method_not_compilable("unhandled CFG detected during loop optimization");
+          return pre_order;
+        }
       }
     }
 
@@ -2253,7 +2327,7 @@
 // Put Data nodes into some loop nest, by setting the _nodes[]->loop mapping.
 // First pass computes the earliest controlling node possible.  This is the
 // controlling input with the deepest dominating depth.
-void PhaseIdealLoop::build_loop_early( VectorSet &visited, Node_List &worklist, Node_Stack &nstack, const PhaseIdealLoop *verify_me ) {
+void PhaseIdealLoop::build_loop_early( VectorSet &visited, Node_List &worklist, Node_Stack &nstack ) {
   while (worklist.size() != 0) {
     // Use local variables nstack_top_n & nstack_top_i to cache values
     // on nstack's top.
@@ -2285,7 +2359,7 @@
           // (the old code here would yank a 2nd safepoint after seeing a
           // first one, even though the 1st did not dominate in the loop body
           // and thus could be avoided indefinitely)
-          if( !verify_me && ilt->_has_sfpt && n->Opcode() == Op_SafePoint &&
+          if( !_verify_only && !_verify_me && ilt->_has_sfpt && n->Opcode() == Op_SafePoint &&
               is_deleteable_safept(n)) {
             Node *in = n->in(TypeFunc::Control);
             lazy_replace(n,in);       // Pull safepoint now
@@ -2408,12 +2482,31 @@
   return LCA;
 }
 
-//------------------------------get_late_ctrl----------------------------------
-// Compute latest legal control.
-Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
-  assert(early != NULL, "early control should not be NULL");
+bool PhaseIdealLoop::verify_dominance(Node* n, Node* use, Node* LCA, Node* early) {
+  bool had_error = false;
+#ifdef ASSERT
+  if (early != C->root()) {
+    // Make sure that there's a dominance path from use to LCA
+    Node* d = use;
+    while (d != LCA) {
+      d = idom(d);
+      if (d == C->root()) {
+        tty->print_cr("*** Use %d isn't dominated by def %s", use->_idx, n->_idx);
+        n->dump();
+        use->dump();
+        had_error = true;
+        break;
+      }
+    }
+  }
+#endif
+  return had_error;
+}
 
+
+Node* PhaseIdealLoop::compute_lca_of_uses(Node* n, Node* early, bool verify) {
   // Compute LCA over list of uses
+  bool had_error = false;
   Node *LCA = NULL;
   for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax && LCA != early; i++) {
     Node* c = n->fast_out(i);
@@ -2423,15 +2516,34 @@
       for( uint j=1; j<c->req(); j++ ) {// For all inputs
         if( c->in(j) == n ) {   // Found matching input?
           Node *use = c->in(0)->in(j);
+          if (_verify_only && use->is_top()) continue;
           LCA = dom_lca_for_get_late_ctrl( LCA, use, n );
+          if (verify) had_error = verify_dominance(n, use, LCA, early) || had_error;
         }
       }
     } else {
       // For CFG data-users, use is in the block just prior
       Node *use = has_ctrl(c) ? get_ctrl(c) : c->in(0);
       LCA = dom_lca_for_get_late_ctrl( LCA, use, n );
+      if (verify) had_error = verify_dominance(n, use, LCA, early) || had_error;
     }
   }
+  assert(!had_error, "bad dominance");
+  return LCA;
+}
+
+//------------------------------get_late_ctrl----------------------------------
+// Compute latest legal control.
+Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
+  assert(early != NULL, "early control should not be NULL");
+
+  Node* LCA = compute_lca_of_uses(n, early);
+#ifdef ASSERT
+  if (LCA == C->root() && LCA != early) {
+    // def doesn't dominate uses so print some useful debugging output
+    compute_lca_of_uses(n, early, true);
+  }
+#endif
 
   // if this is a load, check for anti-dependent stores
   // We use a conservative algorithm to identify potential interfering
@@ -2576,7 +2688,7 @@
 //------------------------------build_loop_late--------------------------------
 // Put Data nodes into some loop nest, by setting the _nodes[]->loop mapping.
 // Second pass finds latest legal placement, and ideal loop placement.
-void PhaseIdealLoop::build_loop_late( VectorSet &visited, Node_List &worklist, Node_Stack &nstack, const PhaseIdealLoop *verify_me ) {
+void PhaseIdealLoop::build_loop_late( VectorSet &visited, Node_List &worklist, Node_Stack &nstack ) {
   while (worklist.size() != 0) {
     Node *n = worklist.pop();
     // Only visit once
@@ -2612,7 +2724,7 @@
         }
       } else {
         // All of n's children have been processed, complete post-processing.
-        build_loop_late_post(n, verify_me);
+        build_loop_late_post(n);
         if (nstack.is_empty()) {
           // Finished all nodes on stack.
           // Process next node on the worklist.
@@ -2631,9 +2743,9 @@
 //------------------------------build_loop_late_post---------------------------
 // Put Data nodes into some loop nest, by setting the _nodes[]->loop mapping.
 // Second pass finds latest legal placement, and ideal loop placement.
-void PhaseIdealLoop::build_loop_late_post( Node *n, const PhaseIdealLoop *verify_me ) {
+void PhaseIdealLoop::build_loop_late_post( Node *n ) {
 
-  if (n->req() == 2 && n->Opcode() == Op_ConvI2L && !C->major_progress()) {
+  if (n->req() == 2 && n->Opcode() == Op_ConvI2L && !C->major_progress() && !_verify_only) {
     _igvn._worklist.push(n);  // Maybe we'll normalize it, if no more loops.
   }
 
@@ -2708,12 +2820,29 @@
   Node *legal = LCA;            // Walk 'legal' up the IDOM chain
   Node *least = legal;          // Best legal position so far
   while( early != legal ) {     // While not at earliest legal
+#ifdef ASSERT
+    if (legal->is_Start() && !early->is_Root()) {
+      // Bad graph. Print idom path and fail.
+      tty->print_cr( "Bad graph detected in build_loop_late");
+      tty->print("n: ");n->dump(); tty->cr();
+      tty->print("early: ");early->dump(); tty->cr();
+      int ct = 0;
+      Node *dbg_legal = LCA;
+      while(!dbg_legal->is_Start() && ct < 100) {
+        tty->print("idom[%d] ",ct); dbg_legal->dump(); tty->cr();
+        ct++;
+        dbg_legal = idom(dbg_legal);
+      }
+      assert(false, "Bad graph detected in build_loop_late");
+    }
+#endif
     // Find least loop nesting depth
     legal = idom(legal);        // Bump up the IDOM tree
     // Check for lower nesting depth
     if( get_loop(legal)->_nest < get_loop(least)->_nest )
       least = legal;
   }
+  assert(early == legal || legal != C->root(), "bad dominance of inputs");
 
   // Try not to place code on a loop entry projection
   // which can inhibit range check elimination.
@@ -2731,8 +2860,8 @@
 #ifdef ASSERT
   // If verifying, verify that 'verify_me' has a legal location
   // and choose it as our location.
-  if( verify_me ) {
-    Node *v_ctrl = verify_me->get_ctrl_no_update(n);
+  if( _verify_me ) {
+    Node *v_ctrl = _verify_me->get_ctrl_no_update(n);
     Node *legal = LCA;
     while( early != legal ) {   // While not at earliest legal
       if( legal == v_ctrl ) break;  // Check for prior good location
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/loopnode.hpp
--- a/src/share/vm/opto/loopnode.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/loopnode.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 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
@@ -30,6 +30,7 @@
 class Node;
 class PhaseIdealLoop;
 class VectorSet;
+class Invariance;
 struct small_cache;
 
 //
@@ -325,6 +326,10 @@
   // Returns TRUE if loop tree is structurally changed.
   bool beautify_loops( PhaseIdealLoop *phase );
 
+  // Perform optimization to use the loop predicates for null checks and range checks.
+  // Applies to any loop level (not just the innermost one)
+  bool loop_predication( PhaseIdealLoop *phase);
+
   // Perform iteration-splitting on inner loops.  Split iterations to
   // avoid range checks or one-shot null checks.  Returns false if the
   // current round of loop opts should stop.
@@ -395,6 +400,9 @@
   // into longer memory ops, we may want to increase alignment.
   bool policy_align( PhaseIdealLoop *phase ) const;
 
+  // Return TRUE if "iff" is a range check.
+  bool is_range_check_if(IfNode *iff, PhaseIdealLoop *phase, Invariance& invar) const;
+
   // Compute loop trip count from profile data
   void compute_profile_trip_cnt( PhaseIdealLoop *phase );
 
@@ -442,6 +450,9 @@
   uint *_preorders;
   uint _max_preorder;
 
+  const PhaseIdealLoop* _verify_me;
+  bool _verify_only;
+
   // Allocate _preorders[] array
   void allocate_preorders() {
     _max_preorder = C->unique()+8;
@@ -497,6 +508,12 @@
   Node_Array _dom_lca_tags;
   void   init_dom_lca_tags();
   void   clear_dom_lca_tags();
+
+  // Helper for debugging bad dominance relationships
+  bool verify_dominance(Node* n, Node* use, Node* LCA, Node* early);
+
+  Node* compute_lca_of_uses(Node* n, Node* early, bool verify = false);
+
   // Inline wrapper for frequent cases:
   // 1) only one use
   // 2) a use is the same as the current LCA passed as 'n1'
@@ -511,8 +528,6 @@
     return find_non_split_ctrl(n);
   }
   Node *dom_lca_for_get_late_ctrl_internal( Node *lca, Node *n, Node *tag );
-  // true if CFG node d dominates CFG node n
-  bool is_dominator(Node *d, Node *n);
 
   // Helper function for directing control inputs away from CFG split
   // points.
@@ -562,6 +577,17 @@
     assert(n == find_non_split_ctrl(n), "must return legal ctrl" );
     return n;
   }
+  // true if CFG node d dominates CFG node n
+  bool is_dominator(Node *d, Node *n);
+  // return get_ctrl for a data node and self(n) for a CFG node
+  Node* ctrl_or_self(Node* n) {
+    if (has_ctrl(n))
+      return get_ctrl(n);
+    else {
+      assert (n->is_CFG(), "must be a CFG node");
+      return n;
+    }
+  }
 
 private:
   Node *get_ctrl_no_update( Node *i ) const {
@@ -590,7 +616,7 @@
   // Lazy-dazy update of 'get_ctrl' and 'idom_at' mechanisms.  Replace
   // the 'old_node' with 'new_node'.  Kill old-node.  Add a reference
   // from old_node to new_node to support the lazy update.  Reference
-  // replaces loop reference, since that is not neede for dead node.
+  // replaces loop reference, since that is not needed for dead node.
 public:
   void lazy_update( Node *old_node, Node *new_node ) {
     assert( old_node != new_node, "no cycles please" );
@@ -621,9 +647,9 @@
   IdealLoopTree *sort( IdealLoopTree *loop, IdealLoopTree *innermost );
 
   // Place Data nodes in some loop nest
-  void build_loop_early( VectorSet &visited, Node_List &worklist, Node_Stack &nstack, const PhaseIdealLoop *verify_me );
-  void build_loop_late ( VectorSet &visited, Node_List &worklist, Node_Stack &nstack, const PhaseIdealLoop *verify_me );
-  void build_loop_late_post ( Node* n, const PhaseIdealLoop *verify_me );
+  void build_loop_early( VectorSet &visited, Node_List &worklist, Node_Stack &nstack );
+  void build_loop_late ( VectorSet &visited, Node_List &worklist, Node_Stack &nstack );
+  void build_loop_late_post ( Node* n );
 
   // Array of immediate dominance info for each CFG node indexed by node idx
 private:
@@ -662,6 +688,19 @@
   // Is safept not required by an outer loop?
   bool is_deleteable_safept(Node* sfpt);
 
+  // Perform verification that the graph is valid.
+  PhaseIdealLoop( PhaseIterGVN &igvn) :
+    PhaseTransform(Ideal_Loop),
+    _igvn(igvn),
+    _dom_lca_tags(C->comp_arena()),
+    _verify_me(NULL),
+    _verify_only(true) {
+    build_and_optimize(false, false);
+  }
+
+  // build the loop tree and perform any requested optimizations
+  void build_and_optimize(bool do_split_if, bool do_loop_pred);
+
 public:
   // Dominators for the sea of nodes
   void Dominators();
@@ -671,7 +710,32 @@
   Node *dom_lca_internal( Node *n1, Node *n2 ) const;
 
   // Compute the Ideal Node to Loop mapping
-  PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify_me, bool do_split_ifs );
+  PhaseIdealLoop( PhaseIterGVN &igvn, bool do_split_ifs, bool do_loop_pred) :
+    PhaseTransform(Ideal_Loop),
+    _igvn(igvn),
+    _dom_lca_tags(C->comp_arena()),
+    _verify_me(NULL),
+    _verify_only(false) {
+    build_and_optimize(do_split_ifs, do_loop_pred);
+  }
+
+  // Verify that verify_me made the same decisions as a fresh run.
+  PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify_me) :
+    PhaseTransform(Ideal_Loop),
+    _igvn(igvn),
+    _dom_lca_tags(C->comp_arena()),
+    _verify_me(verify_me),
+    _verify_only(false) {
+    build_and_optimize(false, false);
+  }
+
+  // Build and verify the loop tree without modifying the graph.  This
+  // is useful to verify that all inputs properly dominate their uses.
+  static void verify(PhaseIterGVN& igvn) {
+#ifdef ASSERT
+    PhaseIdealLoop v(igvn);
+#endif
+  }
 
   // True if the method has at least 1 irreducible loop
   bool _has_irreducible_loops;
@@ -742,6 +806,30 @@
   // Return true if exp is a scaled induction var plus (or minus) constant
   bool is_scaled_iv_plus_offset(Node* exp, Node* iv, int* p_scale, Node** p_offset, int depth = 0);
 
+  // Return true if proj is for "proj->[region->..]call_uct"
+  bool is_uncommon_trap_proj(ProjNode* proj, bool must_reason_predicate = false);
+  // Return true for    "if(test)-> proj -> ...
+  //                          |
+  //                          V
+  //                      other_proj->[region->..]call_uct"
+  bool is_uncommon_trap_if_pattern(ProjNode* proj, bool must_reason_predicate = false);
+  // Create a new if above the uncommon_trap_if_pattern for the predicate to be promoted
+  ProjNode* create_new_if_for_predicate(ProjNode* cont_proj);
+  // Find a good location to insert a predicate
+  ProjNode* find_predicate_insertion_point(Node* start_c);
+  // Construct a range check for a predicate if
+  BoolNode* rc_predicate(Node* ctrl,
+                         int scale, Node* offset,
+                         Node* init, Node* limit, Node* stride,
+                         Node* range);
+
+  // Implementation of the loop predication to promote checks outside the loop
+  bool loop_predication_impl(IdealLoopTree *loop);
+
+  // Helper function to collect predicate for eliminating the useless ones
+  void collect_potentially_useful_predicates(IdealLoopTree *loop, Unique_Node_List &predicate_opaque1);
+  void eliminate_useless_predicates();
+
   // Eliminate range-checks and other trip-counter vs loop-invariant tests.
   void do_range_check( IdealLoopTree *loop, Node_List &old_new );
 
@@ -858,7 +946,6 @@
   const TypeInt* filtered_type_from_dominators( Node* val, Node *val_ctrl);
 
   // Helper functions
-  void register_new_node( Node *n, Node *blk );
   Node *spinup( Node *iff, Node *new_false, Node *new_true, Node *region, Node *phi, small_cache *cache );
   Node *find_use_block( Node *use, Node *def, Node *old_false, Node *new_false, Node *old_true, Node *new_true );
   void handle_use( Node *use, Node *def, small_cache *cache, Node *region_dom, Node *new_false, Node *new_true, Node *old_false, Node *old_true );
@@ -870,6 +957,7 @@
 public:
   void set_created_loop_node() { _created_loop_node = true; }
   bool created_loop_node()     { return _created_loop_node; }
+  void register_new_node( Node *n, Node *blk );
 
 #ifndef PRODUCT
   void dump( ) const;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/loopopts.cpp
--- a/src/share/vm/opto/loopopts.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/loopopts.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -47,7 +47,7 @@
     int offset = t_oop->offset();
     phi = new (C,region->req()) PhiNode(region, type, NULL, iid, index, offset);
   } else {
-    phi = new (C,region->req()) PhiNode(region, type);
+    phi = PhiNode::make_blank(region, n);
   }
   uint old_unique = C->unique();
   for( uint i = 1; i < region->req(); i++ ) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/machnode.cpp
--- a/src/share/vm/opto/machnode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/machnode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -636,7 +636,9 @@
 }
 #ifndef PRODUCT
 void MachCallJavaNode::dump_spec(outputStream *st) const {
-  if( _method ) {
+  if (_method_handle_invoke)
+    st->print("MethodHandle ");
+  if (_method) {
     _method->print_short_name(st);
     st->print(" ");
   }
@@ -644,6 +646,20 @@
 }
 #endif
 
+//------------------------------Registers--------------------------------------
+const RegMask &MachCallJavaNode::in_RegMask(uint idx) const {
+  // Values in the domain use the users calling convention, embodied in the
+  // _in_rms array of RegMasks.
+  if (idx < tf()->domain()->cnt())  return _in_rms[idx];
+  // Values outside the domain represent debug info
+  Matcher* m = Compile::current()->matcher();
+  // If this call is a MethodHandle invoke we have to use a different
+  // debugmask which does not include the register we use to save the
+  // SP over MH invokes.
+  RegMask** debugmask = _method_handle_invoke ? m->idealreg2mhdebugmask : m->idealreg2debugmask;
+  return *debugmask[in(idx)->ideal_reg()];
+}
+
 //=============================================================================
 uint MachCallStaticJavaNode::size_of() const { return sizeof(*this); }
 uint MachCallStaticJavaNode::cmp( const Node &n ) const {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/machnode.hpp
--- a/src/share/vm/opto/machnode.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/machnode.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -232,7 +232,7 @@
   // Expand method for MachNode, replaces nodes representing pseudo
   // instructions with a set of nodes which represent real machine
   // instructions and compute the same value.
-  virtual MachNode *Expand( State *, Node_List &proj_list ) { return this; }
+  virtual MachNode *Expand( State *, Node_List &proj_list, Node* mem ) { return this; }
 
   // Bottom_type call; value comes from operand0
   virtual const class Type *bottom_type() const { return _opnds[0]->type(); }
@@ -662,9 +662,13 @@
   ciMethod* _method;             // Method being direct called
   int        _bci;               // Byte Code index of call byte code
   bool       _optimized_virtual; // Tells if node is a static call or an optimized virtual
+  bool       _method_handle_invoke;   // Tells if the call has to preserve SP
   MachCallJavaNode() : MachCallNode() {
     init_class_id(Class_MachCallJava);
   }
+
+  virtual const RegMask &in_RegMask(uint) const;
+
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
 #endif
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/macro.cpp
--- a/src/share/vm/opto/macro.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/macro.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -316,6 +316,21 @@
         assert(adr_idx == Compile::AliasIdxRaw, "address must match or be raw");
       }
       mem = mem->in(MemNode::Memory);
+    } else if (mem->is_ClearArray()) {
+      if (!ClearArrayNode::step_through(&mem, alloc->_idx, phase)) {
+        // Can not bypass initialization of the instance
+        // we are looking.
+        debug_only(intptr_t offset;)
+        assert(alloc == AllocateNode::Ideal_allocation(mem->in(3), phase, offset), "sanity");
+        InitializeNode* init = alloc->as_Allocate()->initialization();
+        // We are looking for stored value, return Initialize node
+        // or memory edge from Allocate node.
+        if (init != NULL)
+          return init;
+        else
+          return alloc->in(TypeFunc::Memory); // It will produce zero value (see callers).
+      }
+      // Otherwise skip it (the call updated 'mem' value).
     } else if (mem->Opcode() == Op_SCMemProj) {
       assert(mem->in(0)->is_LoadStore(), "sanity");
       const TypePtr* atype = mem->in(0)->in(MemNode::Address)->bottom_type()->is_ptr();
@@ -823,6 +838,18 @@
           Node *n = use->last_out(k);
           uint oc2 = use->outcnt();
           if (n->is_Store()) {
+#ifdef ASSERT
+            // Verify that there is no dependent MemBarVolatile nodes,
+            // they should be removed during IGVN, see MemBarNode::Ideal().
+            for (DUIterator_Fast pmax, p = n->fast_outs(pmax);
+                                       p < pmax; p++) {
+              Node* mb = n->fast_out(p);
+              assert(mb->is_Initialize() || !mb->is_MemBar() ||
+                     mb->req() <= MemBarNode::Precedent ||
+                     mb->in(MemBarNode::Precedent) != n,
+                     "MemBarVolatile should be eliminated for non-escaping object");
+            }
+#endif
             _igvn.replace_node(n, n->in(MemNode::Memory));
           } else {
             eliminate_card_mark(n);
@@ -912,15 +939,29 @@
     return false;
   }
 
+  CompileLog* log = C->log();
+  if (log != NULL) {
+    Node* klass = alloc->in(AllocateNode::KlassNode);
+    const TypeKlassPtr* tklass = _igvn.type(klass)->is_klassptr();
+    log->head("eliminate_allocation type='%d'",
+              log->identify(tklass->klass()));
+    JVMState* p = alloc->jvms();
+    while (p != NULL) {
+      log->elem("jvms bci='%d' method='%d'", p->bci(), log->identify(p->method()));
+      p = p->caller();
+    }
+    log->tail("eliminate_allocation");
+  }
+
   process_users_of_allocation(alloc);
 
 #ifndef PRODUCT
-if (PrintEliminateAllocations) {
-  if (alloc->is_AllocateArray())
-    tty->print_cr("++++ Eliminated: %d AllocateArray", alloc->_idx);
-  else
-    tty->print_cr("++++ Eliminated: %d Allocate", alloc->_idx);
-}
+  if (PrintEliminateAllocations) {
+    if (alloc->is_AllocateArray())
+      tty->print_cr("++++ Eliminated: %d AllocateArray", alloc->_idx);
+    else
+      tty->print_cr("++++ Eliminated: %d Allocate", alloc->_idx);
+  }
 #endif
 
   return true;
@@ -1639,6 +1680,18 @@
       } // if (!oldbox->is_eliminated())
   } // if (alock->is_Lock() && !lock->is_coarsened())
 
+  CompileLog* log = C->log();
+  if (log != NULL) {
+    log->head("eliminate_lock lock='%d'",
+              alock->is_Lock());
+    JVMState* p = alock->jvms();
+    while (p != NULL) {
+      log->elem("jvms bci='%d' method='%d'", p->bci(), log->identify(p->method()));
+      p = p->caller();
+    }
+    log->tail("eliminate_lock");
+  }
+
   #ifndef PRODUCT
   if (PrintEliminateLocks) {
     if (alock->is_Lock()) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/matcher.cpp
--- a/src/share/vm/opto/matcher.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/matcher.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -70,19 +70,27 @@
   _dontcare(&_states_arena) {
   C->set_matcher(this);
 
-  idealreg2spillmask[Op_RegI] = NULL;
-  idealreg2spillmask[Op_RegN] = NULL;
-  idealreg2spillmask[Op_RegL] = NULL;
-  idealreg2spillmask[Op_RegF] = NULL;
-  idealreg2spillmask[Op_RegD] = NULL;
-  idealreg2spillmask[Op_RegP] = NULL;
+  idealreg2spillmask  [Op_RegI] = NULL;
+  idealreg2spillmask  [Op_RegN] = NULL;
+  idealreg2spillmask  [Op_RegL] = NULL;
+  idealreg2spillmask  [Op_RegF] = NULL;
+  idealreg2spillmask  [Op_RegD] = NULL;
+  idealreg2spillmask  [Op_RegP] = NULL;
 
-  idealreg2debugmask[Op_RegI] = NULL;
-  idealreg2debugmask[Op_RegN] = NULL;
-  idealreg2debugmask[Op_RegL] = NULL;
-  idealreg2debugmask[Op_RegF] = NULL;
-  idealreg2debugmask[Op_RegD] = NULL;
-  idealreg2debugmask[Op_RegP] = NULL;
+  idealreg2debugmask  [Op_RegI] = NULL;
+  idealreg2debugmask  [Op_RegN] = NULL;
+  idealreg2debugmask  [Op_RegL] = NULL;
+  idealreg2debugmask  [Op_RegF] = NULL;
+  idealreg2debugmask  [Op_RegD] = NULL;
+  idealreg2debugmask  [Op_RegP] = NULL;
+
+  idealreg2mhdebugmask[Op_RegI] = NULL;
+  idealreg2mhdebugmask[Op_RegN] = NULL;
+  idealreg2mhdebugmask[Op_RegL] = NULL;
+  idealreg2mhdebugmask[Op_RegF] = NULL;
+  idealreg2mhdebugmask[Op_RegD] = NULL;
+  idealreg2mhdebugmask[Op_RegP] = NULL;
+
   debug_only(_mem_node = NULL;)   // Ideal memory node consumed by mach node
 }
 
@@ -389,19 +397,28 @@
 void Matcher::init_first_stack_mask() {
 
   // Allocate storage for spill masks as masks for the appropriate load type.
-  RegMask *rms = (RegMask*)C->comp_arena()->Amalloc_D(sizeof(RegMask)*12);
-  idealreg2spillmask[Op_RegN] = &rms[0];
-  idealreg2spillmask[Op_RegI] = &rms[1];
-  idealreg2spillmask[Op_RegL] = &rms[2];
-  idealreg2spillmask[Op_RegF] = &rms[3];
-  idealreg2spillmask[Op_RegD] = &rms[4];
-  idealreg2spillmask[Op_RegP] = &rms[5];
-  idealreg2debugmask[Op_RegN] = &rms[6];
-  idealreg2debugmask[Op_RegI] = &rms[7];
-  idealreg2debugmask[Op_RegL] = &rms[8];
-  idealreg2debugmask[Op_RegF] = &rms[9];
-  idealreg2debugmask[Op_RegD] = &rms[10];
-  idealreg2debugmask[Op_RegP] = &rms[11];
+  RegMask *rms = (RegMask*)C->comp_arena()->Amalloc_D(sizeof(RegMask) * 3*6);
+
+  idealreg2spillmask  [Op_RegN] = &rms[0];
+  idealreg2spillmask  [Op_RegI] = &rms[1];
+  idealreg2spillmask  [Op_RegL] = &rms[2];
+  idealreg2spillmask  [Op_RegF] = &rms[3];
+  idealreg2spillmask  [Op_RegD] = &rms[4];
+  idealreg2spillmask  [Op_RegP] = &rms[5];
+
+  idealreg2debugmask  [Op_RegN] = &rms[6];
+  idealreg2debugmask  [Op_RegI] = &rms[7];
+  idealreg2debugmask  [Op_RegL] = &rms[8];
+  idealreg2debugmask  [Op_RegF] = &rms[9];
+  idealreg2debugmask  [Op_RegD] = &rms[10];
+  idealreg2debugmask  [Op_RegP] = &rms[11];
+
+  idealreg2mhdebugmask[Op_RegN] = &rms[12];
+  idealreg2mhdebugmask[Op_RegI] = &rms[13];
+  idealreg2mhdebugmask[Op_RegL] = &rms[14];
+  idealreg2mhdebugmask[Op_RegF] = &rms[15];
+  idealreg2mhdebugmask[Op_RegD] = &rms[16];
+  idealreg2mhdebugmask[Op_RegP] = &rms[17];
 
   OptoReg::Name i;
 
@@ -442,12 +459,19 @@
   // Make up debug masks.  Any spill slot plus callee-save registers.
   // Caller-save registers are assumed to be trashable by the various
   // inline-cache fixup routines.
-  *idealreg2debugmask[Op_RegN]= *idealreg2spillmask[Op_RegN];
-  *idealreg2debugmask[Op_RegI]= *idealreg2spillmask[Op_RegI];
-  *idealreg2debugmask[Op_RegL]= *idealreg2spillmask[Op_RegL];
-  *idealreg2debugmask[Op_RegF]= *idealreg2spillmask[Op_RegF];
-  *idealreg2debugmask[Op_RegD]= *idealreg2spillmask[Op_RegD];
-  *idealreg2debugmask[Op_RegP]= *idealreg2spillmask[Op_RegP];
+  *idealreg2debugmask  [Op_RegN]= *idealreg2spillmask[Op_RegN];
+  *idealreg2debugmask  [Op_RegI]= *idealreg2spillmask[Op_RegI];
+  *idealreg2debugmask  [Op_RegL]= *idealreg2spillmask[Op_RegL];
+  *idealreg2debugmask  [Op_RegF]= *idealreg2spillmask[Op_RegF];
+  *idealreg2debugmask  [Op_RegD]= *idealreg2spillmask[Op_RegD];
+  *idealreg2debugmask  [Op_RegP]= *idealreg2spillmask[Op_RegP];
+
+  *idealreg2mhdebugmask[Op_RegN]= *idealreg2spillmask[Op_RegN];
+  *idealreg2mhdebugmask[Op_RegI]= *idealreg2spillmask[Op_RegI];
+  *idealreg2mhdebugmask[Op_RegL]= *idealreg2spillmask[Op_RegL];
+  *idealreg2mhdebugmask[Op_RegF]= *idealreg2spillmask[Op_RegF];
+  *idealreg2mhdebugmask[Op_RegD]= *idealreg2spillmask[Op_RegD];
+  *idealreg2mhdebugmask[Op_RegP]= *idealreg2spillmask[Op_RegP];
 
   // Prevent stub compilations from attempting to reference
   // callee-saved registers from debug info
@@ -458,14 +482,31 @@
     if( _register_save_policy[i] == 'C' ||
         _register_save_policy[i] == 'A' ||
         (_register_save_policy[i] == 'E' && exclude_soe) ) {
-      idealreg2debugmask[Op_RegN]->Remove(i);
-      idealreg2debugmask[Op_RegI]->Remove(i); // Exclude save-on-call
-      idealreg2debugmask[Op_RegL]->Remove(i); // registers from debug
-      idealreg2debugmask[Op_RegF]->Remove(i); // masks
-      idealreg2debugmask[Op_RegD]->Remove(i);
-      idealreg2debugmask[Op_RegP]->Remove(i);
+      idealreg2debugmask  [Op_RegN]->Remove(i);
+      idealreg2debugmask  [Op_RegI]->Remove(i); // Exclude save-on-call
+      idealreg2debugmask  [Op_RegL]->Remove(i); // registers from debug
+      idealreg2debugmask  [Op_RegF]->Remove(i); // masks
+      idealreg2debugmask  [Op_RegD]->Remove(i);
+      idealreg2debugmask  [Op_RegP]->Remove(i);
+
+      idealreg2mhdebugmask[Op_RegN]->Remove(i);
+      idealreg2mhdebugmask[Op_RegI]->Remove(i);
+      idealreg2mhdebugmask[Op_RegL]->Remove(i);
+      idealreg2mhdebugmask[Op_RegF]->Remove(i);
+      idealreg2mhdebugmask[Op_RegD]->Remove(i);
+      idealreg2mhdebugmask[Op_RegP]->Remove(i);
     }
   }
+
+  // Subtract the register we use to save the SP for MethodHandle
+  // invokes to from the debug mask.
+  const RegMask save_mask = method_handle_invoke_SP_save_mask();
+  idealreg2mhdebugmask[Op_RegN]->SUBTRACT(save_mask);
+  idealreg2mhdebugmask[Op_RegI]->SUBTRACT(save_mask);
+  idealreg2mhdebugmask[Op_RegL]->SUBTRACT(save_mask);
+  idealreg2mhdebugmask[Op_RegF]->SUBTRACT(save_mask);
+  idealreg2mhdebugmask[Op_RegD]->SUBTRACT(save_mask);
+  idealreg2mhdebugmask[Op_RegP]->SUBTRACT(save_mask);
 }
 
 //---------------------------is_save_on_entry----------------------------------
@@ -989,6 +1030,7 @@
   CallNode *call;
   const TypeTuple *domain;
   ciMethod*        method = NULL;
+  bool             is_method_handle_invoke = false;  // for special kill effects
   if( sfpt->is_Call() ) {
     call = sfpt->as_Call();
     domain = call->tf()->domain();
@@ -1013,6 +1055,8 @@
       mcall_java->_method = method;
       mcall_java->_bci = call_java->_bci;
       mcall_java->_optimized_virtual = call_java->is_optimized_virtual();
+      is_method_handle_invoke = call_java->is_method_handle_invoke();
+      mcall_java->_method_handle_invoke = is_method_handle_invoke;
       if( mcall_java->is_MachCallStaticJava() )
         mcall_java->as_MachCallStaticJava()->_name =
          call_java->as_CallStaticJava()->_name;
@@ -1126,6 +1170,15 @@
     mcall->_argsize = out_arg_limit_per_call - begin_out_arg_area;
   }
 
+  if (is_method_handle_invoke) {
+    // Kill some extra stack space in case method handles want to do
+    // a little in-place argument insertion.
+    int regs_per_word  = NOT_LP64(1) LP64_ONLY(2); // %%% make a global const!
+    out_arg_limit_per_call += MethodHandlePushLimit * regs_per_word;
+    // Do not update mcall->_argsize because (a) the extra space is not
+    // pushed as arguments and (b) _argsize is dead (not used anywhere).
+  }
+
   // Compute the max stack slot killed by any call.  These will not be
   // available for debug info, and will be used to adjust FIRST_STACK_mask
   // after all call sites have been visited.
@@ -1527,7 +1580,7 @@
   uint num_proj = _proj_list.size();
 
   // Perform any 1-to-many expansions required
-  MachNode *ex = mach->Expand(s,_proj_list);
+  MachNode *ex = mach->Expand(s,_proj_list, mem);
   if( ex != mach ) {
     assert(ex->ideal_reg() == mach->ideal_reg(), "ideal types should match");
     if( ex->in(1)->is_Con() )
@@ -1832,67 +1885,23 @@
       case Op_Binary:         // These are introduced in the Post_Visit state.
         ShouldNotReachHere();
         break;
-      case Op_StoreB:         // Do match these, despite no ideal reg
-      case Op_StoreC:
-      case Op_StoreCM:
-      case Op_StoreD:
-      case Op_StoreF:
-      case Op_StoreI:
-      case Op_StoreL:
-      case Op_StoreP:
-      case Op_StoreN:
-      case Op_Store16B:
-      case Op_Store8B:
-      case Op_Store4B:
-      case Op_Store8C:
-      case Op_Store4C:
-      case Op_Store2C:
-      case Op_Store4I:
-      case Op_Store2I:
-      case Op_Store2L:
-      case Op_Store4F:
-      case Op_Store2F:
-      case Op_Store2D:
       case Op_ClearArray:
       case Op_SafePoint:
         mem_op = true;
         break;
-      case Op_LoadB:
-      case Op_LoadUS:
-      case Op_LoadD:
-      case Op_LoadF:
-      case Op_LoadI:
-      case Op_LoadKlass:
-      case Op_LoadNKlass:
-      case Op_LoadL:
-      case Op_LoadS:
-      case Op_LoadP:
-      case Op_LoadN:
-      case Op_LoadRange:
-      case Op_LoadD_unaligned:
-      case Op_LoadL_unaligned:
-      case Op_Load16B:
-      case Op_Load8B:
-      case Op_Load4B:
-      case Op_Load4C:
-      case Op_Load2C:
-      case Op_Load8C:
-      case Op_Load8S:
-      case Op_Load4S:
-      case Op_Load2S:
-      case Op_Load4I:
-      case Op_Load2I:
-      case Op_Load2L:
-      case Op_Load4F:
-      case Op_Load2F:
-      case Op_Load2D:
-        mem_op = true;
-        // Must be root of match tree due to prior load conflict
-        if( C->subsume_loads() == false ) {
-          set_shared(n);
+      default:
+        if( n->is_Store() ) {
+          // Do match stores, despite no ideal reg
+          mem_op = true;
+          break;
+        }
+        if( n->is_Mem() ) { // Loads and LoadStores
+          mem_op = true;
+          // Loads must be root of match tree due to prior load conflict
+          if( C->subsume_loads() == false )
+            set_shared(n);
         }
         // Fall into default case
-      default:
         if( !n->ideal_reg() )
           set_dontcare(n);  // Unmatchable Nodes
       } // end_switch
@@ -1913,15 +1922,15 @@
           continue; // for(int i = ...)
         }
 
-        // Clone addressing expressions as they are "free" in most instructions
+        if( mop == Op_AddP && m->in(AddPNode::Base)->Opcode() == Op_DecodeN ) {
+          // Bases used in addresses must be shared but since
+          // they are shared through a DecodeN they may appear
+          // to have a single use so force sharing here.
+          set_shared(m->in(AddPNode::Base)->in(1));
+        }
+
+        // Clone addressing expressions as they are "free" in memory access instructions
         if( mem_op && i == MemNode::Address && mop == Op_AddP ) {
-          if (m->in(AddPNode::Base)->Opcode() == Op_DecodeN) {
-            // Bases used in addresses must be shared but since
-            // they are shared through a DecodeN they may appear
-            // to have a single use so force sharing here.
-            set_shared(m->in(AddPNode::Base)->in(1));
-          }
-
           // Some inputs for address expression are not put on stack
           // to avoid marking them as shared and forcing them into register
           // if they are used only in address expressions.
@@ -2032,6 +2041,23 @@
         n->del_req(3);
         break;
       }
+      case Op_StrEquals: {
+        Node *pair1 = new (C, 3) BinaryNode(n->in(2),n->in(3));
+        n->set_req(2,pair1);
+        n->set_req(3,n->in(4));
+        n->del_req(4);
+        break;
+      }
+      case Op_StrComp:
+      case Op_StrIndexOf: {
+        Node *pair1 = new (C, 3) BinaryNode(n->in(2),n->in(3));
+        n->set_req(2,pair1);
+        Node *pair2 = new (C, 3) BinaryNode(n->in(4),n->in(5));
+        n->set_req(3,pair2);
+        n->del_req(5);
+        n->del_req(4);
+        break;
+      }
       default:
         break;
       }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/matcher.hpp
--- a/src/share/vm/opto/matcher.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/matcher.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -117,8 +117,9 @@
   static const int base2reg[];        // Map Types to machine register types
   // Convert ideal machine register to a register mask for spill-loads
   static const RegMask *idealreg2regmask[];
-  RegMask *idealreg2spillmask[_last_machine_leaf];
-  RegMask *idealreg2debugmask[_last_machine_leaf];
+  RegMask *idealreg2spillmask  [_last_machine_leaf];
+  RegMask *idealreg2debugmask  [_last_machine_leaf];
+  RegMask *idealreg2mhdebugmask[_last_machine_leaf];
   void init_spill_mask( Node *ret );
   // Convert machine register number to register mask
   static uint mreg2regmask_max;
@@ -297,6 +298,8 @@
   // Register for MODL projection of divmodL
   static RegMask modL_proj_mask();
 
+  static const RegMask method_handle_invoke_SP_save_mask();
+
   // Java-Interpreter calling convention
   // (what you use when calling between compiled-Java and Interpreted-Java
 
@@ -370,8 +373,8 @@
   // to implement the UseStrictFP mode.
   static const bool strict_fp_requires_explicit_rounding;
 
-  // Do floats take an entire double register or just half?
-  static const bool float_in_double;
+  // Are floats conerted to double when stored to stack during deoptimization?
+  static bool float_in_double();
   // Do ints take an entire long register or just half?
   static const bool int_in_long;
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/memnode.cpp
--- a/src/share/vm/opto/memnode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/memnode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -123,6 +123,13 @@
       } else {
         assert(false, "unexpected projection");
       }
+    } else if (result->is_ClearArray()) {
+      if (!ClearArrayNode::step_through(&result, instance_id, phase)) {
+        // Can not bypass initialization of the instance
+        // we are looking for.
+        break;
+      }
+      // Otherwise skip it (the call updated 'result' value).
     } else if (result->is_MergeMem()) {
       result = step_through_mergemem(phase, result->as_MergeMem(), t_adr, NULL, tty);
     }
@@ -255,6 +262,13 @@
     return NodeSentinel; // caller will return NULL
   }
 
+  // Do NOT remove or optimize the next lines: ensure a new alias index
+  // is allocated for an oop pointer type before Escape Analysis.
+  // Note: C++ will not remove it since the call has side effect.
+  if ( t_adr->isa_oopptr() ) {
+    int alias_idx = phase->C->get_alias_index(t_adr->is_ptr());
+  }
+
 #ifdef ASSERT
   Node* base = NULL;
   if (address->is_AddP())
@@ -530,6 +544,15 @@
       } else if (mem->is_Proj() && mem->in(0)->is_MemBar()) {
         mem = mem->in(0)->in(TypeFunc::Memory);
         continue;           // (a) advance through independent MemBar memory
+      } else if (mem->is_ClearArray()) {
+        if (ClearArrayNode::step_through(&mem, (uint)addr_t->instance_id(), phase)) {
+          // (the call updated 'mem' value)
+          continue;         // (a) advance through independent allocation memory
+        } else {
+          // Can not bypass initialization of the instance
+          // we are looking for.
+          return mem;
+        }
       } else if (mem->is_MergeMem()) {
         int alias_idx = phase->C->get_alias_index(adr_type());
         mem = mem->as_MergeMem()->memory_at(alias_idx);
@@ -1496,6 +1519,8 @@
       }
     }
   } else if (tp->base() == Type::InstPtr) {
+    const TypeInstPtr* tinst = tp->is_instptr();
+    ciKlass* klass = tinst->klass();
     assert( off != Type::OffsetBot ||
             // arrays can be cast to Objects
             tp->is_oopptr()->klass()->is_java_lang_Object() ||
@@ -1503,6 +1528,25 @@
             phase->C->has_unsafe_access(),
             "Field accesses must be precise" );
     // For oop loads, we expect the _type to be precise
+    if (OptimizeStringConcat && klass == phase->C->env()->String_klass() &&
+        adr->is_AddP() && off != Type::OffsetBot) {
+      // For constant Strings treat the fields as compile time constants.
+      Node* base = adr->in(AddPNode::Base);
+      if (base->Opcode() == Op_ConP) {
+        const TypeOopPtr* t = phase->type(base)->isa_oopptr();
+        ciObject* string = t->const_oop();
+        ciConstant constant = string->as_instance()->field_value_by_offset(off);
+        if (constant.basic_type() == T_INT) {
+          return TypeInt::make(constant.as_int());
+        } else if (constant.basic_type() == T_ARRAY) {
+          if (adr->bottom_type()->is_ptr_to_narrowoop()) {
+            return TypeNarrowOop::make_from_constant(constant.as_object());
+          } else {
+            return TypeOopPtr::make_from_constant(constant.as_object());
+          }
+        }
+      }
+    }
   } else if (tp->base() == Type::KlassPtr) {
     assert( off != Type::OffsetBot ||
             // arrays can be cast to Objects
@@ -2313,6 +2357,22 @@
   return this;
 }
 
+//=============================================================================
+//------------------------------Ideal---------------------------------------
+Node *StoreCMNode::Ideal(PhaseGVN *phase, bool can_reshape){
+  Node* progress = StoreNode::Ideal(phase, can_reshape);
+  if (progress != NULL) return progress;
+
+  Node* my_store = in(MemNode::OopStore);
+  if (my_store->is_MergeMem()) {
+    Node* mem = my_store->as_MergeMem()->memory_at(oop_alias_idx());
+    set_req(MemNode::OopStore, mem);
+    return this;
+  }
+
+  return NULL;
+}
+
 //------------------------------Value-----------------------------------------
 const Type *StoreCMNode::Value( PhaseTransform *phase ) const {
   // Either input is TOP ==> the result is TOP
@@ -2410,6 +2470,31 @@
   return mem;
 }
 
+//----------------------------step_through----------------------------------
+// Return allocation input memory edge if it is different instance
+// or itself if it is the one we are looking for.
+bool ClearArrayNode::step_through(Node** np, uint instance_id, PhaseTransform* phase) {
+  Node* n = *np;
+  assert(n->is_ClearArray(), "sanity");
+  intptr_t offset;
+  AllocateNode* alloc = AllocateNode::Ideal_allocation(n->in(3), phase, offset);
+  // This method is called only before Allocate nodes are expanded during
+  // macro nodes expansion. Before that ClearArray nodes are only generated
+  // in LibraryCallKit::generate_arraycopy() which follows allocations.
+  assert(alloc != NULL, "should have allocation");
+  if (alloc->_idx == instance_id) {
+    // Can not bypass initialization of the instance we are looking for.
+    return false;
+  }
+  // Otherwise skip it.
+  InitializeNode* init = alloc->initialization();
+  if (init != NULL)
+    *np = init->in(TypeFunc::Memory);
+  else
+    *np = alloc->in(TypeFunc::Memory);
+  return true;
+}
+
 //----------------------------clear_memory-------------------------------------
 // Generate code to initialize object storage to zero.
 Node* ClearArrayNode::clear_memory(Node* ctl, Node* mem, Node* dest,
@@ -2498,7 +2583,7 @@
 //=============================================================================
 // Do we match on this edge? No memory edges
 uint StrCompNode::match_edge(uint idx) const {
-  return idx == 5 || idx == 6;
+  return idx == 2 || idx == 3; // StrComp (Binary str1 cnt1) (Binary str2 cnt2)
 }
 
 //------------------------------Ideal------------------------------------------
@@ -2508,9 +2593,10 @@
   return remove_dead_region(phase, can_reshape) ? this : NULL;
 }
 
+//=============================================================================
 // Do we match on this edge? No memory edges
 uint StrEqualsNode::match_edge(uint idx) const {
-  return idx == 5 || idx == 6;
+  return idx == 2 || idx == 3; // StrEquals (Binary str1 str2) cnt
 }
 
 //------------------------------Ideal------------------------------------------
@@ -2523,7 +2609,7 @@
 //=============================================================================
 // Do we match on this edge? No memory edges
 uint StrIndexOfNode::match_edge(uint idx) const {
-  return idx == 5 || idx == 6;
+  return idx == 2 || idx == 3; // StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)
 }
 
 //------------------------------Ideal------------------------------------------
@@ -2533,6 +2619,11 @@
   return remove_dead_region(phase, can_reshape) ? this : NULL;
 }
 
+//=============================================================================
+// Do we match on this edge? No memory edges
+uint AryEqNode::match_edge(uint idx) const {
+  return idx == 2 || idx == 3; // StrEquals ary1 ary2
+}
 //------------------------------Ideal------------------------------------------
 // Return a node which is more "ideal" than the current node.  Strip out
 // control copies
@@ -2577,7 +2668,30 @@
 // Return a node which is more "ideal" than the current node.  Strip out
 // control copies
 Node *MemBarNode::Ideal(PhaseGVN *phase, bool can_reshape) {
-  return remove_dead_region(phase, can_reshape) ? this : NULL;
+  if (remove_dead_region(phase, can_reshape)) return this;
+
+  // Eliminate volatile MemBars for scalar replaced objects.
+  if (can_reshape && req() == (Precedent+1) &&
+      (Opcode() == Op_MemBarAcquire || Opcode() == Op_MemBarVolatile)) {
+    // Volatile field loads and stores.
+    Node* my_mem = in(MemBarNode::Precedent);
+    if (my_mem != NULL && my_mem->is_Mem()) {
+      const TypeOopPtr* t_oop = my_mem->in(MemNode::Address)->bottom_type()->isa_oopptr();
+      // Check for scalar replaced object reference.
+      if( t_oop != NULL && t_oop->is_known_instance_field() &&
+          t_oop->offset() != Type::OffsetBot &&
+          t_oop->offset() != Type::OffsetTop) {
+        // Replace MemBar projections by its inputs.
+        PhaseIterGVN* igvn = phase->is_IterGVN();
+        igvn->replace_node(proj_out(TypeFunc::Memory), in(TypeFunc::Memory));
+        igvn->replace_node(proj_out(TypeFunc::Control), in(TypeFunc::Control));
+        // Must return either the original node (now dead) or a new node
+        // (Do not return a top here, since that would break the uniqueness of top.)
+        return new (phase->C, 1) ConINode(TypeInt::ZERO);
+      }
+    }
+  }
+  return NULL;
 }
 
 //------------------------------Value------------------------------------------
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/memnode.hpp
--- a/src/share/vm/opto/memnode.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/memnode.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -582,12 +582,29 @@
 // The last StoreCM before a SafePoint must be preserved and occur after its "oop" store
 // Preceeding equivalent StoreCMs may be eliminated.
 class StoreCMNode : public StoreNode {
+ private:
+  virtual uint hash() const { return StoreNode::hash() + _oop_alias_idx; }
+  virtual uint cmp( const Node &n ) const {
+    return _oop_alias_idx == ((StoreCMNode&)n)._oop_alias_idx
+      && StoreNode::cmp(n);
+  }
+  virtual uint size_of() const { return sizeof(*this); }
+  int _oop_alias_idx;   // The alias_idx of OopStore
+
 public:
-  StoreCMNode( Node *c, Node *mem, Node *adr, const TypePtr* at, Node *val, Node *oop_store ) : StoreNode(c,mem,adr,at,val,oop_store) {}
+  StoreCMNode( Node *c, Node *mem, Node *adr, const TypePtr* at, Node *val, Node *oop_store, int oop_alias_idx ) :
+    StoreNode(c,mem,adr,at,val,oop_store),
+    _oop_alias_idx(oop_alias_idx) {
+    assert(_oop_alias_idx >= Compile::AliasIdxRaw ||
+           _oop_alias_idx == Compile::AliasIdxBot && Compile::current()->AliasLevel() == 0,
+           "bad oop alias idx");
+  }
   virtual int Opcode() const;
   virtual Node *Identity( PhaseTransform *phase );
+  virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *Value( PhaseTransform *phase ) const;
   virtual BasicType memory_type() const { return T_VOID; } // unspecific
+  int oop_alias_idx() const { return _oop_alias_idx; }
 };
 
 //------------------------------LoadPLockedNode---------------------------------
@@ -713,7 +730,10 @@
 //------------------------------ClearArray-------------------------------------
 class ClearArrayNode: public Node {
 public:
-  ClearArrayNode( Node *ctrl, Node *arymem, Node *word_cnt, Node *base ) : Node(ctrl,arymem,word_cnt,base) {}
+  ClearArrayNode( Node *ctrl, Node *arymem, Node *word_cnt, Node *base )
+    : Node(ctrl,arymem,word_cnt,base) {
+    init_class_id(Class_ClearArray);
+  }
   virtual int         Opcode() const;
   virtual const Type *bottom_type() const { return Type::MEMORY; }
   // ClearArray modifies array elements, and so affects only the
@@ -739,27 +759,23 @@
                             Node* start_offset,
                             Node* end_offset,
                             PhaseGVN* phase);
+  // Return allocation input memory edge if it is different instance
+  // or itself if it is the one we are looking for.
+  static bool step_through(Node** np, uint instance_id, PhaseTransform* phase);
 };
 
 //------------------------------StrComp-------------------------------------
 class StrCompNode: public Node {
 public:
-  StrCompNode(Node *control,
-              Node* char_array_mem,
-              Node* value_mem,
-              Node* count_mem,
-              Node* offset_mem,
-              Node* s1, Node* s2): Node(control,
-                                        char_array_mem,
-                                        value_mem,
-                                        count_mem,
-                                        offset_mem,
-                                        s1, s2) {};
+  StrCompNode(Node* control, Node* char_array_mem,
+              Node* s1, Node* c1,
+              Node* s2, Node* c2): Node(control, char_array_mem,
+                                        s1, c1,
+                                        s2, c2) {};
   virtual int Opcode() const;
   virtual bool depends_only_on_test() const { return false; }
   virtual const Type* bottom_type() const { return TypeInt::INT; }
-  // a StrCompNode (conservatively) aliases with everything:
-  virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
+  virtual const TypePtr* adr_type() const { return TypeAryPtr::CHARS; }
   virtual uint match_edge(uint idx) const;
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
@@ -768,22 +784,13 @@
 //------------------------------StrEquals-------------------------------------
 class StrEqualsNode: public Node {
 public:
-  StrEqualsNode(Node *control,
-                Node* char_array_mem,
-                Node* value_mem,
-                Node* count_mem,
-                Node* offset_mem,
-                Node* s1, Node* s2): Node(control,
-                                          char_array_mem,
-                                          value_mem,
-                                          count_mem,
-                                          offset_mem,
-                                          s1, s2) {};
+  StrEqualsNode(Node* control, Node* char_array_mem,
+                Node* s1, Node* s2, Node* c): Node(control, char_array_mem,
+                                                   s1, s2, c) {};
   virtual int Opcode() const;
   virtual bool depends_only_on_test() const { return false; }
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
-  // a StrEqualsNode (conservatively) aliases with everything:
-  virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
+  virtual const TypePtr* adr_type() const { return TypeAryPtr::CHARS; }
   virtual uint match_edge(uint idx) const;
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
@@ -792,22 +799,15 @@
 //------------------------------StrIndexOf-------------------------------------
 class StrIndexOfNode: public Node {
 public:
-  StrIndexOfNode(Node *control,
-                 Node* char_array_mem,
-                 Node* value_mem,
-                 Node* count_mem,
-                 Node* offset_mem,
-                 Node* s1, Node* s2): Node(control,
-                                           char_array_mem,
-                                           value_mem,
-                                           count_mem,
-                                           offset_mem,
-                                           s1, s2) {};
+  StrIndexOfNode(Node* control, Node* char_array_mem,
+                 Node* s1, Node* c1,
+                 Node* s2, Node* c2): Node(control, char_array_mem,
+                                           s1, c1,
+                                           s2, c2) {};
   virtual int Opcode() const;
   virtual bool depends_only_on_test() const { return false; }
   virtual const Type* bottom_type() const { return TypeInt::INT; }
-  // a StrIndexOfNode (conservatively) aliases with everything:
-  virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
+  virtual const TypePtr* adr_type() const { return TypeAryPtr::CHARS; }
   virtual uint match_edge(uint idx) const;
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
@@ -816,11 +816,13 @@
 //------------------------------AryEq---------------------------------------
 class AryEqNode: public Node {
 public:
-  AryEqNode(Node *control, Node* s1, Node* s2): Node(control, s1, s2) {};
+  AryEqNode(Node* control, Node* char_array_mem,
+            Node* s1, Node* s2): Node(control, char_array_mem, s1, s2) {};
   virtual int Opcode() const;
   virtual bool depends_only_on_test() const { return false; }
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
   virtual const TypePtr* adr_type() const { return TypeAryPtr::CHARS; }
+  virtual uint match_edge(uint idx) const;
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/node.hpp
--- a/src/share/vm/opto/node.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/node.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -47,6 +47,7 @@
 class CatchNode;
 class CatchProjNode;
 class CheckCastPPNode;
+class ClearArrayNode;
 class CmpNode;
 class CodeBuffer;
 class ConstraintCastNode;
@@ -599,8 +600,9 @@
     DEFINE_CLASS_ID(BoxLock,  Node, 10)
     DEFINE_CLASS_ID(Add,      Node, 11)
     DEFINE_CLASS_ID(Mul,      Node, 12)
+    DEFINE_CLASS_ID(ClearArray, Node, 13)
 
-    _max_classes  = ClassMask_Mul
+    _max_classes  = ClassMask_ClearArray
   };
   #undef DEFINE_CLASS_ID
 
@@ -661,18 +663,25 @@
     return (_flags & Flag_is_Call) != 0;
   }
 
+  CallNode* isa_Call() const {
+    return is_Call() ? as_Call() : NULL;
+  }
+
   CallNode *as_Call() const { // Only for CallNode (not for MachCallNode)
     assert((_class_id & ClassMask_Call) == Class_Call, "invalid node class");
     return (CallNode*)this;
   }
 
-  #define DEFINE_CLASS_QUERY(type) \
-  bool is_##type() const { \
+  #define DEFINE_CLASS_QUERY(type)                           \
+  bool is_##type() const {                                   \
     return ((_class_id & ClassMask_##type) == Class_##type); \
-  } \
-  type##Node *as_##type() const { \
-    assert(is_##type(), "invalid node class"); \
-    return (type##Node*)this; \
+  }                                                          \
+  type##Node *as_##type() const {                            \
+    assert(is_##type(), "invalid node class");               \
+    return (type##Node*)this;                                \
+  }                                                          \
+  type##Node* isa_##type() const {                           \
+    return (is_##type()) ? as_##type() : NULL;               \
   }
 
   DEFINE_CLASS_QUERY(AbstractLock)
@@ -691,6 +700,7 @@
   DEFINE_CLASS_QUERY(CatchProj)
   DEFINE_CLASS_QUERY(CheckCastPP)
   DEFINE_CLASS_QUERY(ConstraintCast)
+  DEFINE_CLASS_QUERY(ClearArray)
   DEFINE_CLASS_QUERY(CMove)
   DEFINE_CLASS_QUERY(Cmp)
   DEFINE_CLASS_QUERY(CountedLoop)
@@ -1249,6 +1259,24 @@
 #undef I_VDUI_ONLY
 #undef VDUI_ONLY
 
+// An Iterator that truly follows the iterator pattern.  Doesn't
+// support deletion but could be made to.
+//
+//   for (SimpleDUIterator i(n); i.has_next(); i.next()) {
+//     Node* m = i.get();
+//
+class SimpleDUIterator : public StackObj {
+ private:
+  Node* node;
+  DUIterator_Fast i;
+  DUIterator_Fast imax;
+ public:
+  SimpleDUIterator(Node* n): node(n), i(n->fast_outs(imax)) {}
+  bool has_next() { return i < imax; }
+  void next() { i++; }
+  Node* get() { return node->fast_out(i); }
+};
+
 
 //-----------------------------------------------------------------------------
 // Map dense integer indices to Nodes.  Uses classic doubling-array trick.
@@ -1290,6 +1318,12 @@
 public:
   Node_List() : Node_Array(Thread::current()->resource_area()), _cnt(0) {}
   Node_List(Arena *a) : Node_Array(a), _cnt(0) {}
+  bool contains(Node* n) {
+    for (uint e = 0; e < size(); e++) {
+      if (at(e) == n) return true;
+    }
+    return false;
+  }
   void insert( uint i, Node *n ) { Node_Array::insert(i,n); _cnt++; }
   void remove( uint i ) { Node_Array::remove(i); _cnt--; }
   void push( Node *b ) { map(_cnt++,b); }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/output.cpp
--- a/src/share/vm/opto/output.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/output.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
@@ -611,7 +611,7 @@
       assert(cik->is_instance_klass() ||
              cik->is_array_klass(), "Not supported allocation.");
       sv = new ObjectValue(spobj->_idx,
-                           new ConstantOopWriteValue(cik->encoding()));
+                           new ConstantOopWriteValue(cik->constant_encoding()));
       Compile::set_sv_for_object_node(objs, sv);
 
       uint first_ind = spobj->first_index();
@@ -678,7 +678,7 @@
 #endif //_LP64
     else if( (t->base() == Type::FloatBot || t->base() == Type::FloatCon) &&
                OptoReg::is_reg(regnum) ) {
-      array->append(new_loc_value( _regalloc, regnum, Matcher::float_in_double
+      array->append(new_loc_value( _regalloc, regnum, Matcher::float_in_double()
                                    ? Location::float_in_dbl : Location::normal ));
     } else if( t->base() == Type::Int && OptoReg::is_reg(regnum) ) {
       array->append(new_loc_value( _regalloc, regnum, Matcher::int_in_long
@@ -702,13 +702,13 @@
   case Type::AryPtr:
   case Type::InstPtr:
   case Type::KlassPtr:          // fall through
-    array->append(new ConstantOopWriteValue(t->isa_oopptr()->const_oop()->encoding()));
+    array->append(new ConstantOopWriteValue(t->isa_oopptr()->const_oop()->constant_encoding()));
     break;
   case Type::NarrowOop:
     if (t == TypeNarrowOop::NULL_PTR) {
       array->append(new ConstantOopWriteValue(NULL));
     } else {
-      array->append(new ConstantOopWriteValue(t->make_ptr()->isa_oopptr()->const_oop()->encoding()));
+      array->append(new ConstantOopWriteValue(t->make_ptr()->isa_oopptr()->const_oop()->constant_encoding()));
     }
     break;
   case Type::Int:
@@ -794,6 +794,8 @@
 #endif
 
   int safepoint_pc_offset = current_offset;
+  bool is_method_handle_invoke = false;
+  bool return_oop = false;
 
   // Add the safepoint in the DebugInfoRecorder
   if( !mach->is_MachCall() ) {
@@ -801,6 +803,20 @@
     debug_info()->add_safepoint(safepoint_pc_offset, sfn->_oop_map);
   } else {
     mcall = mach->as_MachCall();
+
+    // Is the call a MethodHandle call?
+    if (mcall->is_MachCallJava()) {
+      if (mcall->as_MachCallJava()->_method_handle_invoke) {
+        assert(has_method_handle_invokes(), "must have been set during call generation");
+        is_method_handle_invoke = true;
+      }
+    }
+
+    // Check if a call returns an object.
+    if (mcall->return_value_is_used() &&
+        mcall->tf()->range()->field_at(TypeFunc::Parms)->isa_ptr()) {
+      return_oop = true;
+    }
     safepoint_pc_offset += mcall->ret_addr_offset();
     debug_info()->add_safepoint(safepoint_pc_offset, mcall->_oop_map);
   }
@@ -871,7 +887,7 @@
           assert(cik->is_instance_klass() ||
                  cik->is_array_klass(), "Not supported allocation.");
           ObjectValue* sv = new ObjectValue(spobj->_idx,
-                                new ConstantOopWriteValue(cik->encoding()));
+                                new ConstantOopWriteValue(cik->constant_encoding()));
           Compile::set_sv_for_object_node(objs, sv);
 
           uint first_ind = spobj->first_index();
@@ -890,7 +906,7 @@
         }
       } else {
         const TypePtr *tp = obj_node->bottom_type()->make_ptr();
-        scval = new ConstantOopWriteValue(tp->is_instptr()->const_oop()->encoding());
+        scval = new ConstantOopWriteValue(tp->is_instptr()->const_oop()->constant_encoding());
       }
 
       OptoReg::Name box_reg = BoxLockNode::stack_slot(box_node);
@@ -911,9 +927,9 @@
     ciMethod* scope_method = method ? method : _method;
     // Describe the scope here
     assert(jvms->bci() >= InvocationEntryBci && jvms->bci() <= 0x10000, "must be a valid or entry BCI");
-    assert(!jvms->should_reexecute() || depth==max_depth, "reexecute allowed only for the youngest");
+    assert(!jvms->should_reexecute() || depth == max_depth, "reexecute allowed only for the youngest");
     // Now we can describe the scope.
-    debug_info()->describe_scope(safepoint_pc_offset,scope_method,jvms->bci(),jvms->should_reexecute(),locvals,expvals,monvals);
+    debug_info()->describe_scope(safepoint_pc_offset, scope_method, jvms->bci(), jvms->should_reexecute(), is_method_handle_invoke, return_oop, locvals, expvals, monvals);
   } // End jvms loop
 
   // Mark the end of the scope set.
@@ -1080,14 +1096,26 @@
   deopt_handler_req += MAX_stubs_size; // add marginal slop for handler
   stub_req += MAX_stubs_size;   // ensure per-stub margin
   code_req += MAX_inst_size;    // ensure per-instruction margin
+
   if (StressCodeBuffers)
     code_req = const_req = stub_req = exception_handler_req = deopt_handler_req = 0x10;  // force expansion
-  int total_req = code_req + pad_req + stub_req + exception_handler_req + deopt_handler_req + const_req;
+
+  int total_req =
+    code_req +
+    pad_req +
+    stub_req +
+    exception_handler_req +
+    deopt_handler_req +              // deopt handler
+    const_req;
+
+  if (has_method_handle_invokes())
+    total_req += deopt_handler_req;  // deopt MH handler
+
   CodeBuffer* cb = code_buffer();
   cb->initialize(total_req, locs_req);
 
   // Have we run out of code space?
-  if (cb->blob() == NULL) {
+  if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {
     turn_off_compiler(this);
     return;
   }
@@ -1308,7 +1336,7 @@
 
       // Verify that there is sufficient space remaining
       cb->insts()->maybe_expand_to_ensure_remaining(MAX_inst_size);
-      if (cb->blob() == NULL) {
+      if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {
         turn_off_compiler(this);
         return;
       }
@@ -1424,10 +1452,17 @@
     _code_offsets.set_value(CodeOffsets::Exceptions, emit_exception_handler(*cb));
     // Emit the deopt handler code.
     _code_offsets.set_value(CodeOffsets::Deopt, emit_deopt_handler(*cb));
+
+    // Emit the MethodHandle deopt handler code (if required).
+    if (has_method_handle_invokes()) {
+      // We can use the same code as for the normal deopt handler, we
+      // just need a different entry point address.
+      _code_offsets.set_value(CodeOffsets::DeoptMH, emit_deopt_handler(*cb));
+    }
   }
 
   // One last check for failed CodeBuffer::expand:
-  if (cb->blob() == NULL) {
+  if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {
     turn_off_compiler(this);
     return;
   }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/parse.hpp
--- a/src/share/vm/opto/parse.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/parse.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -39,6 +39,7 @@
   // Always between 0.0 and 1.0.  Represents the percentage of the method's
   // total execution time used at this call site.
   const float _site_invoke_ratio;
+  const int   _site_depth_adjust;
   float compute_callee_frequency( int caller_bci ) const;
 
   GrowableArray<InlineTree*> _subtrees;
@@ -50,7 +51,8 @@
              ciMethod* callee_method,
              JVMState* caller_jvms,
              int caller_bci,
-             float site_invoke_ratio);
+             float site_invoke_ratio,
+             int site_depth_adjust);
   InlineTree *build_inline_tree_for_callee(ciMethod* callee_method,
                                            JVMState* caller_jvms,
                                            int caller_bci);
@@ -61,14 +63,15 @@
 
   InlineTree *caller_tree()       const { return _caller_tree;  }
   InlineTree* callee_at(int bci, ciMethod* m) const;
-  int         inline_depth()      const { return _caller_jvms ? _caller_jvms->depth() : 0; }
+  int         inline_depth()      const { return stack_depth() + _site_depth_adjust; }
+  int         stack_depth()       const { return _caller_jvms ? _caller_jvms->depth() : 0; }
 
 public:
   static InlineTree* build_inline_tree_root();
   static InlineTree* find_subtree_from_root(InlineTree* root, JVMState* jvms, ciMethod* callee, bool create_if_not_found = false);
 
   // For temporary (stack-allocated, stateless) ilts:
-  InlineTree(Compile* c, ciMethod* callee_method, JVMState* caller_jvms, float site_invoke_ratio);
+  InlineTree(Compile* c, ciMethod* callee_method, JVMState* caller_jvms, float site_invoke_ratio, int site_depth_adjust);
 
   // InlineTree enum
   enum InlineStyle {
@@ -427,6 +430,11 @@
     }
   }
 
+  // Return true if the parser should add a loop predicate
+  bool should_add_predicate(int target_bci);
+  // Insert a loop predicate into the graph
+  void add_predicate();
+
   // Note:  Intrinsic generation routines may be found in library_call.cpp.
 
   // Helper function to setup Ideal Call nodes
@@ -469,7 +477,7 @@
 
   // loading from a constant field or the constant pool
   // returns false if push failed (non-perm field constants only, not ldcs)
-  bool push_constant(ciConstant con);
+  bool push_constant(ciConstant con, bool require_constant = false);
 
   // implementation of object creation bytecodes
   void do_new();
@@ -488,7 +496,7 @@
 
   void    do_ifnull(BoolTest::mask btest, Node* c);
   void    do_if(BoolTest::mask btest, Node* c);
-  void    repush_if_args();
+  int     repush_if_args();
   void    adjust_map_after_if(BoolTest::mask btest, Node* c, float prob,
                               Block* path, Block* other_path);
   IfNode* jump_if_fork_int(Node* a, Node* b, BoolTest::mask mask);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/parse1.cpp
--- a/src/share/vm/opto/parse1.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/parse1.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -229,6 +229,8 @@
     }
   }
 
+  // Use the raw liveness computation to make sure that unexpected
+  // values don't propagate into the OSR frame.
   MethodLivenessResult live_locals = method()->liveness_at_bci(osr_bci());
   if (!live_locals.is_valid()) {
     // Degenerate or breakpointed method.
@@ -303,6 +305,7 @@
   SafePointNode* bad_type_exit = clone_map();
   bad_type_exit->set_control(new (C, 1) RegionNode(1));
 
+  assert(osr_block->flow()->jsrs()->size() == 0, "should be no jsrs live at osr point");
   for (index = 0; index < max_locals; index++) {
     if (stopped())  break;
     Node* l = local(index);
@@ -314,6 +317,20 @@
         continue;
       }
     }
+    if (osr_block->flow()->local_type_at(index)->is_return_address()) {
+      // In our current system it's illegal for jsr addresses to be
+      // live into an OSR entry point because the compiler performs
+      // inlining of jsrs.  ciTypeFlow has a bailout that detect this
+      // case and aborts the compile if addresses are live into an OSR
+      // entry point.  Because of that we can assume that any address
+      // locals at the OSR entry point are dead.  Method liveness
+      // isn't precise enought to figure out that they are dead in all
+      // cases so simply skip checking address locals all
+      // together. Any type check is guaranteed to fail since the
+      // interpreter type is the result of a load which might have any
+      // value and the expected type is a constant.
+      continue;
+    }
     set_local(index, check_interpreter_type(l, type, bad_type_exit));
   }
 
@@ -817,7 +834,6 @@
   case Bytecodes::_ddiv:
   case Bytecodes::_checkcast:
   case Bytecodes::_instanceof:
-  case Bytecodes::_athrow:
   case Bytecodes::_anewarray:
   case Bytecodes::_newarray:
   case Bytecodes::_multianewarray:
@@ -827,6 +843,8 @@
     return true;
     break;
 
+  // Don't rerun athrow since it's part of the exception path.
+  case Bytecodes::_athrow:
   case Bytecodes::_invokestatic:
   case Bytecodes::_invokedynamic:
   case Bytecodes::_invokespecial:
@@ -1376,6 +1394,10 @@
     set_parse_bci(iter().cur_bci());
 
     if (bci() == block()->limit()) {
+      // insert a predicate if it falls through to a loop head block
+      if (should_add_predicate(bci())){
+        add_predicate();
+      }
       // Do not walk into the next block until directed by do_all_blocks.
       merge(bci());
       break;
@@ -2076,6 +2098,37 @@
   }
 }
 
+//------------------------------should_add_predicate--------------------------
+bool Parse::should_add_predicate(int target_bci) {
+  if (!UseLoopPredicate) return false;
+  Block* target = successor_for_bci(target_bci);
+  if (target != NULL          &&
+      target->is_loop_head()  &&
+      block()->rpo() < target->rpo()) {
+    return true;
+  }
+  return false;
+}
+
+//------------------------------add_predicate---------------------------------
+void Parse::add_predicate() {
+  assert(UseLoopPredicate,"use only for loop predicate");
+  Node *cont    = _gvn.intcon(1);
+  Node* opq     = _gvn.transform(new (C, 2) Opaque1Node(C, cont));
+  Node *bol     = _gvn.transform(new (C, 2) Conv2BNode(opq));
+  IfNode* iff   = create_and_map_if(control(), bol, PROB_MAX, COUNT_UNKNOWN);
+  Node* iffalse = _gvn.transform(new (C, 1) IfFalseNode(iff));
+  C->add_predicate_opaq(opq);
+  {
+    PreserveJVMState pjvms(this);
+    set_control(iffalse);
+    uncommon_trap(Deoptimization::Reason_predicate,
+                  Deoptimization::Action_maybe_recompile);
+  }
+  Node* iftrue = _gvn.transform(new (C, 1) IfTrueNode(iff));
+  set_control(iftrue);
+}
+
 #ifndef PRODUCT
 //------------------------show_parse_info--------------------------------------
 void Parse::show_parse_info() {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/parse2.cpp
--- a/src/share/vm/opto/parse2.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/parse2.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
@@ -278,6 +278,11 @@
   if (len < 1) {
     // If this is a backward branch, add safepoint
     maybe_add_safepoint(default_dest);
+    if (should_add_predicate(default_dest)){
+      _sp += 1; // set original stack for use by uncommon_trap
+      add_predicate();
+      _sp -= 1;
+    }
     merge(default_dest);
     return;
   }
@@ -324,6 +329,11 @@
 
   if (len < 1) {    // If this is a backward branch, add safepoint
     maybe_add_safepoint(default_dest);
+    if (should_add_predicate(default_dest)){
+      _sp += 1; // set original stack for use by uncommon_trap
+      add_predicate();
+      _sp -= 1;
+    }
     merge(default_dest);
     return;
   }
@@ -731,6 +741,9 @@
   push(_gvn.makecon(ret_addr));
 
   // Flow to the jsr.
+  if (should_add_predicate(jsr_bci)){
+    add_predicate();
+  }
   merge(jsr_bci);
 }
 
@@ -881,7 +894,7 @@
 
 //-------------------------------repush_if_args--------------------------------
 // Push arguments of an "if" bytecode back onto the stack by adjusting _sp.
-inline void Parse::repush_if_args() {
+inline int Parse::repush_if_args() {
 #ifndef PRODUCT
   if (PrintOpto && WizardMode) {
     tty->print("defending against excessive implicit null exceptions on %s @%d in ",
@@ -895,6 +908,7 @@
   assert(argument(0) != NULL, "must exist");
   assert(bc_depth == 1 || argument(1) != NULL, "two must exist");
   _sp += bc_depth;
+  return bc_depth;
 }
 
 //----------------------------------do_ifnull----------------------------------
@@ -954,8 +968,14 @@
       // Update method data
       profile_taken_branch(target_bci);
       adjust_map_after_if(btest, c, prob, branch_block, next_block);
-      if (!stopped())
+      if (!stopped()) {
+        if (should_add_predicate(target_bci)){ // add a predicate if it branches to a loop
+          int nargs = repush_if_args(); // set original stack for uncommon_trap
+          add_predicate();
+          _sp -= nargs;
+        }
         merge(target_bci);
+      }
     }
   }
 
@@ -1076,8 +1096,14 @@
       // Update method data
       profile_taken_branch(target_bci);
       adjust_map_after_if(taken_btest, c, prob, branch_block, next_block);
-      if (!stopped())
+      if (!stopped()) {
+        if (should_add_predicate(target_bci)){ // add a predicate if it branches to a loop
+          int nargs = repush_if_args(); // set original stack for the uncommon_trap
+          add_predicate();
+          _sp -= nargs;
+        }
         merge(target_bci);
+      }
     }
   }
 
@@ -1325,7 +1351,8 @@
           }
         }
       }
-      push_constant(constant);
+      bool pushed = push_constant(constant, true);
+      guarantee(pushed, "must be possible to push this constant");
     }
 
     break;
@@ -2052,13 +2079,6 @@
     // null exception oop throws NULL pointer exception
     do_null_check(peek(), T_OBJECT);
     if (stopped())  return;
-    if (env()->jvmti_can_post_exceptions()) {
-      // "Full-speed throwing" is not necessary here,
-      // since we're notifying the VM on every throw.
-      uncommon_trap(Deoptimization::Reason_unhandled,
-                    Deoptimization::Action_none);
-      return;
-    }
     // Hook the thrown exception directly to subsequent handlers.
     if (BailoutToInterpreterForThrows) {
       // Keep method interpreted from now on.
@@ -2066,6 +2086,11 @@
                     Deoptimization::Action_make_not_compilable);
       return;
     }
+    if (env()->jvmti_can_post_on_exceptions()) {
+      // check if we must post exception events, take uncommon trap if so (with must_throw = false)
+      uncommon_trap_if_should_post_on_exceptions(Deoptimization::Reason_unhandled, false);
+    }
+    // Here if either can_post_on_exceptions or should_post_on_exceptions is false
     add_exception_state(make_exception_state(peek()));
     break;
 
@@ -2079,6 +2104,10 @@
     // Update method data
     profile_taken_branch(target_bci);
 
+    // Add loop predicate if it goes to a loop
+    if (should_add_predicate(target_bci)){
+      add_predicate();
+    }
     // Merge the current control into the target basic block
     merge(target_bci);
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/parse3.cpp
--- a/src/share/vm/opto/parse3.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/parse3.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
@@ -125,7 +125,25 @@
 
 void Parse::do_get_xxx(const TypePtr* obj_type, Node* obj, ciField* field, bool is_field) {
   // Does this field have a constant value?  If so, just push the value.
-  if (field->is_constant() && push_constant(field->constant_value()))  return;
+  if (field->is_constant()) {
+    if (field->is_static()) {
+      // final static field
+      if (push_constant(field->constant_value()))
+        return;
+    }
+    else {
+      // final non-static field of a trusted class ({java,sun}.dyn
+      // classes).
+      if (obj->is_Con()) {
+        const TypeOopPtr* oop_ptr = obj->bottom_type()->isa_oopptr();
+        ciObject* constant_oop = oop_ptr->const_oop();
+        ciConstant constant = field->constant_value_of(constant_oop);
+
+        if (push_constant(constant, true))
+          return;
+      }
+    }
+  }
 
   ciType* field_klass = field->type();
   bool is_vol = field->is_volatile();
@@ -145,7 +163,7 @@
     if (!field->type()->is_loaded()) {
       type = TypeInstPtr::BOTTOM;
       must_assert_null = true;
-    } else if (field->is_constant()) {
+    } else if (field->is_constant() && field->is_static()) {
       // This can happen if the constant oop is non-perm.
       ciObject* con = field->constant_value().as_object();
       // Do not "join" in the previous type; it doesn't add value,
@@ -240,19 +258,19 @@
     // membar is dependent on the store, keeping any other membars generated
     // below from floating up past the store.
     int adr_idx = C->get_alias_index(adr_type);
-    insert_mem_bar_volatile(Op_MemBarVolatile, adr_idx);
+    insert_mem_bar_volatile(Op_MemBarVolatile, adr_idx, store);
 
     // Now place a membar for AliasIdxBot for the unknown yet-to-be-parsed
     // volatile alias indices. Skip this if the membar is redundant.
     if (adr_idx != Compile::AliasIdxBot) {
-      insert_mem_bar_volatile(Op_MemBarVolatile, Compile::AliasIdxBot);
+      insert_mem_bar_volatile(Op_MemBarVolatile, Compile::AliasIdxBot, store);
     }
 
     // Finally, place alias-index-specific membars for each volatile index
     // that isn't the adr_idx membar. Typically there's only 1 or 2.
     for( int i = Compile::AliasIdxRaw; i < C->num_alias_types(); i++ ) {
       if (i != adr_idx && C->alias_type(i)->is_volatile()) {
-        insert_mem_bar_volatile(Op_MemBarVolatile, i);
+        insert_mem_bar_volatile(Op_MemBarVolatile, i, store);
       }
     }
   }
@@ -267,7 +285,7 @@
 }
 
 
-bool Parse::push_constant(ciConstant constant) {
+bool Parse::push_constant(ciConstant constant, bool require_constant) {
   switch (constant.basic_type()) {
   case T_BOOLEAN:  push( intcon(constant.as_boolean()) ); break;
   case T_INT:      push( intcon(constant.as_int())     ); break;
@@ -279,13 +297,16 @@
   case T_LONG:     push_pair( longcon(constant.as_long()) ); break;
   case T_ARRAY:
   case T_OBJECT: {
-    // the oop is in perm space if the ciObject "has_encoding"
+    // cases:
+    //   can_be_constant    = (oop not scavengable || ScavengeRootsInCode != 0)
+    //   should_be_constant = (oop not scavengable || ScavengeRootsInCode >= 2)
+    // An oop is not scavengable if it is in the perm gen.
     ciObject* oop_constant = constant.as_object();
     if (oop_constant->is_null_object()) {
       push( zerocon(T_OBJECT) );
       break;
-    } else if (oop_constant->has_encoding()) {
-      push( makecon(TypeOopPtr::make_from_constant(oop_constant)) );
+    } else if (require_constant || oop_constant->should_be_constant()) {
+      push( makecon(TypeOopPtr::make_from_constant(oop_constant, require_constant)) );
       break;
     } else {
       // we cannot inline the oop, but we can use it later to narrow a type
@@ -418,8 +439,18 @@
 
   // Can use multianewarray instead of [a]newarray if only one dimension,
   // or if all non-final dimensions are small constants.
-  if (expand_count == 1 || (1 <= expand_count && expand_count <= expand_limit)) {
-    Node* obj = expand_multianewarray(array_klass, &length[0], ndimensions, ndimensions);
+  if (ndimensions == 1 || (1 <= expand_count && expand_count <= expand_limit)) {
+    Node* obj = NULL;
+    // Set the original stack and the reexecute bit for the interpreter
+    // to reexecute the multianewarray bytecode if deoptimization happens.
+    // Do it unconditionally even for one dimension multianewarray.
+    // Note: the reexecute bit will be set in GraphKit::add_safepoint_edges()
+    // when AllocateArray node for newarray is created.
+    { PreserveReexecuteState preexecs(this);
+      _sp += ndimensions;
+      // Pass 0 as nargs since uncommon trap code does not need to restore stack.
+      obj = expand_multianewarray(array_klass, &length[0], ndimensions, 0);
+    } //original reexecute and sp are set back here
     push(obj);
     return;
   }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/parseHelper.cpp
--- a/src/share/vm/opto/parseHelper.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/parseHelper.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -221,6 +221,14 @@
 
   // Push resultant oop onto stack
   push(obj);
+
+  // Keep track of whether opportunities exist for StringBuilder
+  // optimizations.
+  if (OptimizeStringConcat &&
+      (klass == C->env()->StringBuilder_klass() ||
+       klass == C->env()->StringBuffer_klass())) {
+    C->set_has_stringbuilder(true);
+  }
 }
 
 #ifndef PRODUCT
@@ -406,8 +414,6 @@
 void Parse::profile_call(Node* receiver) {
   if (!method_data_update()) return;
 
-  profile_generic_call();
-
   switch (bc()) {
   case Bytecodes::_invokevirtual:
   case Bytecodes::_invokeinterface:
@@ -416,6 +422,7 @@
   case Bytecodes::_invokestatic:
   case Bytecodes::_invokedynamic:
   case Bytecodes::_invokespecial:
+    profile_generic_call();
     break;
   default: fatal("unexpected call bytecode");
   }
@@ -436,13 +443,16 @@
 void Parse::profile_receiver_type(Node* receiver) {
   assert(method_data_update(), "must be generating profile code");
 
-  // Skip if we aren't tracking receivers
-  if (TypeProfileWidth < 1) return;
-
   ciMethodData* md = method()->method_data();
   assert(md != NULL, "expected valid ciMethodData");
   ciProfileData* data = md->bci_to_data(bci());
   assert(data->is_ReceiverTypeData(), "need ReceiverTypeData here");
+
+  // Skip if we aren't tracking receivers
+  if (TypeProfileWidth < 1) {
+    increment_md_counter_at(md, data, CounterData::count_offset());
+    return;
+  }
   ciReceiverTypeData* rdata = (ciReceiverTypeData*)data->as_ReceiverTypeData();
 
   Node* method_data = method_data_addressing(md, rdata, in_ByteSize(0));
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/phase.cpp
--- a/src/share/vm/opto/phase.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/phase.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -53,6 +53,7 @@
 elapsedTimer Phase::_t_registerMethod;
 elapsedTimer Phase::_t_temporaryTimer1;
 elapsedTimer Phase::_t_temporaryTimer2;
+elapsedTimer Phase::_t_idealLoopVerify;
 
 // Subtimers for _t_optimizer
 elapsedTimer   Phase::_t_iterGVN;
@@ -88,51 +89,52 @@
   tty->print_cr ("Accumulated compiler times:");
   tty->print_cr ("---------------------------");
   tty->print_cr ("  Total compilation: %3.3f sec.", Phase::_t_totalCompilation.seconds());
-  tty->print    ("    method compilation : %3.3f sec", Phase::_t_methodCompilation.seconds());
+  tty->print    ("    method compilation   : %3.3f sec", Phase::_t_methodCompilation.seconds());
   tty->print    ("/%d bytes",_total_bytes_compiled);
   tty->print_cr (" (%3.0f bytes per sec) ", Phase::_total_bytes_compiled / Phase::_t_methodCompilation.seconds());
-  tty->print_cr ("    stub compilation   : %3.3f sec.", Phase::_t_stubCompilation.seconds());
+  tty->print_cr ("    stub compilation     : %3.3f sec.", Phase::_t_stubCompilation.seconds());
   tty->print_cr ("  Phases:");
-  tty->print_cr ("    parse        : %3.3f sec", Phase::_t_parser.seconds());
+  tty->print_cr ("    parse          : %3.3f sec", Phase::_t_parser.seconds());
   if (DoEscapeAnalysis) {
-    tty->print_cr ("    escape analysis : %3.3f sec", Phase::_t_escapeAnalysis.seconds());
+    tty->print_cr ("    escape analysis   : %3.3f sec", Phase::_t_escapeAnalysis.seconds());
   }
-  tty->print_cr ("    optimizer    : %3.3f sec", Phase::_t_optimizer.seconds());
+  tty->print_cr ("    optimizer      : %3.3f sec", Phase::_t_optimizer.seconds());
   if( Verbose || WizardMode ) {
-    tty->print_cr ("      iterGVN      : %3.3f sec", Phase::_t_iterGVN.seconds());
-    tty->print_cr ("      idealLoop    : %3.3f sec", Phase::_t_idealLoop.seconds());
-    tty->print_cr ("      ccp          : %3.3f sec", Phase::_t_ccp.seconds());
-    tty->print_cr ("      iterGVN2     : %3.3f sec", Phase::_t_iterGVN2.seconds());
-    tty->print_cr ("      graphReshape : %3.3f sec", Phase::_t_graphReshaping.seconds());
+    tty->print_cr ("      iterGVN        : %3.3f sec", Phase::_t_iterGVN.seconds());
+    tty->print_cr ("      idealLoop      : %3.3f sec", Phase::_t_idealLoop.seconds());
+    tty->print_cr ("      idealLoopVerify: %3.3f sec", Phase::_t_idealLoopVerify.seconds());
+    tty->print_cr ("      ccp            : %3.3f sec", Phase::_t_ccp.seconds());
+    tty->print_cr ("      iterGVN2       : %3.3f sec", Phase::_t_iterGVN2.seconds());
+    tty->print_cr ("      graphReshape   : %3.3f sec", Phase::_t_graphReshaping.seconds());
     double optimizer_subtotal = Phase::_t_iterGVN.seconds() +
       Phase::_t_idealLoop.seconds() + Phase::_t_ccp.seconds() +
       Phase::_t_graphReshaping.seconds();
     double percent_of_optimizer = ((optimizer_subtotal == 0.0) ? 0.0 : (optimizer_subtotal / Phase::_t_optimizer.seconds() * 100.0));
-    tty->print_cr ("      subtotal     : %3.3f sec,  %3.2f %%", optimizer_subtotal, percent_of_optimizer);
+    tty->print_cr ("      subtotal       : %3.3f sec,  %3.2f %%", optimizer_subtotal, percent_of_optimizer);
   }
-  tty->print_cr ("    matcher      : %3.3f sec", Phase::_t_matcher.seconds());
-  tty->print_cr ("    scheduler    : %3.3f sec", Phase::_t_scheduler.seconds());
-  tty->print_cr ("    regalloc     : %3.3f sec", Phase::_t_registerAllocation.seconds());
+  tty->print_cr ("    matcher        : %3.3f sec", Phase::_t_matcher.seconds());
+  tty->print_cr ("    scheduler      : %3.3f sec", Phase::_t_scheduler.seconds());
+  tty->print_cr ("    regalloc       : %3.3f sec", Phase::_t_registerAllocation.seconds());
   if( Verbose || WizardMode ) {
-    tty->print_cr ("      ctorChaitin  : %3.3f sec", Phase::_t_ctorChaitin.seconds());
-    tty->print_cr ("      buildIFG     : %3.3f sec", Phase::_t_buildIFGphysical.seconds());
-    tty->print_cr ("      computeLive  : %3.3f sec", Phase::_t_computeLive.seconds());
-    tty->print_cr ("      regAllocSplit: %3.3f sec", Phase::_t_regAllocSplit.seconds());
+    tty->print_cr ("      ctorChaitin    : %3.3f sec", Phase::_t_ctorChaitin.seconds());
+    tty->print_cr ("      buildIFG       : %3.3f sec", Phase::_t_buildIFGphysical.seconds());
+    tty->print_cr ("      computeLive    : %3.3f sec", Phase::_t_computeLive.seconds());
+    tty->print_cr ("      regAllocSplit  : %3.3f sec", Phase::_t_regAllocSplit.seconds());
     tty->print_cr ("      postAllocCopyRemoval: %3.3f sec", Phase::_t_postAllocCopyRemoval.seconds());
-    tty->print_cr ("      fixupSpills  : %3.3f sec", Phase::_t_fixupSpills.seconds());
+    tty->print_cr ("      fixupSpills    : %3.3f sec", Phase::_t_fixupSpills.seconds());
     double regalloc_subtotal = Phase::_t_ctorChaitin.seconds() +
       Phase::_t_buildIFGphysical.seconds() + Phase::_t_computeLive.seconds() +
       Phase::_t_regAllocSplit.seconds()    + Phase::_t_fixupSpills.seconds() +
       Phase::_t_postAllocCopyRemoval.seconds();
     double percent_of_regalloc = ((regalloc_subtotal == 0.0) ? 0.0 : (regalloc_subtotal / Phase::_t_registerAllocation.seconds() * 100.0));
-    tty->print_cr ("      subtotal     : %3.3f sec,  %3.2f %%", regalloc_subtotal, percent_of_regalloc);
+    tty->print_cr ("      subtotal       : %3.3f sec,  %3.2f %%", regalloc_subtotal, percent_of_regalloc);
   }
-  tty->print_cr ("    macroExpand  : %3.3f sec", Phase::_t_macroExpand.seconds());
-  tty->print_cr ("    blockOrdering: %3.3f sec", Phase::_t_blockOrdering.seconds());
-  tty->print_cr ("    peephole     : %3.3f sec", Phase::_t_peephole.seconds());
-  tty->print_cr ("    codeGen      : %3.3f sec", Phase::_t_codeGeneration.seconds());
-  tty->print_cr ("    install_code : %3.3f sec", Phase::_t_registerMethod.seconds());
-  tty->print_cr ("    ------------ : ----------");
+  tty->print_cr ("    macroExpand    : %3.3f sec", Phase::_t_macroExpand.seconds());
+  tty->print_cr ("    blockOrdering  : %3.3f sec", Phase::_t_blockOrdering.seconds());
+  tty->print_cr ("    peephole       : %3.3f sec", Phase::_t_peephole.seconds());
+  tty->print_cr ("    codeGen        : %3.3f sec", Phase::_t_codeGeneration.seconds());
+  tty->print_cr ("    install_code   : %3.3f sec", Phase::_t_registerMethod.seconds());
+  tty->print_cr ("    -------------- : ----------");
   double phase_subtotal = Phase::_t_parser.seconds() +
     (DoEscapeAnalysis ? Phase::_t_escapeAnalysis.seconds() : 0.0) +
     Phase::_t_optimizer.seconds() + Phase::_t_graphReshaping.seconds() +
@@ -143,7 +145,7 @@
   double percent_of_method_compile = ((phase_subtotal == 0.0) ? 0.0 : phase_subtotal / Phase::_t_methodCompilation.seconds()) * 100.0;
   // counters inside Compile::CodeGen include time for adapters and stubs
   // so phase-total can be greater than 100%
-  tty->print_cr ("    total        : %3.3f sec,  %3.2f %%", phase_subtotal, percent_of_method_compile);
+  tty->print_cr ("    total          : %3.3f sec,  %3.2f %%", phase_subtotal, percent_of_method_compile);
 
   assert( percent_of_method_compile > expected_method_compile_coverage ||
           phase_subtotal < minimum_meaningful_method_compile,
@@ -157,8 +159,8 @@
     tty->cr();
     tty->print_cr ("    temporaryTimer2: %3.3f sec", Phase::_t_temporaryTimer2.seconds());
   }
-  tty->print_cr ("    output    : %3.3f sec", Phase::_t_output.seconds());
-  tty->print_cr ("      isched    : %3.3f sec", Phase::_t_instrSched.seconds());
-  tty->print_cr ("      bldOopMaps: %3.3f sec", Phase::_t_buildOopMaps.seconds());
+  tty->print_cr ("    output         : %3.3f sec", Phase::_t_output.seconds());
+  tty->print_cr ("      isched         : %3.3f sec", Phase::_t_instrSched.seconds());
+  tty->print_cr ("      bldOopMaps     : %3.3f sec", Phase::_t_buildOopMaps.seconds());
 }
 #endif
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/phase.hpp
--- a/src/share/vm/opto/phase.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/phase.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -44,6 +44,7 @@
     BlockLayout,                // Linear ordering of blocks
     Register_Allocation,        // Register allocation, duh
     LIVE,                       // Dragon-book LIVE range problem
+    StringOpts,                 // StringBuilder related optimizations
     Interference_Graph,         // Building the IFG
     Coalesce,                   // Coalescing copies
     Ideal_Loop,                 // Find idealized trip-counted loops
@@ -83,6 +84,7 @@
   static elapsedTimer _t_registerMethod;
   static elapsedTimer _t_temporaryTimer1;
   static elapsedTimer _t_temporaryTimer2;
+  static elapsedTimer _t_idealLoopVerify;
 
 // Subtimers for _t_optimizer
   static elapsedTimer   _t_iterGVN;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/phaseX.cpp
--- a/src/share/vm/opto/phaseX.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/phaseX.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -1502,7 +1502,7 @@
 //---------------------------------saturate------------------------------------
 const Type* PhaseCCP::saturate(const Type* new_type, const Type* old_type,
                                const Type* limit_type) const {
-  const Type* wide_type = new_type->widen(old_type);
+  const Type* wide_type = new_type->widen(old_type, limit_type);
   if (wide_type != new_type) {          // did we widen?
     // If so, we may have widened beyond the limit type.  Clip it back down.
     new_type = wide_type->filter(limit_type);
@@ -1622,9 +1622,11 @@
   // old goes dead?
   if( old ) {
     switch (old->outcnt()) {
-    case 0:      // Kill all his inputs, and recursively kill other dead nodes.
+    case 0:
+      // Put into the worklist to kill later. We do not kill it now because the
+      // recursive kill will delete the current node (this) if dead-loop exists
       if (!old->is_top())
-        igvn->remove_dead_node( old );
+        igvn->_worklist.push( old );
       break;
     case 1:
       if( old->is_Store() || old->has_special_unique_user() )
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/phaseX.hpp
--- a/src/share/vm/opto/phaseX.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/phaseX.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -345,7 +345,11 @@
   Node  *hash_find(const Node *n) { return _table.hash_find(n); }
 
   // Used after parsing to eliminate values that are no longer in program
-  void   remove_useless_nodes(VectorSet &useful) { _table.remove_useless_nodes(useful); }
+  void   remove_useless_nodes(VectorSet &useful) {
+    _table.remove_useless_nodes(useful);
+    // this may invalidate cached cons so reset the cache
+    init_con_caches();
+  }
 
   virtual ConNode* uncached_makecon(const Type* t);  // override from PhaseTransform
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/postaloc.cpp
--- a/src/share/vm/opto/postaloc.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/postaloc.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 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
@@ -88,6 +88,7 @@
       value->map(old_reg,NULL);  // Yank from value/regnd maps
       regnd->map(old_reg,NULL);  // This register's value is now unknown
     }
+    assert(old->req() <= 2, "can't handle more inputs");
     Node *tmp = old->req() > 1 ? old->in(1) : NULL;
     old->disconnect_inputs(NULL);
     if( !tmp ) break;
@@ -530,6 +531,16 @@
       // Do not change from int to pointer
       Node *val = skip_copies(n);
 
+      // Clear out a dead definition before starting so that the
+      // elimination code doesn't have to guard against it.  The
+      // definition could in fact be a kill projection with a count of
+      // 0 which is safe but since those are uninteresting for copy
+      // elimination just delete them as well.
+      if (regnd[nreg] != NULL && regnd[nreg]->outcnt() == 0) {
+        regnd.map(nreg, NULL);
+        value.map(nreg, NULL);
+      }
+
       uint n_ideal_reg = n->ideal_reg();
       if( is_single_register(n_ideal_reg) ) {
         // If Node 'n' does not change the value mapped by the register,
@@ -537,8 +548,7 @@
         // mapping so 'n' will go dead.
         if( value[nreg] != val ) {
           if (eliminate_copy_of_constant(val, n, b, value, regnd, nreg, OptoReg::Bad)) {
-            n->replace_by(regnd[nreg]);
-            j -= yank_if_dead(n,b,&value,&regnd);
+            j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
           } else {
             // Update the mapping: record new Node defined by the register
             regnd.map(nreg,n);
@@ -546,10 +556,9 @@
             // Node after skipping all copies.
             value.map(nreg,val);
           }
-        } else if( !may_be_copy_of_callee(n) && regnd[nreg]->outcnt() != 0 ) {
+        } else if( !may_be_copy_of_callee(n) ) {
           assert( n->is_Copy(), "" );
-          n->replace_by(regnd[nreg]);
-          j -= yank_if_dead(n,b,&value,&regnd);
+          j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
         }
       } else {
         // If the value occupies a register pair, record same info
@@ -565,18 +574,16 @@
         }
         if( value[nreg] != val || value[nreg_lo] != val ) {
           if (eliminate_copy_of_constant(val, n, b, value, regnd, nreg, nreg_lo)) {
-            n->replace_by(regnd[nreg]);
-            j -= yank_if_dead(n,b,&value,&regnd);
+            j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
           } else {
             regnd.map(nreg   , n );
             regnd.map(nreg_lo, n );
             value.map(nreg   ,val);
             value.map(nreg_lo,val);
           }
-        } else if( !may_be_copy_of_callee(n) && regnd[nreg]->outcnt() != 0 ) {
+        } else if( !may_be_copy_of_callee(n) ) {
           assert( n->is_Copy(), "" );
-          n->replace_by(regnd[nreg]);
-          j -= yank_if_dead(n,b,&value,&regnd);
+          j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
         }
       }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/runtime.cpp
--- a/src/share/vm/opto/runtime.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/runtime.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
@@ -143,18 +143,20 @@
 // We failed the fast-path allocation.  Now we need to do a scavenge or GC
 // and try allocation again.
 
-void OptoRuntime::do_eager_card_mark(JavaThread* thread) {
+void OptoRuntime::new_store_pre_barrier(JavaThread* thread) {
   // After any safepoint, just before going back to compiled code,
-  // we perform a card mark.  This lets the compiled code omit
-  // card marks for initialization of new objects.
-  // Keep this code consistent with GraphKit::store_barrier.
+  // we inform the GC that we will be doing initializing writes to
+  // this object in the future without emitting card-marks, so
+  // GC may take any compensating steps.
+  // NOTE: Keep this code consistent with GraphKit::store_barrier.
 
   oop new_obj = thread->vm_result();
   if (new_obj == NULL)  return;
 
   assert(Universe::heap()->can_elide_tlab_store_barriers(),
          "compiler must check this first");
-  new_obj = Universe::heap()->new_store_barrier(new_obj);
+  // GC may decide to give back a safer copy of new_obj.
+  new_obj = Universe::heap()->new_store_pre_barrier(thread, new_obj);
   thread->set_vm_result(new_obj);
 }
 
@@ -197,8 +199,8 @@
   JRT_BLOCK_END;
 
   if (GraphKit::use_ReduceInitialCardMarks()) {
-    // do them now so we don't have to do them on the fast path
-    do_eager_card_mark(thread);
+    // inform GC that we won't do card marks for initializing writes.
+    new_store_pre_barrier(thread);
   }
 JRT_END
 
@@ -236,8 +238,8 @@
   JRT_BLOCK_END;
 
   if (GraphKit::use_ReduceInitialCardMarks()) {
-    // do them now so we don't have to do them on the fast path
-    do_eager_card_mark(thread);
+    // inform GC that we won't do card marks for initializing writes.
+    new_store_pre_barrier(thread);
   }
 JRT_END
 
@@ -704,6 +706,11 @@
     // vc->set_receiver_count(empty_row, DataLayout::counter_increment);
     int count_off = ReceiverTypeData::receiver_count_cell_index(empty_row);
     *(mdp + count_off) = DataLayout::counter_increment;
+  } else {
+    // Receiver did not match any saved receiver and there is no empty row for it.
+    // Increment total counter to indicate polymorphic case.
+    intptr_t* count_p = (intptr_t*)(((byte*)(data)) + in_bytes(CounterData::count_offset()));
+    *count_p += DataLayout::counter_increment;
   }
 JRT_END
 
@@ -788,7 +795,7 @@
   NOT_PRODUCT(Exceptions::debug_check_abort(exception));
 
   #ifdef ASSERT
-    if (!(exception->is_a(SystemDictionary::throwable_klass()))) {
+    if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
       // should throw an exception here
       ShouldNotReachHere();
     }
@@ -808,7 +815,7 @@
     // we are switching to old paradigm: search for exception handler in caller_frame
     // instead in exception handler of caller_frame.sender()
 
-    if (JvmtiExport::can_post_exceptions()) {
+    if (JvmtiExport::can_post_on_exceptions()) {
       // "Full-speed catching" is not necessary here,
       // since we're notifying the VM on every catch.
       // Force deoptimization and the rest of the lookup
@@ -856,6 +863,9 @@
     thread->set_exception_pc(pc);
     thread->set_exception_handler_pc(handler_address);
     thread->set_exception_stack_size(0);
+
+    // Check if the exception PC is a MethodHandle call.
+    thread->set_is_method_handle_exception(nm->is_method_handle_return(pc));
   }
 
   // Restore correct return pc.  Was saved above.
@@ -934,7 +944,7 @@
 #endif
   assert (exception != NULL, "should have thrown a NULLPointerException");
 #ifdef ASSERT
-  if (!(exception->is_a(SystemDictionary::throwable_klass()))) {
+  if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
     // should throw an exception here
     ShouldNotReachHere();
   }
@@ -970,8 +980,8 @@
     assert(stub_frame.is_runtime_frame() || exception_blob()->contains(stub_frame.pc()), "sanity check");
     frame caller_frame = stub_frame.sender(&reg_map);
 
-    VM_DeoptimizeFrame deopt(thread, caller_frame.id());
-    VMThread::execute(&deopt);
+    // bypass VM_DeoptimizeFrame and deoptimize the frame directly
+    Deoptimization::deoptimize_frame(thread, caller_frame.id());
   }
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/runtime.hpp
--- a/src/share/vm/opto/runtime.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/runtime.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -133,8 +133,9 @@
   // Allocate storage for a objArray or typeArray
   static void new_array_C(klassOopDesc* array_klass, int len, JavaThread *thread);
 
-  // Post-allocation step for implementing ReduceInitialCardMarks:
-  static void do_eager_card_mark(JavaThread* thread);
+  // Post-slow-path-allocation, pre-initializing-stores step for
+  // implementing ReduceInitialCardMarks
+  static void new_store_pre_barrier(JavaThread* thread);
 
   // Allocate storage for a multi-dimensional arrays
   // Note: needs to be fixed for arbitrary number of dimensions
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/split_if.cpp
--- a/src/share/vm/opto/split_if.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/split_if.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2010 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
@@ -187,10 +187,20 @@
   }
 #endif
 
+  // ConvI2L may have type information on it which becomes invalid if
+  // it moves up in the graph so change any clones so widen the type
+  // to TypeLong::INT when pushing it up.
+  const Type* rtype = NULL;
+  if (n->Opcode() == Op_ConvI2L && n->bottom_type() != TypeLong::INT) {
+    rtype = TypeLong::INT;
+  }
+
   // Now actually split-up this guy.  One copy per control path merging.
   Node *phi = PhiNode::make_blank(blk1, n);
   for( uint j = 1; j < blk1->req(); j++ ) {
     Node *x = n->clone();
+    // Widen the type of the ConvI2L when pushing up.
+    if (rtype != NULL) x->as_Type()->set_type(rtype);
     if( n->in(0) && n->in(0) == blk1 )
       x->set_req( 0, blk1->in(j) );
     for( uint i = 1; i < n->req(); i++ ) {
@@ -219,6 +229,7 @@
 
 //------------------------------register_new_node------------------------------
 void PhaseIdealLoop::register_new_node( Node *n, Node *blk ) {
+  assert(!n->is_CFG(), "must be data node");
   _igvn.register_new_node_with_optimizer(n);
   set_ctrl(n, blk);
   IdealLoopTree *loop = get_loop(blk);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/stringopts.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/opto/stringopts.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,1396 @@
+/*
+ * Copyright 2009-2010 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/_stringopts.cpp.incl"
+
+#define __ kit.
+
+class StringConcat : public ResourceObj {
+ private:
+  PhaseStringOpts*    _stringopts;
+  Node*               _string_alloc;
+  AllocateNode*       _begin;          // The allocation the begins the pattern
+  CallStaticJavaNode* _end;            // The final call of the pattern.  Will either be
+                                       // SB.toString or or String.<init>(SB.toString)
+  bool                _multiple;       // indicates this is a fusion of two or more
+                                       // separate StringBuilders
+
+  Node*               _arguments;      // The list of arguments to be concatenated
+  GrowableArray<int>  _mode;           // into a String along with a mode flag
+                                       // indicating how to treat the value.
+
+  Node_List           _control;        // List of control nodes that will be deleted
+  Node_List           _uncommon_traps; // Uncommon traps that needs to be rewritten
+                                       // to restart at the initial JVMState.
+ public:
+  // Mode for converting arguments to Strings
+  enum {
+    StringMode,
+    IntMode,
+    CharMode
+  };
+
+  StringConcat(PhaseStringOpts* stringopts, CallStaticJavaNode* end):
+    _end(end),
+    _begin(NULL),
+    _multiple(false),
+    _string_alloc(NULL),
+    _stringopts(stringopts) {
+    _arguments = new (_stringopts->C, 1) Node(1);
+    _arguments->del_req(0);
+  }
+
+  bool validate_control_flow();
+
+  void merge_add() {
+#if 0
+    // XXX This is place holder code for reusing an existing String
+    // allocation but the logic for checking the state safety is
+    // probably inadequate at the moment.
+    CallProjections endprojs;
+    sc->end()->extract_projections(&endprojs, false);
+    if (endprojs.resproj != NULL) {
+      for (SimpleDUIterator i(endprojs.resproj); i.has_next(); i.next()) {
+        CallStaticJavaNode *use = i.get()->isa_CallStaticJava();
+        if (use != NULL && use->method() != NULL &&
+            use->method()->holder() == C->env()->String_klass() &&
+            use->method()->name() == ciSymbol::object_initializer_name() &&
+            use->in(TypeFunc::Parms + 1) == endprojs.resproj) {
+          // Found useless new String(sb.toString()) so reuse the newly allocated String
+          // when creating the result instead of allocating a new one.
+          sc->set_string_alloc(use->in(TypeFunc::Parms));
+          sc->set_end(use);
+        }
+      }
+    }
+#endif
+  }
+
+  StringConcat* merge(StringConcat* other, Node* arg);
+
+  void set_allocation(AllocateNode* alloc) {
+    _begin = alloc;
+  }
+
+  void append(Node* value, int mode) {
+    _arguments->add_req(value);
+    _mode.append(mode);
+  }
+  void push(Node* value, int mode) {
+    _arguments->ins_req(0, value);
+    _mode.insert_before(0, mode);
+  }
+  void push_string(Node* value) {
+    push(value, StringMode);
+  }
+  void push_int(Node* value) {
+    push(value, IntMode);
+  }
+  void push_char(Node* value) {
+    push(value, CharMode);
+  }
+
+  Node* argument(int i) {
+    return _arguments->in(i);
+  }
+  void set_argument(int i, Node* value) {
+    _arguments->set_req(i, value);
+  }
+  int num_arguments() {
+    return _mode.length();
+  }
+  int mode(int i) {
+    return _mode.at(i);
+  }
+  void add_control(Node* ctrl) {
+    assert(!_control.contains(ctrl), "only push once");
+    _control.push(ctrl);
+  }
+  CallStaticJavaNode* end() { return _end; }
+  AllocateNode* begin() { return _begin; }
+  Node* string_alloc() { return _string_alloc; }
+
+  void eliminate_unneeded_control();
+  void eliminate_initialize(InitializeNode* init);
+  void eliminate_call(CallNode* call);
+
+  void maybe_log_transform() {
+    CompileLog* log = _stringopts->C->log();
+    if (log != NULL) {
+      log->head("replace_string_concat arguments='%d' string_alloc='%d' multiple='%d'",
+                num_arguments(),
+                _string_alloc != NULL,
+                _multiple);
+      JVMState* p = _begin->jvms();
+      while (p != NULL) {
+        log->elem("jvms bci='%d' method='%d'", p->bci(), log->identify(p->method()));
+        p = p->caller();
+      }
+      log->tail("replace_string_concat");
+    }
+  }
+
+  void convert_uncommon_traps(GraphKit& kit, const JVMState* jvms) {
+    for (uint u = 0; u < _uncommon_traps.size(); u++) {
+      Node* uct = _uncommon_traps.at(u);
+
+      // Build a new call using the jvms state of the allocate
+      address call_addr = SharedRuntime::uncommon_trap_blob()->instructions_begin();
+      const TypeFunc* call_type = OptoRuntime::uncommon_trap_Type();
+      int size = call_type->domain()->cnt();
+      const TypePtr* no_memory_effects = NULL;
+      Compile* C = _stringopts->C;
+      CallStaticJavaNode* call = new (C, size) CallStaticJavaNode(call_type, call_addr, "uncommon_trap",
+                                                                  jvms->bci(), no_memory_effects);
+      for (int e = 0; e < TypeFunc::Parms; e++) {
+        call->init_req(e, uct->in(e));
+      }
+      // Set the trap request to record intrinsic failure if this trap
+      // is taken too many times.  Ideally we would handle then traps by
+      // doing the original bookkeeping in the MDO so that if it caused
+      // the code to be thrown out we could still recompile and use the
+      // optimization.  Failing the uncommon traps doesn't really mean
+      // that the optimization is a bad idea but there's no other way to
+      // do the MDO updates currently.
+      int trap_request = Deoptimization::make_trap_request(Deoptimization::Reason_intrinsic,
+                                                           Deoptimization::Action_make_not_entrant);
+      call->init_req(TypeFunc::Parms, __ intcon(trap_request));
+      kit.add_safepoint_edges(call);
+
+      _stringopts->gvn()->transform(call);
+      C->gvn_replace_by(uct, call);
+      uct->disconnect_inputs(NULL);
+    }
+  }
+
+  void cleanup() {
+    // disconnect the hook node
+    _arguments->disconnect_inputs(NULL);
+  }
+};
+
+
+void StringConcat::eliminate_unneeded_control() {
+  eliminate_initialize(begin()->initialization());
+  for (uint i = 0; i < _control.size(); i++) {
+    Node* n = _control.at(i);
+    if (n->is_Call()) {
+      if (n != _end) {
+        eliminate_call(n->as_Call());
+      }
+    } else if (n->is_IfTrue()) {
+      Compile* C = _stringopts->C;
+      C->gvn_replace_by(n, n->in(0)->in(0));
+      C->gvn_replace_by(n->in(0), C->top());
+    }
+  }
+}
+
+
+StringConcat* StringConcat::merge(StringConcat* other, Node* arg) {
+  StringConcat* result = new StringConcat(_stringopts, _end);
+  for (uint x = 0; x < _control.size(); x++) {
+    Node* n = _control.at(x);
+    if (n->is_Call()) {
+      result->_control.push(n);
+    }
+  }
+  for (uint x = 0; x < other->_control.size(); x++) {
+    Node* n = other->_control.at(x);
+    if (n->is_Call()) {
+      result->_control.push(n);
+    }
+  }
+  assert(result->_control.contains(other->_end), "what?");
+  assert(result->_control.contains(_begin), "what?");
+  for (int x = 0; x < num_arguments(); x++) {
+    if (argument(x) == arg) {
+      // replace the toString result with the all the arguments that
+      // made up the other StringConcat
+      for (int y = 0; y < other->num_arguments(); y++) {
+        result->append(other->argument(y), other->mode(y));
+      }
+    } else {
+      result->append(argument(x), mode(x));
+    }
+  }
+  result->set_allocation(other->_begin);
+  result->_multiple = true;
+  return result;
+}
+
+
+void StringConcat::eliminate_call(CallNode* call) {
+  Compile* C = _stringopts->C;
+  CallProjections projs;
+  call->extract_projections(&projs, false);
+  if (projs.fallthrough_catchproj != NULL) {
+    C->gvn_replace_by(projs.fallthrough_catchproj, call->in(TypeFunc::Control));
+  }
+  if (projs.fallthrough_memproj != NULL) {
+    C->gvn_replace_by(projs.fallthrough_memproj, call->in(TypeFunc::Memory));
+  }
+  if (projs.catchall_memproj != NULL) {
+    C->gvn_replace_by(projs.catchall_memproj, C->top());
+  }
+  if (projs.fallthrough_ioproj != NULL) {
+    C->gvn_replace_by(projs.fallthrough_ioproj, call->in(TypeFunc::I_O));
+  }
+  if (projs.catchall_ioproj != NULL) {
+    C->gvn_replace_by(projs.catchall_ioproj, C->top());
+  }
+  if (projs.catchall_catchproj != NULL) {
+    // EA can't cope with the partially collapsed graph this
+    // creates so put it on the worklist to be collapsed later.
+    for (SimpleDUIterator i(projs.catchall_catchproj); i.has_next(); i.next()) {
+      Node *use = i.get();
+      int opc = use->Opcode();
+      if (opc == Op_CreateEx || opc == Op_Region) {
+        _stringopts->record_dead_node(use);
+      }
+    }
+    C->gvn_replace_by(projs.catchall_catchproj, C->top());
+  }
+  if (projs.resproj != NULL) {
+    C->gvn_replace_by(projs.resproj, C->top());
+  }
+  C->gvn_replace_by(call, C->top());
+}
+
+void StringConcat::eliminate_initialize(InitializeNode* init) {
+  Compile* C = _stringopts->C;
+
+  // Eliminate Initialize node.
+  assert(init->outcnt() <= 2, "only a control and memory projection expected");
+  assert(init->req() <= InitializeNode::RawStores, "no pending inits");
+  Node *ctrl_proj = init->proj_out(TypeFunc::Control);
+  if (ctrl_proj != NULL) {
+    C->gvn_replace_by(ctrl_proj, init->in(TypeFunc::Control));
+  }
+  Node *mem_proj = init->proj_out(TypeFunc::Memory);
+  if (mem_proj != NULL) {
+    Node *mem = init->in(TypeFunc::Memory);
+    C->gvn_replace_by(mem_proj, mem);
+  }
+  C->gvn_replace_by(init, C->top());
+  init->disconnect_inputs(NULL);
+}
+
+Node_List PhaseStringOpts::collect_toString_calls() {
+  Node_List string_calls;
+  Node_List worklist;
+
+  _visited.Clear();
+
+  // Prime the worklist
+  for (uint i = 1; i < C->root()->len(); i++) {
+    Node* n = C->root()->in(i);
+    if (n != NULL && !_visited.test_set(n->_idx)) {
+      worklist.push(n);
+    }
+  }
+
+  while (worklist.size() > 0) {
+    Node* ctrl = worklist.pop();
+    if (ctrl->is_CallStaticJava()) {
+      CallStaticJavaNode* csj = ctrl->as_CallStaticJava();
+      ciMethod* m = csj->method();
+      if (m != NULL &&
+          (m->intrinsic_id() == vmIntrinsics::_StringBuffer_toString ||
+           m->intrinsic_id() == vmIntrinsics::_StringBuilder_toString)) {
+        string_calls.push(csj);
+      }
+    }
+    if (ctrl->in(0) != NULL && !_visited.test_set(ctrl->in(0)->_idx)) {
+      worklist.push(ctrl->in(0));
+    }
+    if (ctrl->is_Region()) {
+      for (uint i = 1; i < ctrl->len(); i++) {
+        if (ctrl->in(i) != NULL && !_visited.test_set(ctrl->in(i)->_idx)) {
+          worklist.push(ctrl->in(i));
+        }
+      }
+    }
+  }
+  return string_calls;
+}
+
+
+StringConcat* PhaseStringOpts::build_candidate(CallStaticJavaNode* call) {
+  ciMethod* m = call->method();
+  ciSymbol* string_sig;
+  ciSymbol* int_sig;
+  ciSymbol* char_sig;
+  if (m->holder() == C->env()->StringBuilder_klass()) {
+    string_sig = ciSymbol::String_StringBuilder_signature();
+    int_sig = ciSymbol::int_StringBuilder_signature();
+    char_sig = ciSymbol::char_StringBuilder_signature();
+  } else if (m->holder() == C->env()->StringBuffer_klass()) {
+    string_sig = ciSymbol::String_StringBuffer_signature();
+    int_sig = ciSymbol::int_StringBuffer_signature();
+    char_sig = ciSymbol::char_StringBuffer_signature();
+  } else {
+    return NULL;
+  }
+#ifndef PRODUCT
+  if (PrintOptimizeStringConcat) {
+    tty->print("considering toString call in ");
+    call->jvms()->dump_spec(tty); tty->cr();
+  }
+#endif
+
+  StringConcat* sc = new StringConcat(this, call);
+
+  AllocateNode* alloc = NULL;
+  InitializeNode* init = NULL;
+
+  // possible opportunity for StringBuilder fusion
+  CallStaticJavaNode* cnode = call;
+  while (cnode) {
+    Node* recv = cnode->in(TypeFunc::Parms)->uncast();
+    if (recv->is_Proj()) {
+      recv = recv->in(0);
+    }
+    cnode = recv->isa_CallStaticJava();
+    if (cnode == NULL) {
+      alloc = recv->isa_Allocate();
+      if (alloc == NULL) {
+        break;
+      }
+      // Find the constructor call
+      Node* result = alloc->result_cast();
+      if (result == NULL || !result->is_CheckCastPP()) {
+        // strange looking allocation
+#ifndef PRODUCT
+        if (PrintOptimizeStringConcat) {
+          tty->print("giving up because allocation looks strange ");
+          alloc->jvms()->dump_spec(tty); tty->cr();
+        }
+#endif
+        break;
+      }
+      Node* constructor = NULL;
+      for (SimpleDUIterator i(result); i.has_next(); i.next()) {
+        CallStaticJavaNode *use = i.get()->isa_CallStaticJava();
+        if (use != NULL && use->method() != NULL &&
+            use->method()->name() == ciSymbol::object_initializer_name() &&
+            use->method()->holder() == m->holder()) {
+          // Matched the constructor.
+          ciSymbol* sig = use->method()->signature()->as_symbol();
+          if (sig == ciSymbol::void_method_signature() ||
+              sig == ciSymbol::int_void_signature() ||
+              sig == ciSymbol::string_void_signature()) {
+            if (sig == ciSymbol::string_void_signature()) {
+              // StringBuilder(String) so pick this up as the first argument
+              assert(use->in(TypeFunc::Parms + 1) != NULL, "what?");
+              sc->push_string(use->in(TypeFunc::Parms + 1));
+            }
+            // The int variant takes an initial size for the backing
+            // array so just treat it like the void version.
+            constructor = use;
+          } else {
+#ifndef PRODUCT
+            if (PrintOptimizeStringConcat) {
+              tty->print("unexpected constructor signature: %s", sig->as_utf8());
+            }
+#endif
+          }
+          break;
+        }
+      }
+      if (constructor == NULL) {
+        // couldn't find constructor
+#ifndef PRODUCT
+        if (PrintOptimizeStringConcat) {
+          tty->print("giving up because couldn't find constructor ");
+          alloc->jvms()->dump_spec(tty);
+        }
+#endif
+        break;
+      }
+
+      // Walked all the way back and found the constructor call so see
+      // if this call converted into a direct string concatenation.
+      sc->add_control(call);
+      sc->add_control(constructor);
+      sc->add_control(alloc);
+      sc->set_allocation(alloc);
+      if (sc->validate_control_flow()) {
+        return sc;
+      } else {
+        return NULL;
+      }
+    } else if (cnode->method() == NULL) {
+      break;
+    } else if (cnode->method()->holder() == m->holder() &&
+               cnode->method()->name() == ciSymbol::append_name() &&
+               (cnode->method()->signature()->as_symbol() == string_sig ||
+                cnode->method()->signature()->as_symbol() == char_sig ||
+                cnode->method()->signature()->as_symbol() == int_sig)) {
+      sc->add_control(cnode);
+      Node* arg = cnode->in(TypeFunc::Parms + 1);
+      if (cnode->method()->signature()->as_symbol() == int_sig) {
+        sc->push_int(arg);
+      } else if (cnode->method()->signature()->as_symbol() == char_sig) {
+        sc->push_char(arg);
+      } else {
+        if (arg->is_Proj() && arg->in(0)->is_CallStaticJava()) {
+          CallStaticJavaNode* csj = arg->in(0)->as_CallStaticJava();
+          if (csj->method() != NULL &&
+              csj->method()->holder() == C->env()->Integer_klass() &&
+              csj->method()->name() == ciSymbol::toString_name()) {
+            sc->add_control(csj);
+            sc->push_int(csj->in(TypeFunc::Parms));
+            continue;
+          }
+        }
+        sc->push_string(arg);
+      }
+      continue;
+    } else {
+      // some unhandled signature
+#ifndef PRODUCT
+      if (PrintOptimizeStringConcat) {
+        tty->print("giving up because encountered unexpected signature ");
+        cnode->tf()->dump(); tty->cr();
+        cnode->in(TypeFunc::Parms + 1)->dump();
+      }
+#endif
+      break;
+    }
+  }
+  return NULL;
+}
+
+
+PhaseStringOpts::PhaseStringOpts(PhaseGVN* gvn, Unique_Node_List*):
+  Phase(StringOpts),
+  _gvn(gvn),
+  _visited(Thread::current()->resource_area()) {
+
+  assert(OptimizeStringConcat, "shouldn't be here");
+
+  size_table_field = C->env()->Integer_klass()->get_field_by_name(ciSymbol::make("sizeTable"),
+                                                                  ciSymbol::make("[I"), true);
+  if (size_table_field == NULL) {
+    // Something wrong so give up.
+    assert(false, "why can't we find Integer.sizeTable?");
+    return;
+  }
+
+  // Collect the types needed to talk about the various slices of memory
+  const TypeInstPtr* string_type = TypeInstPtr::make(TypePtr::NotNull, C->env()->String_klass(),
+                                                     false, NULL, 0);
+
+  const TypePtr* value_field_type = string_type->add_offset(java_lang_String::value_offset_in_bytes());
+  const TypePtr* offset_field_type = string_type->add_offset(java_lang_String::offset_offset_in_bytes());
+  const TypePtr* count_field_type = string_type->add_offset(java_lang_String::count_offset_in_bytes());
+
+  value_field_idx = C->get_alias_index(value_field_type);
+  count_field_idx = C->get_alias_index(count_field_type);
+  offset_field_idx = C->get_alias_index(offset_field_type);
+  char_adr_idx = C->get_alias_index(TypeAryPtr::CHARS);
+
+  // For each locally allocated StringBuffer see if the usages can be
+  // collapsed into a single String construction.
+
+  // Run through the list of allocation looking for SB.toString to see
+  // if it's possible to fuse the usage of the SB into a single String
+  // construction.
+  GrowableArray<StringConcat*> concats;
+  Node_List toStrings = collect_toString_calls();
+  while (toStrings.size() > 0) {
+    StringConcat* sc = build_candidate(toStrings.pop()->as_CallStaticJava());
+    if (sc != NULL) {
+      concats.push(sc);
+    }
+  }
+
+  // try to coalesce separate concats
+ restart:
+  for (int c = 0; c < concats.length(); c++) {
+    StringConcat* sc = concats.at(c);
+    for (int i = 0; i < sc->num_arguments(); i++) {
+      Node* arg = sc->argument(i);
+      if (arg->is_Proj() && arg->in(0)->is_CallStaticJava()) {
+        CallStaticJavaNode* csj = arg->in(0)->as_CallStaticJava();
+        if (csj->method() != NULL &&
+            (csj->method()->holder() == C->env()->StringBuffer_klass() ||
+             csj->method()->holder() == C->env()->StringBuilder_klass()) &&
+            csj->method()->name() == ciSymbol::toString_name()) {
+          for (int o = 0; o < concats.length(); o++) {
+            if (c == o) continue;
+            StringConcat* other = concats.at(o);
+            if (other->end() == csj) {
+#ifndef PRODUCT
+              if (PrintOptimizeStringConcat) {
+                tty->print_cr("considering stacked concats");
+              }
+#endif
+
+              StringConcat* merged = sc->merge(other, arg);
+              if (merged->validate_control_flow()) {
+#ifndef PRODUCT
+                if (PrintOptimizeStringConcat) {
+                  tty->print_cr("stacking would succeed");
+                }
+#endif
+                if (c < o) {
+                  concats.remove_at(o);
+                  concats.at_put(c, merged);
+                } else {
+                  concats.remove_at(c);
+                  concats.at_put(o, merged);
+                }
+                goto restart;
+              } else {
+#ifndef PRODUCT
+                if (PrintOptimizeStringConcat) {
+                  tty->print_cr("stacking would fail");
+                }
+#endif
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+
+  for (int c = 0; c < concats.length(); c++) {
+    StringConcat* sc = concats.at(c);
+    replace_string_concat(sc);
+  }
+
+  remove_dead_nodes();
+}
+
+void PhaseStringOpts::record_dead_node(Node* dead) {
+  dead_worklist.push(dead);
+}
+
+void PhaseStringOpts::remove_dead_nodes() {
+  // Delete any dead nodes to make things clean enough that escape
+  // analysis doesn't get unhappy.
+  while (dead_worklist.size() > 0) {
+    Node* use = dead_worklist.pop();
+    int opc = use->Opcode();
+    switch (opc) {
+      case Op_Region: {
+        uint i = 1;
+        for (i = 1; i < use->req(); i++) {
+          if (use->in(i) != C->top()) {
+            break;
+          }
+        }
+        if (i >= use->req()) {
+          for (SimpleDUIterator i(use); i.has_next(); i.next()) {
+            Node* m = i.get();
+            if (m->is_Phi()) {
+              dead_worklist.push(m);
+            }
+          }
+          C->gvn_replace_by(use, C->top());
+        }
+        break;
+      }
+      case Op_AddP:
+      case Op_CreateEx: {
+        // Recurisvely clean up references to CreateEx so EA doesn't
+        // get unhappy about the partially collapsed graph.
+        for (SimpleDUIterator i(use); i.has_next(); i.next()) {
+          Node* m = i.get();
+          if (m->is_AddP()) {
+            dead_worklist.push(m);
+          }
+        }
+        C->gvn_replace_by(use, C->top());
+        break;
+      }
+      case Op_Phi:
+        if (use->in(0) == C->top()) {
+          C->gvn_replace_by(use, C->top());
+        }
+        break;
+    }
+  }
+}
+
+
+bool StringConcat::validate_control_flow() {
+  // We found all the calls and arguments now lets see if it's
+  // safe to transform the graph as we would expect.
+
+  // Check to see if this resulted in too many uncommon traps previously
+  if (Compile::current()->too_many_traps(_begin->jvms()->method(), _begin->jvms()->bci(),
+                        Deoptimization::Reason_intrinsic)) {
+    return false;
+  }
+
+  // Walk backwards over the control flow from toString to the
+  // allocation and make sure all the control flow is ok.  This
+  // means it's either going to be eliminated once the calls are
+  // removed or it can safely be transformed into an uncommon
+  // trap.
+
+  int null_check_count = 0;
+  Unique_Node_List ctrl_path;
+
+  assert(_control.contains(_begin), "missing");
+  assert(_control.contains(_end), "missing");
+
+  // Collect the nodes that we know about and will eliminate into ctrl_path
+  for (uint i = 0; i < _control.size(); i++) {
+    // Push the call and it's control projection
+    Node* n = _control.at(i);
+    if (n->is_Allocate()) {
+      AllocateNode* an = n->as_Allocate();
+      InitializeNode* init = an->initialization();
+      ctrl_path.push(init);
+      ctrl_path.push(init->as_Multi()->proj_out(0));
+    }
+    if (n->is_Call()) {
+      CallNode* cn = n->as_Call();
+      ctrl_path.push(cn);
+      ctrl_path.push(cn->proj_out(0));
+      ctrl_path.push(cn->proj_out(0)->unique_out());
+      ctrl_path.push(cn->proj_out(0)->unique_out()->as_Catch()->proj_out(0));
+    } else {
+      ShouldNotReachHere();
+    }
+  }
+
+  // Skip backwards through the control checking for unexpected contro flow
+  Node* ptr = _end;
+  bool fail = false;
+  while (ptr != _begin) {
+    if (ptr->is_Call() && ctrl_path.member(ptr)) {
+      ptr = ptr->in(0);
+    } else if (ptr->is_CatchProj() && ctrl_path.member(ptr)) {
+      ptr = ptr->in(0)->in(0)->in(0);
+      assert(ctrl_path.member(ptr), "should be a known piece of control");
+    } else if (ptr->is_IfTrue()) {
+      IfNode* iff = ptr->in(0)->as_If();
+      BoolNode* b = iff->in(1)->isa_Bool();
+      Node* cmp = b->in(1);
+      Node* v1 = cmp->in(1);
+      Node* v2 = cmp->in(2);
+      Node* otherproj = iff->proj_out(1 - ptr->as_Proj()->_con);
+
+      // Null check of the return of append which can simply be eliminated
+      if (b->_test._test == BoolTest::ne &&
+          v2->bottom_type() == TypePtr::NULL_PTR &&
+          v1->is_Proj() && ctrl_path.member(v1->in(0))) {
+        // NULL check of the return value of the append
+        null_check_count++;
+        if (otherproj->outcnt() == 1) {
+          CallStaticJavaNode* call = otherproj->unique_out()->isa_CallStaticJava();
+          if (call != NULL && call->_name != NULL && strcmp(call->_name, "uncommon_trap") == 0) {
+            ctrl_path.push(call);
+          }
+        }
+        _control.push(ptr);
+        ptr = ptr->in(0)->in(0);
+        continue;
+      }
+
+      // A test which leads to an uncommon trap which should be safe.
+      // Later this trap will be converted into a trap that restarts
+      // at the beginning.
+      if (otherproj->outcnt() == 1) {
+        CallStaticJavaNode* call = otherproj->unique_out()->isa_CallStaticJava();
+        if (call != NULL && call->_name != NULL && strcmp(call->_name, "uncommon_trap") == 0) {
+          // control flow leads to uct so should be ok
+          _uncommon_traps.push(call);
+          ctrl_path.push(call);
+          ptr = ptr->in(0)->in(0);
+          continue;
+        }
+      }
+
+#ifndef PRODUCT
+      // Some unexpected control flow we don't know how to handle.
+      if (PrintOptimizeStringConcat) {
+        tty->print_cr("failing with unknown test");
+        b->dump();
+        cmp->dump();
+        v1->dump();
+        v2->dump();
+        tty->cr();
+      }
+#endif
+      break;
+    } else if (ptr->is_Proj() && ptr->in(0)->is_Initialize()) {
+      ptr = ptr->in(0)->in(0);
+    } else if (ptr->is_Region()) {
+      Node* copy = ptr->as_Region()->is_copy();
+      if (copy != NULL) {
+        ptr = copy;
+        continue;
+      }
+      if (ptr->req() == 3 &&
+          ptr->in(1) != NULL && ptr->in(1)->is_Proj() &&
+          ptr->in(2) != NULL && ptr->in(2)->is_Proj() &&
+          ptr->in(1)->in(0) == ptr->in(2)->in(0) &&
+          ptr->in(1)->in(0) != NULL && ptr->in(1)->in(0)->is_If()) {
+        // Simple diamond.
+        // XXX should check for possibly merging stores.  simple data merges are ok.
+        ptr = ptr->in(1)->in(0)->in(0);
+        continue;
+      }
+#ifndef PRODUCT
+      if (PrintOptimizeStringConcat) {
+        tty->print_cr("fusion would fail for region");
+        _begin->dump();
+        ptr->dump(2);
+      }
+#endif
+      fail = true;
+      break;
+    } else {
+      // other unknown control
+      if (!fail) {
+#ifndef PRODUCT
+        if (PrintOptimizeStringConcat) {
+          tty->print_cr("fusion would fail for");
+          _begin->dump();
+        }
+#endif
+        fail = true;
+      }
+#ifndef PRODUCT
+      if (PrintOptimizeStringConcat) {
+        ptr->dump();
+      }
+#endif
+      ptr = ptr->in(0);
+    }
+  }
+#ifndef PRODUCT
+  if (PrintOptimizeStringConcat && fail) {
+    tty->cr();
+  }
+#endif
+  if (fail) return !fail;
+
+  // Validate that all these results produced are contained within
+  // this cluster of objects.  First collect all the results produced
+  // by calls in the region.
+  _stringopts->_visited.Clear();
+  Node_List worklist;
+  Node* final_result = _end->proj_out(TypeFunc::Parms);
+  for (uint i = 0; i < _control.size(); i++) {
+    CallNode* cnode = _control.at(i)->isa_Call();
+    if (cnode != NULL) {
+      _stringopts->_visited.test_set(cnode->_idx);
+    }
+    Node* result = cnode != NULL ? cnode->proj_out(TypeFunc::Parms) : NULL;
+    if (result != NULL && result != final_result) {
+      worklist.push(result);
+    }
+  }
+
+  Node* last_result = NULL;
+  while (worklist.size() > 0) {
+    Node* result = worklist.pop();
+    if (_stringopts->_visited.test_set(result->_idx))
+      continue;
+    for (SimpleDUIterator i(result); i.has_next(); i.next()) {
+      Node *use = i.get();
+      if (ctrl_path.member(use)) {
+        // already checked this
+        continue;
+      }
+      int opc = use->Opcode();
+      if (opc == Op_CmpP || opc == Op_Node) {
+        ctrl_path.push(use);
+        continue;
+      }
+      if (opc == Op_CastPP || opc == Op_CheckCastPP) {
+        for (SimpleDUIterator j(use); j.has_next(); j.next()) {
+          worklist.push(j.get());
+        }
+        worklist.push(use->in(1));
+        ctrl_path.push(use);
+        continue;
+      }
+#ifndef PRODUCT
+      if (PrintOptimizeStringConcat) {
+        if (result != last_result) {
+          last_result = result;
+          tty->print_cr("extra uses for result:");
+          last_result->dump();
+        }
+        use->dump();
+      }
+#endif
+      fail = true;
+      break;
+    }
+  }
+
+#ifndef PRODUCT
+  if (PrintOptimizeStringConcat && !fail) {
+    ttyLocker ttyl;
+    tty->cr();
+    tty->print("fusion would succeed (%d %d) for ", null_check_count, _uncommon_traps.size());
+    _begin->jvms()->dump_spec(tty); tty->cr();
+    for (int i = 0; i < num_arguments(); i++) {
+      argument(i)->dump();
+    }
+    _control.dump();
+    tty->cr();
+  }
+#endif
+
+  return !fail;
+}
+
+Node* PhaseStringOpts::fetch_static_field(GraphKit& kit, ciField* field) {
+  const TypeKlassPtr* klass_type = TypeKlassPtr::make(field->holder());
+  Node* klass_node = __ makecon(klass_type);
+  BasicType bt = field->layout_type();
+  ciType* field_klass = field->type();
+
+  const Type *type;
+  if( bt == T_OBJECT ) {
+    if (!field->type()->is_loaded()) {
+      type = TypeInstPtr::BOTTOM;
+    } else if (field->is_constant()) {
+      // This can happen if the constant oop is non-perm.
+      ciObject* con = field->constant_value().as_object();
+      // Do not "join" in the previous type; it doesn't add value,
+      // and may yield a vacuous result if the field is of interface type.
+      type = TypeOopPtr::make_from_constant(con)->isa_oopptr();
+      assert(type != NULL, "field singleton type must be consistent");
+    } else {
+      type = TypeOopPtr::make_from_klass(field_klass->as_klass());
+    }
+  } else {
+    type = Type::get_const_basic_type(bt);
+  }
+
+  return kit.make_load(NULL, kit.basic_plus_adr(klass_node, field->offset_in_bytes()),
+                       type, T_OBJECT,
+                       C->get_alias_index(klass_type->add_offset(field->offset_in_bytes())));
+}
+
+Node* PhaseStringOpts::int_stringSize(GraphKit& kit, Node* arg) {
+  RegionNode *final_merge = new (C, 3) RegionNode(3);
+  kit.gvn().set_type(final_merge, Type::CONTROL);
+  Node* final_size = new (C, 3) PhiNode(final_merge, TypeInt::INT);
+  kit.gvn().set_type(final_size, TypeInt::INT);
+
+  IfNode* iff = kit.create_and_map_if(kit.control(),
+                                      __ Bool(__ CmpI(arg, __ intcon(0x80000000)), BoolTest::ne),
+                                      PROB_FAIR, COUNT_UNKNOWN);
+  Node* is_min = __ IfFalse(iff);
+  final_merge->init_req(1, is_min);
+  final_size->init_req(1, __ intcon(11));
+
+  kit.set_control(__ IfTrue(iff));
+  if (kit.stopped()) {
+    final_merge->init_req(2, C->top());
+    final_size->init_req(2, C->top());
+  } else {
+
+    // int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i);
+    RegionNode *r = new (C, 3) RegionNode(3);
+    kit.gvn().set_type(r, Type::CONTROL);
+    Node *phi = new (C, 3) PhiNode(r, TypeInt::INT);
+    kit.gvn().set_type(phi, TypeInt::INT);
+    Node *size = new (C, 3) PhiNode(r, TypeInt::INT);
+    kit.gvn().set_type(size, TypeInt::INT);
+    Node* chk = __ CmpI(arg, __ intcon(0));
+    Node* p = __ Bool(chk, BoolTest::lt);
+    IfNode* iff = kit.create_and_map_if(kit.control(), p, PROB_FAIR, COUNT_UNKNOWN);
+    Node* lessthan = __ IfTrue(iff);
+    Node* greaterequal = __ IfFalse(iff);
+    r->init_req(1, lessthan);
+    phi->init_req(1, __ SubI(__ intcon(0), arg));
+    size->init_req(1, __ intcon(1));
+    r->init_req(2, greaterequal);
+    phi->init_req(2, arg);
+    size->init_req(2, __ intcon(0));
+    kit.set_control(r);
+    C->record_for_igvn(r);
+    C->record_for_igvn(phi);
+    C->record_for_igvn(size);
+
+    // for (int i=0; ; i++)
+    //   if (x <= sizeTable[i])
+    //     return i+1;
+    RegionNode *loop = new (C, 3) RegionNode(3);
+    loop->init_req(1, kit.control());
+    kit.gvn().set_type(loop, Type::CONTROL);
+
+    Node *index = new (C, 3) PhiNode(loop, TypeInt::INT);
+    index->init_req(1, __ intcon(0));
+    kit.gvn().set_type(index, TypeInt::INT);
+    kit.set_control(loop);
+    Node* sizeTable = fetch_static_field(kit, size_table_field);
+
+    Node* value = kit.load_array_element(NULL, sizeTable, index, TypeAryPtr::INTS);
+    C->record_for_igvn(value);
+    Node* limit = __ CmpI(phi, value);
+    Node* limitb = __ Bool(limit, BoolTest::le);
+    IfNode* iff2 = kit.create_and_map_if(kit.control(), limitb, PROB_MIN, COUNT_UNKNOWN);
+    Node* lessEqual = __ IfTrue(iff2);
+    Node* greater = __ IfFalse(iff2);
+
+    loop->init_req(2, greater);
+    index->init_req(2, __ AddI(index, __ intcon(1)));
+
+    kit.set_control(lessEqual);
+    C->record_for_igvn(loop);
+    C->record_for_igvn(index);
+
+    final_merge->init_req(2, kit.control());
+    final_size->init_req(2, __ AddI(__ AddI(index, size), __ intcon(1)));
+  }
+
+  kit.set_control(final_merge);
+  C->record_for_igvn(final_merge);
+  C->record_for_igvn(final_size);
+
+  return final_size;
+}
+
+void PhaseStringOpts::int_getChars(GraphKit& kit, Node* arg, Node* char_array, Node* start, Node* end) {
+  RegionNode *final_merge = new (C, 4) RegionNode(4);
+  kit.gvn().set_type(final_merge, Type::CONTROL);
+  Node *final_mem = PhiNode::make(final_merge, kit.memory(char_adr_idx), Type::MEMORY, TypeAryPtr::CHARS);
+  kit.gvn().set_type(final_mem, Type::MEMORY);
+
+  // need to handle Integer.MIN_VALUE specially because negating doesn't make it positive
+  {
+    // i == MIN_VALUE
+    IfNode* iff = kit.create_and_map_if(kit.control(),
+                                        __ Bool(__ CmpI(arg, __ intcon(0x80000000)), BoolTest::ne),
+                                        PROB_FAIR, COUNT_UNKNOWN);
+
+    Node* old_mem = kit.memory(char_adr_idx);
+
+    kit.set_control(__ IfFalse(iff));
+    if (kit.stopped()) {
+      // Statically not equal to MIN_VALUE so this path is dead
+      final_merge->init_req(3, kit.control());
+    } else {
+      copy_string(kit, __ makecon(TypeInstPtr::make(C->env()->the_min_jint_string())),
+                  char_array, start);
+      final_merge->init_req(3, kit.control());
+      final_mem->init_req(3, kit.memory(char_adr_idx));
+    }
+
+    kit.set_control(__ IfTrue(iff));
+    kit.set_memory(old_mem, char_adr_idx);
+  }
+
+
+  // Simplified version of Integer.getChars
+
+  // int q, r;
+  // int charPos = index;
+  Node* charPos = end;
+
+  // char sign = 0;
+
+  Node* i = arg;
+  Node* sign = __ intcon(0);
+
+  // if (i < 0) {
+  //     sign = '-';
+  //     i = -i;
+  // }
+  {
+    IfNode* iff = kit.create_and_map_if(kit.control(),
+                                        __ Bool(__ CmpI(arg, __ intcon(0)), BoolTest::lt),
+                                        PROB_FAIR, COUNT_UNKNOWN);
+
+    RegionNode *merge = new (C, 3) RegionNode(3);
+    kit.gvn().set_type(merge, Type::CONTROL);
+    i = new (C, 3) PhiNode(merge, TypeInt::INT);
+    kit.gvn().set_type(i, TypeInt::INT);
+    sign = new (C, 3) PhiNode(merge, TypeInt::INT);
+    kit.gvn().set_type(sign, TypeInt::INT);
+
+    merge->init_req(1, __ IfTrue(iff));
+    i->init_req(1, __ SubI(__ intcon(0), arg));
+    sign->init_req(1, __ intcon('-'));
+    merge->init_req(2, __ IfFalse(iff));
+    i->init_req(2, arg);
+    sign->init_req(2, __ intcon(0));
+
+    kit.set_control(merge);
+
+    C->record_for_igvn(merge);
+    C->record_for_igvn(i);
+    C->record_for_igvn(sign);
+  }
+
+  // for (;;) {
+  //     q = i / 10;
+  //     r = i - ((q << 3) + (q << 1));  // r = i-(q*10) ...
+  //     buf [--charPos] = digits [r];
+  //     i = q;
+  //     if (i == 0) break;
+  // }
+
+  {
+    RegionNode *head = new (C, 3) RegionNode(3);
+    head->init_req(1, kit.control());
+    kit.gvn().set_type(head, Type::CONTROL);
+    Node *i_phi = new (C, 3) PhiNode(head, TypeInt::INT);
+    i_phi->init_req(1, i);
+    kit.gvn().set_type(i_phi, TypeInt::INT);
+    charPos = PhiNode::make(head, charPos);
+    kit.gvn().set_type(charPos, TypeInt::INT);
+    Node *mem = PhiNode::make(head, kit.memory(char_adr_idx), Type::MEMORY, TypeAryPtr::CHARS);
+    kit.gvn().set_type(mem, Type::MEMORY);
+    kit.set_control(head);
+    kit.set_memory(mem, char_adr_idx);
+
+    Node* q = __ DivI(NULL, i_phi, __ intcon(10));
+    Node* r = __ SubI(i_phi, __ AddI(__ LShiftI(q, __ intcon(3)),
+                                     __ LShiftI(q, __ intcon(1))));
+    Node* m1 = __ SubI(charPos, __ intcon(1));
+    Node* ch = __ AddI(r, __ intcon('0'));
+
+    Node* st = __ store_to_memory(kit.control(), kit.array_element_address(char_array, m1, T_CHAR),
+                                  ch, T_CHAR, char_adr_idx);
+
+
+    IfNode* iff = kit.create_and_map_if(head, __ Bool(__ CmpI(q, __ intcon(0)), BoolTest::ne),
+                                        PROB_FAIR, COUNT_UNKNOWN);
+    Node* ne = __ IfTrue(iff);
+    Node* eq = __ IfFalse(iff);
+
+    head->init_req(2, ne);
+    mem->init_req(2, st);
+    i_phi->init_req(2, q);
+    charPos->init_req(2, m1);
+
+    charPos = m1;
+
+    kit.set_control(eq);
+    kit.set_memory(st, char_adr_idx);
+
+    C->record_for_igvn(head);
+    C->record_for_igvn(mem);
+    C->record_for_igvn(i_phi);
+    C->record_for_igvn(charPos);
+  }
+
+  {
+    // if (sign != 0) {
+    //     buf [--charPos] = sign;
+    // }
+    IfNode* iff = kit.create_and_map_if(kit.control(),
+                                        __ Bool(__ CmpI(sign, __ intcon(0)), BoolTest::ne),
+                                        PROB_FAIR, COUNT_UNKNOWN);
+
+    final_merge->init_req(2, __ IfFalse(iff));
+    final_mem->init_req(2, kit.memory(char_adr_idx));
+
+    kit.set_control(__ IfTrue(iff));
+    if (kit.stopped()) {
+      final_merge->init_req(1, C->top());
+      final_mem->init_req(1, C->top());
+    } else {
+      Node* m1 = __ SubI(charPos, __ intcon(1));
+      Node* st = __ store_to_memory(kit.control(), kit.array_element_address(char_array, m1, T_CHAR),
+                                    sign, T_CHAR, char_adr_idx);
+
+      final_merge->init_req(1, kit.control());
+      final_mem->init_req(1, st);
+    }
+
+    kit.set_control(final_merge);
+    kit.set_memory(final_mem, char_adr_idx);
+
+    C->record_for_igvn(final_merge);
+    C->record_for_igvn(final_mem);
+  }
+}
+
+
+Node* PhaseStringOpts::copy_string(GraphKit& kit, Node* str, Node* char_array, Node* start) {
+  Node* string = str;
+  Node* offset = kit.make_load(NULL,
+                               kit.basic_plus_adr(string, string, java_lang_String::offset_offset_in_bytes()),
+                               TypeInt::INT, T_INT, offset_field_idx);
+  Node* count = kit.make_load(NULL,
+                              kit.basic_plus_adr(string, string, java_lang_String::count_offset_in_bytes()),
+                              TypeInt::INT, T_INT, count_field_idx);
+  const TypeAryPtr*  value_type = TypeAryPtr::make(TypePtr::NotNull,
+                                                   TypeAry::make(TypeInt::CHAR,TypeInt::POS),
+                                                   ciTypeArrayKlass::make(T_CHAR), true, 0);
+  Node* value = kit.make_load(NULL,
+                              kit.basic_plus_adr(string, string, java_lang_String::value_offset_in_bytes()),
+                              value_type, T_OBJECT, value_field_idx);
+
+  // copy the contents
+  if (offset->is_Con() && count->is_Con() && value->is_Con() && count->get_int() < unroll_string_copy_length) {
+    // For small constant strings just emit individual stores.
+    // A length of 6 seems like a good space/speed tradeof.
+    int c = count->get_int();
+    int o = offset->get_int();
+    const TypeOopPtr* t = kit.gvn().type(value)->isa_oopptr();
+    ciTypeArray* value_array = t->const_oop()->as_type_array();
+    for (int e = 0; e < c; e++) {
+      __ store_to_memory(kit.control(), kit.array_element_address(char_array, start, T_CHAR),
+                         __ intcon(value_array->char_at(o + e)), T_CHAR, char_adr_idx);
+      start = __ AddI(start, __ intcon(1));
+    }
+  } else {
+    Node* src_ptr = kit.array_element_address(value, offset, T_CHAR);
+    Node* dst_ptr = kit.array_element_address(char_array, start, T_CHAR);
+    Node* c = count;
+    Node* extra = NULL;
+#ifdef _LP64
+    c = __ ConvI2L(c);
+    extra = C->top();
+#endif
+    Node* call = kit.make_runtime_call(GraphKit::RC_LEAF|GraphKit::RC_NO_FP,
+                                       OptoRuntime::fast_arraycopy_Type(),
+                                       CAST_FROM_FN_PTR(address, StubRoutines::jshort_disjoint_arraycopy()),
+                                       "jshort_disjoint_arraycopy", TypeAryPtr::CHARS,
+                                       src_ptr, dst_ptr, c, extra);
+    start = __ AddI(start, count);
+  }
+  return start;
+}
+
+
+void PhaseStringOpts::replace_string_concat(StringConcat* sc) {
+  // Log a little info about the transformation
+  sc->maybe_log_transform();
+
+  // pull the JVMState of the allocation into a SafePointNode to serve as
+  // as a shim for the insertion of the new code.
+  JVMState* jvms     = sc->begin()->jvms()->clone_shallow(C);
+  uint size = sc->begin()->req();
+  SafePointNode* map = new (C, size) SafePointNode(size, jvms);
+
+  // copy the control and memory state from the final call into our
+  // new starting state.  This allows any preceeding tests to feed
+  // into the new section of code.
+  for (uint i1 = 0; i1 < TypeFunc::Parms; i1++) {
+    map->init_req(i1, sc->end()->in(i1));
+  }
+  // blow away old allocation arguments
+  for (uint i1 = TypeFunc::Parms; i1 < jvms->debug_start(); i1++) {
+    map->init_req(i1, C->top());
+  }
+  // Copy the rest of the inputs for the JVMState
+  for (uint i1 = jvms->debug_start(); i1 < sc->begin()->req(); i1++) {
+    map->init_req(i1, sc->begin()->in(i1));
+  }
+  // Make sure the memory state is a MergeMem for parsing.
+  if (!map->in(TypeFunc::Memory)->is_MergeMem()) {
+    map->set_req(TypeFunc::Memory, MergeMemNode::make(C, map->in(TypeFunc::Memory)));
+  }
+
+  jvms->set_map(map);
+  map->ensure_stack(jvms, jvms->method()->max_stack());
+
+
+  // disconnect all the old StringBuilder calls from the graph
+  sc->eliminate_unneeded_control();
+
+  // At this point all the old work has been completely removed from
+  // the graph and the saved JVMState exists at the point where the
+  // final toString call used to be.
+  GraphKit kit(jvms);
+
+  // There may be uncommon traps which are still using the
+  // intermediate states and these need to be rewritten to point at
+  // the JVMState at the beginning of the transformation.
+  sc->convert_uncommon_traps(kit, jvms);
+
+  // Now insert the logic to compute the size of the string followed
+  // by all the logic to construct array and resulting string.
+
+  Node* null_string = __ makecon(TypeInstPtr::make(C->env()->the_null_string()));
+
+  // Create a region for the overflow checks to merge into.
+  int args = MAX2(sc->num_arguments(), 1);
+  RegionNode* overflow = new (C, args) RegionNode(args);
+  kit.gvn().set_type(overflow, Type::CONTROL);
+
+  // Create a hook node to hold onto the individual sizes since they
+  // are need for the copying phase.
+  Node* string_sizes = new (C, args) Node(args);
+
+  Node* length = __ intcon(0);
+  for (int argi = 0; argi < sc->num_arguments(); argi++) {
+    Node* arg = sc->argument(argi);
+    switch (sc->mode(argi)) {
+      case StringConcat::IntMode: {
+        Node* string_size = int_stringSize(kit, arg);
+
+        // accumulate total
+        length = __ AddI(length, string_size);
+
+        // Cache this value for the use by int_toString
+        string_sizes->init_req(argi, string_size);
+        break;
+      }
+      case StringConcat::StringMode: {
+        const Type* type = kit.gvn().type(arg);
+        if (type == TypePtr::NULL_PTR) {
+          // replace the argument with the null checked version
+          arg = null_string;
+          sc->set_argument(argi, arg);
+        } else if (!type->higher_equal(TypeInstPtr::NOTNULL)) {
+          // s = s != null ? s : "null";
+          // length = length + (s.count - s.offset);
+          RegionNode *r = new (C, 3) RegionNode(3);
+          kit.gvn().set_type(r, Type::CONTROL);
+          Node *phi = new (C, 3) PhiNode(r, type);
+          kit.gvn().set_type(phi, phi->bottom_type());
+          Node* p = __ Bool(__ CmpP(arg, kit.null()), BoolTest::ne);
+          IfNode* iff = kit.create_and_map_if(kit.control(), p, PROB_MIN, COUNT_UNKNOWN);
+          Node* notnull = __ IfTrue(iff);
+          Node* isnull =  __ IfFalse(iff);
+          kit.set_control(notnull); // set control for the cast_not_null
+          r->init_req(1, notnull);
+          phi->init_req(1, kit.cast_not_null(arg, false));
+          r->init_req(2, isnull);
+          phi->init_req(2, null_string);
+          kit.set_control(r);
+          C->record_for_igvn(r);
+          C->record_for_igvn(phi);
+          // replace the argument with the null checked version
+          arg = phi;
+          sc->set_argument(argi, arg);
+        }
+        //         Node* offset = kit.make_load(NULL, kit.basic_plus_adr(arg, arg, offset_offset),
+        //                                      TypeInt::INT, T_INT, offset_field_idx);
+        Node* count = kit.make_load(NULL, kit.basic_plus_adr(arg, arg, java_lang_String::count_offset_in_bytes()),
+                                    TypeInt::INT, T_INT, count_field_idx);
+        length = __ AddI(length, count);
+        string_sizes->init_req(argi, NULL);
+        break;
+      }
+      case StringConcat::CharMode: {
+        // one character only
+        length = __ AddI(length, __ intcon(1));
+        break;
+      }
+      default:
+        ShouldNotReachHere();
+    }
+    if (argi > 0) {
+      // Check that the sum hasn't overflowed
+      IfNode* iff = kit.create_and_map_if(kit.control(),
+                                          __ Bool(__ CmpI(length, __ intcon(0)), BoolTest::lt),
+                                          PROB_MIN, COUNT_UNKNOWN);
+      kit.set_control(__ IfFalse(iff));
+      overflow->set_req(argi, __ IfTrue(iff));
+    }
+  }
+
+  {
+    // Hook
+    PreserveJVMState pjvms(&kit);
+    kit.set_control(overflow);
+    kit.uncommon_trap(Deoptimization::Reason_intrinsic,
+                      Deoptimization::Action_make_not_entrant);
+  }
+
+  // length now contains the number of characters needed for the
+  // char[] so create a new AllocateArray for the char[]
+  Node* char_array = NULL;
+  {
+    PreserveReexecuteState preexecs(&kit);
+    // The original jvms is for an allocation of either a String or
+    // StringBuffer so no stack adjustment is necessary for proper
+    // reexecution.  If we deoptimize in the slow path the bytecode
+    // will be reexecuted and the char[] allocation will be thrown away.
+    kit.jvms()->set_should_reexecute(true);
+    char_array = kit.new_array(__ makecon(TypeKlassPtr::make(ciTypeArrayKlass::make(T_CHAR))),
+                               length, 1);
+  }
+
+  // Mark the allocation so that zeroing is skipped since the code
+  // below will overwrite the entire array
+  AllocateArrayNode* char_alloc = AllocateArrayNode::Ideal_array_allocation(char_array, _gvn);
+  char_alloc->maybe_set_complete(_gvn);
+
+  // Now copy the string representations into the final char[]
+  Node* start = __ intcon(0);
+  for (int argi = 0; argi < sc->num_arguments(); argi++) {
+    Node* arg = sc->argument(argi);
+    switch (sc->mode(argi)) {
+      case StringConcat::IntMode: {
+        Node* end = __ AddI(start, string_sizes->in(argi));
+        // getChars words backwards so pass the ending point as well as the start
+        int_getChars(kit, arg, char_array, start, end);
+        start = end;
+        break;
+      }
+      case StringConcat::StringMode: {
+        start = copy_string(kit, arg, char_array, start);
+        break;
+      }
+      case StringConcat::CharMode: {
+        __ store_to_memory(kit.control(), kit.array_element_address(char_array, start, T_CHAR),
+                           arg, T_CHAR, char_adr_idx);
+        start = __ AddI(start, __ intcon(1));
+        break;
+      }
+      default:
+        ShouldNotReachHere();
+    }
+  }
+
+  // If we're not reusing an existing String allocation then allocate one here.
+  Node* result = sc->string_alloc();
+  if (result == NULL) {
+    PreserveReexecuteState preexecs(&kit);
+    // The original jvms is for an allocation of either a String or
+    // StringBuffer so no stack adjustment is necessary for proper
+    // reexecution.
+    kit.jvms()->set_should_reexecute(true);
+    result = kit.new_instance(__ makecon(TypeKlassPtr::make(C->env()->String_klass())));
+  }
+
+  // Intialize the string
+  kit.store_to_memory(kit.control(), kit.basic_plus_adr(result, java_lang_String::offset_offset_in_bytes()),
+                      __ intcon(0), T_INT, offset_field_idx);
+  kit.store_to_memory(kit.control(), kit.basic_plus_adr(result, java_lang_String::count_offset_in_bytes()),
+                      length, T_INT, count_field_idx);
+  kit.store_to_memory(kit.control(), kit.basic_plus_adr(result, java_lang_String::value_offset_in_bytes()),
+                      char_array, T_OBJECT, value_field_idx);
+
+  // hook up the outgoing control and result
+  kit.replace_call(sc->end(), result);
+
+  // Unhook any hook nodes
+  string_sizes->disconnect_inputs(NULL);
+  sc->cleanup();
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/stringopts.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/opto/stringopts.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+class StringConcat;
+
+class PhaseStringOpts : public Phase {
+  friend class StringConcat;
+
+ private:
+  PhaseGVN* _gvn;
+
+  // List of dead nodes to clean up aggressively at the end
+  Unique_Node_List dead_worklist;
+
+  // Memory slices needed for code gen
+  int char_adr_idx;
+  int value_field_idx;
+  int count_field_idx;
+  int offset_field_idx;
+
+  // Integer.sizeTable - used for int to String conversion
+  ciField* size_table_field;
+
+  // A set for use by various stages
+  VectorSet _visited;
+
+  // Collect a list of all SB.toString calls
+  Node_List collect_toString_calls();
+
+  // Examine the use of the SB alloc to see if it can be replace with
+  // a single string construction.
+  StringConcat* build_candidate(CallStaticJavaNode* call);
+
+  // Replace all the SB calls in concat with an optimization String allocation
+  void replace_string_concat(StringConcat* concat);
+
+  // Load the value of a static field, performing any constant folding.
+  Node* fetch_static_field(GraphKit& kit, ciField* field);
+
+  // Compute the number of characters required to represent the int value
+  Node* int_stringSize(GraphKit& kit, Node* value);
+
+  // Copy the characters representing value into char_array starting at start
+  void int_getChars(GraphKit& kit, Node* value, Node* char_array, Node* start, Node* end);
+
+  // Copy of the contents of the String str into char_array starting at index start.
+  Node* copy_string(GraphKit& kit, Node* str, Node* char_array, Node* start);
+
+  // Clean up any leftover nodes
+  void record_dead_node(Node* node);
+  void remove_dead_nodes();
+
+  PhaseGVN* gvn() { return _gvn; }
+
+  enum {
+    // max length of constant string copy unrolling in copy_string
+    unroll_string_copy_length = 6
+  };
+
+ public:
+  PhaseStringOpts(PhaseGVN* gvn, Unique_Node_List* worklist);
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/subnode.cpp
--- a/src/share/vm/opto/subnode.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/subnode.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -1244,8 +1244,7 @@
   if( t1 == Type::TOP ) return Type::TOP;
   if( t1->base() != Type::DoubleCon ) return Type::DOUBLE;
   double d = t1->getd();
-  if( d < 0.0 ) return Type::DOUBLE;
-  return TypeD::make( SharedRuntime::dcos( d ) );
+  return TypeD::make( StubRoutines::intrinsic_cos( d ) );
 }
 
 //=============================================================================
@@ -1256,8 +1255,7 @@
   if( t1 == Type::TOP ) return Type::TOP;
   if( t1->base() != Type::DoubleCon ) return Type::DOUBLE;
   double d = t1->getd();
-  if( d < 0.0 ) return Type::DOUBLE;
-  return TypeD::make( SharedRuntime::dsin( d ) );
+  return TypeD::make( StubRoutines::intrinsic_sin( d ) );
 }
 
 //=============================================================================
@@ -1268,8 +1266,7 @@
   if( t1 == Type::TOP ) return Type::TOP;
   if( t1->base() != Type::DoubleCon ) return Type::DOUBLE;
   double d = t1->getd();
-  if( d < 0.0 ) return Type::DOUBLE;
-  return TypeD::make( SharedRuntime::dtan( d ) );
+  return TypeD::make( StubRoutines::intrinsic_tan( d ) );
 }
 
 //=============================================================================
@@ -1280,8 +1277,7 @@
   if( t1 == Type::TOP ) return Type::TOP;
   if( t1->base() != Type::DoubleCon ) return Type::DOUBLE;
   double d = t1->getd();
-  if( d < 0.0 ) return Type::DOUBLE;
-  return TypeD::make( SharedRuntime::dlog( d ) );
+  return TypeD::make( StubRoutines::intrinsic_log( d ) );
 }
 
 //=============================================================================
@@ -1292,8 +1288,7 @@
   if( t1 == Type::TOP ) return Type::TOP;
   if( t1->base() != Type::DoubleCon ) return Type::DOUBLE;
   double d = t1->getd();
-  if( d < 0.0 ) return Type::DOUBLE;
-  return TypeD::make( SharedRuntime::dlog10( d ) );
+  return TypeD::make( StubRoutines::intrinsic_log10( d ) );
 }
 
 //=============================================================================
@@ -1304,8 +1299,7 @@
   if( t1 == Type::TOP ) return Type::TOP;
   if( t1->base() != Type::DoubleCon ) return Type::DOUBLE;
   double d = t1->getd();
-  if( d < 0.0 ) return Type::DOUBLE;
-  return TypeD::make( SharedRuntime::dexp( d ) );
+  return TypeD::make( StubRoutines::intrinsic_exp( d ) );
 }
 
 
@@ -1323,5 +1317,5 @@
   double d2 = t2->getd();
   if( d1 < 0.0 ) return Type::DOUBLE;
   if( d2 < 0.0 ) return Type::DOUBLE;
-  return TypeD::make( SharedRuntime::dpow( d1, d2 ) );
+  return TypeD::make( StubRoutines::intrinsic_pow( d1, d2 ) );
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/superword.cpp
--- a/src/share/vm/opto/superword.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/superword.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -457,10 +457,6 @@
         } else if (out->Opcode() == Op_StoreCM && out->in(MemNode::OopStore) == n) {
           // StoreCM has an input edge used as a precedence edge.
           // Maybe an issue when oop stores are vectorized.
-        } else if( out->is_MergeMem() && prev &&
-                   prev->Opcode() == Op_StoreCM && out == prev->in(MemNode::OopStore)) {
-          // Oop store is a MergeMem! This should not happen. Temporarily remove the assertion
-          // for this case because it could not be superwordized anyway.
         } else {
           assert(out == prev || prev == NULL, "no branches off of store slice");
         }
@@ -477,6 +473,12 @@
 // Can s1 and s2 be in a pack with s1 immediately preceding s2 and
 // s1 aligned at "align"
 bool SuperWord::stmts_can_pack(Node* s1, Node* s2, int align) {
+
+  // Do not use superword for non-primitives
+  if((s1->is_Mem() && !is_java_primitive(s1->as_Mem()->memory_type())) ||
+     (s2->is_Mem() && !is_java_primitive(s2->as_Mem()->memory_type())))
+    return false;
+
   if (isomorphic(s1, s2)) {
     if (independent(s1, s2)) {
       if (!exists_at(s1, 0) && !exists_at(s2, 1)) {
@@ -990,8 +992,8 @@
 // (5) We know there is no dependence cycle, so there in no other case;
 // (6) Finally, all memory ops in another single pack should be moved in the same direction.
 //
-// To schedule a load pack: the memory edge of every loads in the pack must be
-// the same as the memory edge of the last executed load in the pack
+// To schedule a load pack, we use the memory state of either the first or the last load in
+// the pack, based on the dependence constraint.
 void SuperWord::co_locate_pack(Node_List* pk) {
   if (pk->at(0)->is_Store()) {
     MemNode* first     = executed_first(pk)->as_Mem();
@@ -1076,15 +1078,32 @@
       current = my_mem->as_Mem();
     } // end while
   } else if (pk->at(0)->is_Load()) { //load
-    // all use the memory state that the last executed load uses
-    LoadNode* last_load  = executed_last(pk)->as_Load();
-    Node* last_mem       = last_load->in(MemNode::Memory);
-    _igvn.hash_delete(last_mem);
-    // Give each load same memory state as last
+    // all loads in the pack should have the same memory state. By default,
+    // we use the memory state of the last load. However, if any load could
+    // not be moved down due to the dependence constraint, we use the memory
+    // state of the first load.
+    Node* last_mem  = executed_last(pk)->in(MemNode::Memory);
+    Node* first_mem = executed_first(pk)->in(MemNode::Memory);
+    bool schedule_last = true;
+    for (uint i = 0; i < pk->size(); i++) {
+      Node* ld = pk->at(i);
+      for (Node* current = last_mem; current != ld->in(MemNode::Memory);
+           current=current->in(MemNode::Memory)) {
+        assert(current != first_mem, "corrupted memory graph");
+        if(current->is_Mem() && !independent(current, ld)){
+          schedule_last = false; // a later store depends on this load
+          break;
+        }
+      }
+    }
+
+    Node* mem_input = schedule_last ? last_mem : first_mem;
+    _igvn.hash_delete(mem_input);
+    // Give each load the same memory state
     for (uint i = 0; i < pk->size(); i++) {
       LoadNode* ld = pk->at(i)->as_Load();
       _igvn.hash_delete(ld);
-      ld->set_req(MemNode::Memory, last_mem);
+      ld->set_req(MemNode::Memory, mem_input);
       _igvn._worklist.push(ld);
     }
   }
@@ -1902,6 +1921,11 @@
   }
   // Match AddP(base, AddP(ptr, k*iv [+ invariant]), constant)
   Node* base = adr->in(AddPNode::Base);
+  //unsafe reference could not be aligned appropriately without runtime checking
+  if (base == NULL || base->bottom_type() == Type::TOP) {
+    assert(!valid(), "unsafe access");
+    return;
+  }
   for (int i = 0; i < 3; i++) {
     if (!scaled_iv_plus_offset(adr->in(AddPNode::Offset))) {
       assert(!valid(), "too complex");
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/type.cpp
--- a/src/share/vm/opto/type.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/type.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -296,7 +296,7 @@
                                            false, 0, oopDesc::mark_offset_in_bytes());
   TypeInstPtr::KLASS   = TypeInstPtr::make(TypePtr::BotPTR,  current->env()->Object_klass(),
                                            false, 0, oopDesc::klass_offset_in_bytes());
-  TypeOopPtr::BOTTOM  = TypeOopPtr::make(TypePtr::BotPTR, OffsetBot);
+  TypeOopPtr::BOTTOM  = TypeOopPtr::make(TypePtr::BotPTR, OffsetBot, TypeOopPtr::InstanceBot);
 
   TypeNarrowOop::NULL_PTR = TypeNarrowOop::make( TypePtr::NULL_PTR );
   TypeNarrowOop::BOTTOM   = TypeNarrowOop::make( TypeInstPtr::BOTTOM );
@@ -492,8 +492,13 @@
 bool Type::interface_vs_oop(const Type *t) const {
   bool result = false;
 
-  const TypeInstPtr* this_inst = this->isa_instptr();
-  const TypeInstPtr*    t_inst =    t->isa_instptr();
+  const TypePtr* this_ptr = this->make_ptr(); // In case it is narrow_oop
+  const TypePtr*    t_ptr =    t->make_ptr();
+  if( this_ptr == NULL || t_ptr == NULL )
+    return result;
+
+  const TypeInstPtr* this_inst = this_ptr->isa_instptr();
+  const TypeInstPtr*    t_inst =    t_ptr->isa_instptr();
   if( this_inst && this_inst->is_loaded() && t_inst && t_inst->is_loaded() ) {
     bool this_interface = this_inst->klass()->is_interface();
     bool    t_interface =    t_inst->klass()->is_interface();
@@ -1110,7 +1115,7 @@
 
 //------------------------------widen------------------------------------------
 // Only happens for optimistic top-down optimizations.
-const Type *TypeInt::widen( const Type *old ) const {
+const Type *TypeInt::widen( const Type *old, const Type* limit ) const {
   // Coming from TOP or such; no widening
   if( old->base() != Int ) return this;
   const TypeInt *ot = old->is_int();
@@ -1129,15 +1134,21 @@
     // Now widen new guy.
     // Check for widening too far
     if (_widen == WidenMax) {
-      if (min_jint < _lo && _hi < max_jint) {
+      int max = max_jint;
+      int min = min_jint;
+      if (limit->isa_int()) {
+        max = limit->is_int()->_hi;
+        min = limit->is_int()->_lo;
+      }
+      if (min < _lo && _hi < max) {
         // If neither endpoint is extremal yet, push out the endpoint
         // which is closer to its respective limit.
         if (_lo >= 0 ||                 // easy common case
-            (juint)(_lo - min_jint) >= (juint)(max_jint - _hi)) {
+            (juint)(_lo - min) >= (juint)(max - _hi)) {
           // Try to widen to an unsigned range type of 31 bits:
-          return make(_lo, max_jint, WidenMax);
+          return make(_lo, max, WidenMax);
         } else {
-          return make(min_jint, _hi, WidenMax);
+          return make(min, _hi, WidenMax);
         }
       }
       return TypeInt::INT;
@@ -1352,7 +1363,7 @@
 
 //------------------------------widen------------------------------------------
 // Only happens for optimistic top-down optimizations.
-const Type *TypeLong::widen( const Type *old ) const {
+const Type *TypeLong::widen( const Type *old, const Type* limit ) const {
   // Coming from TOP or such; no widening
   if( old->base() != Long ) return this;
   const TypeLong *ot = old->is_long();
@@ -1371,18 +1382,24 @@
     // Now widen new guy.
     // Check for widening too far
     if (_widen == WidenMax) {
-      if (min_jlong < _lo && _hi < max_jlong) {
+      jlong max = max_jlong;
+      jlong min = min_jlong;
+      if (limit->isa_long()) {
+        max = limit->is_long()->_hi;
+        min = limit->is_long()->_lo;
+      }
+      if (min < _lo && _hi < max) {
         // If neither endpoint is extremal yet, push out the endpoint
         // which is closer to its respective limit.
         if (_lo >= 0 ||                 // easy common case
-            (julong)(_lo - min_jlong) >= (julong)(max_jlong - _hi)) {
+            (julong)(_lo - min) >= (julong)(max - _hi)) {
           // Try to widen to an unsigned range type of 32/63 bits:
-          if (_hi < max_juint)
+          if (max >= max_juint && _hi < max_juint)
             return make(_lo, max_juint, WidenMax);
           else
-            return make(_lo, max_jlong, WidenMax);
+            return make(_lo, max, WidenMax);
         } else {
-          return make(min_jlong, _hi, WidenMax);
+          return make(min, _hi, WidenMax);
         }
       }
       return TypeLong::LONG;
@@ -2236,12 +2253,12 @@
 
 //------------------------------make-------------------------------------------
 const TypeOopPtr *TypeOopPtr::make(PTR ptr,
-                                   int offset) {
+                                   int offset, int instance_id) {
   assert(ptr != Constant, "no constant generic pointers");
   ciKlass*  k = ciKlassKlass::make();
   bool      xk = false;
   ciObject* o = NULL;
-  return (TypeOopPtr*)(new TypeOopPtr(OopPtr, ptr, k, xk, o, offset, InstanceBot))->hashcons();
+  return (TypeOopPtr*)(new TypeOopPtr(OopPtr, ptr, k, xk, o, offset, instance_id))->hashcons();
 }
 
 
@@ -2249,7 +2266,7 @@
 const Type *TypeOopPtr::cast_to_ptr_type(PTR ptr) const {
   assert(_base == OopPtr, "subclass must override cast_to_ptr_type");
   if( ptr == _ptr ) return this;
-  return make(ptr, _offset);
+  return make(ptr, _offset, _instance_id);
 }
 
 //-----------------------------cast_to_instance_id----------------------------
@@ -2319,8 +2336,10 @@
       if (ptr == Null)  return TypePtr::make(AnyPtr, ptr, offset);
       // else fall through:
     case TopPTR:
-    case AnyNull:
-      return make(ptr, offset);
+    case AnyNull: {
+      int instance_id = meet_instance_id(InstanceTop);
+      return make(ptr, offset, instance_id);
+    }
     case BotPTR:
     case NotNull:
       return TypePtr::make(AnyPtr, ptr, offset);
@@ -2330,7 +2349,8 @@
 
   case OopPtr: {                 // Meeting to other OopPtrs
     const TypeOopPtr *tp = t->is_oopptr();
-    return make( meet_ptr(tp->ptr()), meet_offset(tp->offset()) );
+    int instance_id = meet_instance_id(tp->instance_id());
+    return make( meet_ptr(tp->ptr()), meet_offset(tp->offset()), instance_id );
   }
 
   case InstPtr:                  // For these, flip the call around to cut down
@@ -2410,14 +2430,13 @@
 
 //------------------------------make_from_constant-----------------------------
 // Make a java pointer from an oop constant
-const TypeOopPtr* TypeOopPtr::make_from_constant(ciObject* o) {
-  if (o->is_method_data() || o->is_method()) {
+const TypeOopPtr* TypeOopPtr::make_from_constant(ciObject* o, bool require_constant) {
+  if (o->is_method_data() || o->is_method() || o->is_cpcache()) {
     // Treat much like a typeArray of bytes, like below, but fake the type...
-    assert(o->has_encoding(), "must be a perm space object");
     const Type* etype = (Type*)get_const_basic_type(T_BYTE);
     const TypeAry* arr0 = TypeAry::make(etype, TypeInt::POS);
     ciKlass *klass = ciTypeArrayKlass::make((BasicType) T_BYTE);
-    assert(o->has_encoding(), "method data oops should be tenured");
+    assert(o->can_be_constant(), "method data oops should be tenured");
     const TypeAryPtr* arr = TypeAryPtr::make(TypePtr::Constant, o, arr0, klass, true, 0);
     return arr;
   } else {
@@ -2426,8 +2445,9 @@
     ciKlass *klass = o->klass();
     if (klass->is_instance_klass()) {
       // Element is an instance
-      if (!o->has_encoding()) {  // not a perm-space constant
-        // %%% remove this restriction by rewriting non-perm ConPNodes in a later phase
+      if (require_constant) {
+        if (!o->can_be_constant())  return NULL;
+      } else if (!o->should_be_constant()) {
         return TypeInstPtr::make(TypePtr::NotNull, klass, true, NULL, 0);
       }
       return TypeInstPtr::make(o);
@@ -2439,8 +2459,9 @@
       // We used to pass NotNull in here, asserting that the sub-arrays
       // are all not-null.  This is not true in generally, as code can
       // slam NULLs down in the subarrays.
-      if (!o->has_encoding()) {  // not a perm-space constant
-        // %%% remove this restriction by rewriting non-perm ConPNodes in a later phase
+      if (require_constant) {
+        if (!o->can_be_constant())  return NULL;
+      } else if (!o->should_be_constant()) {
         return TypeAryPtr::make(TypePtr::NotNull, arr0, klass, true, 0);
       }
       const TypeAryPtr* arr = TypeAryPtr::make(TypePtr::Constant, o, arr0, klass, true, 0);
@@ -2452,8 +2473,9 @@
       const TypeAry* arr0 = TypeAry::make(etype, TypeInt::make(o->as_array()->length()));
       // We used to pass NotNull in here, asserting that the array pointer
       // is not-null. That was not true in general.
-      if (!o->has_encoding()) {  // not a perm-space constant
-        // %%% remove this restriction by rewriting non-perm ConPNodes in a later phase
+      if (require_constant) {
+        if (!o->can_be_constant())  return NULL;
+      } else if (!o->should_be_constant()) {
         return TypeAryPtr::make(TypePtr::NotNull, arr0, klass, true, 0);
       }
       const TypeAryPtr* arr = TypeAryPtr::make(TypePtr::Constant, o, arr0, klass, true, 0);
@@ -2482,7 +2504,7 @@
     ShouldNotReachHere();
   }
 
-  return (intptr_t)const_oop()->encoding();
+  return (intptr_t)const_oop()->constant_encoding();
 }
 
 
@@ -2590,7 +2612,7 @@
 
 //------------------------------add_offset-------------------------------------
 const TypePtr *TypeOopPtr::add_offset( intptr_t offset ) const {
-  return make( _ptr, xadd_offset(offset) );
+  return make( _ptr, xadd_offset(offset), _instance_id);
 }
 
 //------------------------------meet_instance_id--------------------------------
@@ -2693,6 +2715,7 @@
 const TypeInstPtr *TypeInstPtr::xmeet_unloaded(const TypeInstPtr *tinst) const {
     int off = meet_offset(tinst->offset());
     PTR ptr = meet_ptr(tinst->ptr());
+    int instance_id = meet_instance_id(tinst->instance_id());
 
     const TypeInstPtr *loaded    = is_loaded() ? this  : tinst;
     const TypeInstPtr *unloaded  = is_loaded() ? tinst : this;
@@ -2713,7 +2736,7 @@
       assert(loaded->ptr() != TypePtr::Null, "insanity check");
       //
       if(      loaded->ptr() == TypePtr::TopPTR ) { return unloaded; }
-      else if (loaded->ptr() == TypePtr::AnyNull) { return TypeInstPtr::make( ptr, unloaded->klass() ); }
+      else if (loaded->ptr() == TypePtr::AnyNull) { return TypeInstPtr::make( ptr, unloaded->klass(), false, NULL, off, instance_id ); }
       else if (loaded->ptr() == TypePtr::BotPTR ) { return TypeInstPtr::BOTTOM; }
       else if (loaded->ptr() == TypePtr::Constant || loaded->ptr() == TypePtr::NotNull) {
         if (unloaded->ptr() == TypePtr::BotPTR  ) { return TypeInstPtr::BOTTOM;  }
@@ -2786,7 +2809,8 @@
         // then we can subclass in the Java class hierarchy.
         if (klass()->equals(ciEnv::current()->Object_klass())) {
           // that is, tp's array type is a subtype of my klass
-          return TypeAryPtr::make(ptr, tp->ary(), tp->klass(), tp->klass_is_exact(), offset, instance_id);
+          return TypeAryPtr::make(ptr, (ptr == Constant ? tp->const_oop() : NULL),
+                                  tp->ary(), tp->klass(), tp->klass_is_exact(), offset, instance_id);
         }
       }
       // The other case cannot happen, since I cannot be a subtype of an array.
@@ -2801,7 +2825,7 @@
 
   case OopPtr: {                // Meeting to OopPtrs
     // Found a OopPtr type vs self-InstPtr type
-    const TypePtr *tp = t->is_oopptr();
+    const TypeOopPtr *tp = t->is_oopptr();
     int offset = meet_offset(tp->offset());
     PTR ptr = meet_ptr(tp->ptr());
     switch (tp->ptr()) {
@@ -2812,8 +2836,10 @@
                   (ptr == Constant ? const_oop() : NULL), offset, instance_id);
     }
     case NotNull:
-    case BotPTR:
-      return TypeOopPtr::make(ptr, offset);
+    case BotPTR: {
+      int instance_id = meet_instance_id(tp->instance_id());
+      return TypeOopPtr::make(ptr, offset, instance_id);
+    }
     default: typerr(t);
     }
   }
@@ -3259,7 +3285,7 @@
 
   case OopPtr: {                // Meeting to OopPtrs
     // Found a OopPtr type vs self-AryPtr type
-    const TypePtr *tp = t->is_oopptr();
+    const TypeOopPtr *tp = t->is_oopptr();
     int offset = meet_offset(tp->offset());
     PTR ptr = meet_ptr(tp->ptr());
     switch (tp->ptr()) {
@@ -3270,8 +3296,10 @@
                   _ary, _klass, _klass_is_exact, offset, instance_id);
     }
     case BotPTR:
-    case NotNull:
-      return TypeOopPtr::make(ptr, offset);
+    case NotNull: {
+      int instance_id = meet_instance_id(tp->instance_id());
+      return TypeOopPtr::make(ptr, offset, instance_id);
+    }
     default: ShouldNotReachHere();
     }
   }
@@ -3333,14 +3361,19 @@
       ciObject* o = const_oop();
       if( _ptr == Constant ) {
         if( tap->const_oop() != NULL && !o->equals(tap->const_oop()) ) {
+          xk = (klass() == tap->klass());
           ptr = NotNull;
           o = NULL;
           instance_id = InstanceBot;
+        } else {
+          xk = true;
         }
       } else if( above_centerline(_ptr) ) {
         o = tap->const_oop();
+        xk = true;
+      } else {
+        xk = this->_klass_is_exact;
       }
-      xk = true;
       return TypeAryPtr::make( ptr, o, tary, tap->_klass, xk, off, instance_id );
     }
     case NotNull:
@@ -3383,7 +3416,8 @@
         // then we can subclass in the Java class hierarchy.
         if( tp->klass()->equals(ciEnv::current()->Object_klass()) ) {
           // that is, my array type is a subtype of 'tp' klass
-          return make( ptr, _ary, _klass, _klass_is_exact, offset, instance_id );
+          return make( ptr, (ptr == Constant ? const_oop() : NULL),
+                       _ary, _klass, _klass_is_exact, offset, instance_id );
         }
       }
       // The other case cannot happen, since t cannot be a subtype of an array.
@@ -3934,7 +3968,7 @@
   const TypeFunc* tf = C->last_tf(method); // check cache
   if (tf != NULL)  return tf;  // The hit rate here is almost 50%.
   const TypeTuple *domain;
-  if (method->flags().is_static()) {
+  if (method->is_static()) {
     domain = TypeTuple::make_domain(NULL, method->signature());
   } else {
     domain = TypeTuple::make_domain(method->holder(), method->signature());
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/opto/type.hpp
--- a/src/share/vm/opto/type.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/opto/type.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -168,7 +168,7 @@
   // MEET operation; lower in lattice.
   const Type *meet( const Type *t ) const;
   // WIDEN: 'widens' for Ints and other range types
-  virtual const Type *widen( const Type *old ) const { return this; }
+  virtual const Type *widen( const Type *old, const Type* limit ) const { return this; }
   // NARROW: complement for widen, used by pessimistic phases
   virtual const Type *narrow( const Type *old ) const { return this; }
 
@@ -409,7 +409,7 @@
 
   virtual const Type *xmeet( const Type *t ) const;
   virtual const Type *xdual() const;    // Compute dual right now.
-  virtual const Type *widen( const Type *t ) const;
+  virtual const Type *widen( const Type *t, const Type* limit_type ) const;
   virtual const Type *narrow( const Type *t ) const;
   // Do not kill _widen bits.
   virtual const Type *filter( const Type *kills ) const;
@@ -465,7 +465,7 @@
 
   virtual const Type *xmeet( const Type *t ) const;
   virtual const Type *xdual() const;    // Compute dual right now.
-  virtual const Type *widen( const Type *t ) const;
+  virtual const Type *widen( const Type *t, const Type* limit_type ) const;
   virtual const Type *narrow( const Type *t ) const;
   // Do not kill _widen bits.
   virtual const Type *filter( const Type *kills ) const;
@@ -711,10 +711,13 @@
     return make_from_klass_common(klass, false, false);
   }
   // Creates a singleton type given an object.
-  static const TypeOopPtr* make_from_constant(ciObject* o);
+  // If the object cannot be rendered as a constant,
+  // may return a non-singleton type.
+  // If require_constant, produce a NULL if a singleton is not possible.
+  static const TypeOopPtr* make_from_constant(ciObject* o, bool require_constant = false);
 
   // Make a generic (unclassed) pointer to an oop.
-  static const TypeOopPtr* make(PTR ptr, int offset);
+  static const TypeOopPtr* make(PTR ptr, int offset, int instance_id);
 
   ciObject* const_oop()    const { return _const_oop; }
   virtual ciKlass* klass() const { return _klass;     }
@@ -844,9 +847,6 @@
   // Constant pointer to array
   static const TypeAryPtr *make( PTR ptr, ciObject* o, const TypeAry *ary, ciKlass* k, bool xk, int offset, int instance_id = InstanceBot);
 
-  // Convenience
-  static const TypeAryPtr *make(ciObject* o);
-
   // Return a 'ptr' version of this type
   virtual const Type *cast_to_ptr_type(PTR ptr) const;
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jni.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -299,7 +299,8 @@
     }
   }
   klassOop k = SystemDictionary::resolve_from_stream(class_name, class_loader,
-                                                     Handle(), &st, CHECK_NULL);
+                                                     Handle(), &st, true,
+                                                     CHECK_NULL);
 
   if (TraceClassResolution && k != NULL) {
     trace_class_resolution(k);
@@ -395,11 +396,11 @@
   oop mirror     = NULL;
   int slot       = 0;
 
-  if (reflected->klass() == SystemDictionary::reflect_constructor_klass()) {
+  if (reflected->klass() == SystemDictionary::reflect_Constructor_klass()) {
     mirror = java_lang_reflect_Constructor::clazz(reflected);
     slot   = java_lang_reflect_Constructor::slot(reflected);
   } else {
-    assert(reflected->klass() == SystemDictionary::reflect_method_klass(), "wrong type");
+    assert(reflected->klass() == SystemDictionary::reflect_Method_klass(), "wrong type");
     mirror = java_lang_reflect_Method::clazz(reflected);
     slot   = java_lang_reflect_Method::slot(reflected);
   }
@@ -495,7 +496,7 @@
   klassOop super = Klass::cast(k)->java_super();
   // super2 is the value computed by the compiler's getSuperClass intrinsic:
   debug_only(klassOop super2 = ( Klass::cast(k)->oop_is_javaArray()
-                                 ? SystemDictionary::object_klass()
+                                 ? SystemDictionary::Object_klass()
                                  : Klass::cast(k)->super() ) );
   assert(super == super2,
          "java_super computation depends on interface, array, other super");
@@ -583,7 +584,7 @@
   if (thread->has_pending_exception()) {
     Handle ex(thread, thread->pending_exception());
     thread->clear_pending_exception();
-    if (ex->is_a(SystemDictionary::threaddeath_klass())) {
+    if (ex->is_a(SystemDictionary::ThreadDeath_klass())) {
       // Don't print anything if we are being killed.
     } else {
       jio_fprintf(defaultStream::error_stream(), "Exception ");
@@ -592,12 +593,12 @@
         jio_fprintf(defaultStream::error_stream(),
         "in thread \"%s\" ", thread->get_thread_name());
       }
-      if (ex->is_a(SystemDictionary::throwable_klass())) {
+      if (ex->is_a(SystemDictionary::Throwable_klass())) {
         JavaValue result(T_VOID);
         JavaCalls::call_virtual(&result,
                                 ex,
                                 KlassHandle(THREAD,
-                                  SystemDictionary::throwable_klass()),
+                                  SystemDictionary::Throwable_klass()),
                                 vmSymbolHandles::printStackTrace_name(),
                                 vmSymbolHandles::void_method_signature(),
                                 THREAD);
@@ -2115,7 +2116,7 @@
   DT_RETURN_MARK(GetObjectArrayElement, jobject, (const jobject&)ret);
   objArrayOop a = objArrayOop(JNIHandles::resolve_non_null(array));
   if (a->is_within_bounds(index)) {
-    jobject ret = JNIHandles::make_local(env, a->obj_at(index));
+    ret = JNIHandles::make_local(env, a->obj_at(index));
     return ret;
   } else {
     char buf[jintAsStringSize];
@@ -2149,14 +2150,14 @@
 
 #define DEFINE_NEWSCALARARRAY(Return,Allocator,Result) \
 \
-  DT_RETURN_MARK_DECL_FOR(Result, New##Result##Array, Return);\
+  DT_RETURN_MARK_DECL(New##Result##Array, Return);\
 \
 JNI_ENTRY(Return, \
           jni_New##Result##Array(JNIEnv *env, jsize len)) \
   JNIWrapper("New" XSTR(Result) "Array"); \
   DTRACE_PROBE2(hotspot_jni, New##Result##Array__entry, env, len);\
   Return ret = NULL;\
-  DT_RETURN_MARK_FOR(Result, New##Result##Array, Return, (const Return&)ret);\
+  DT_RETURN_MARK(New##Result##Array, Return, (const Return&)ret);\
 \
   oop obj= oopFactory::Allocator(len, CHECK_0); \
   ret = (Return) JNIHandles::make_local(env, obj); \
@@ -3230,6 +3231,21 @@
   jint result = JNI_ERR;
   DT_RETURN_MARK(CreateJavaVM, jint, (const jint&)result);
 
+  // We're about to use Atomic::xchg for synchronization.  Some Zero
+  // platforms use the GCC builtin __sync_lock_test_and_set for this,
+  // but __sync_lock_test_and_set is not guaranteed to do what we want
+  // on all architectures.  So we check it works before relying on it.
+#if defined(ZERO) && defined(ASSERT)
+  {
+    jint a = 0xcafebabe;
+    jint b = Atomic::xchg(0xdeadbeef, &a);
+    void *c = &a;
+    void *d = Atomic::xchg_ptr(&b, &c);
+    assert(a == (jint) 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
+    assert(c == &b && d == &a, "Atomic::xchg_ptr() works");
+  }
+#endif // ZERO && ASSERT
+
   // At the moment it's only possible to have one Java VM,
   // since some of the runtime state is in global variables.
 
@@ -3385,12 +3401,16 @@
   thread->set_thread_state(_thread_in_vm);
   // Must do this before initialize_thread_local_storage
   thread->record_stack_base_and_size();
+
   thread->initialize_thread_local_storage();
 
   if (!os::create_attached_thread(thread)) {
     delete thread;
     return JNI_ERR;
   }
+  // Enable stack overflow checks
+  thread->create_stack_guard_pages();
+
   thread->initialize_tlab();
 
   // Crucial that we do not have a safepoint check for this thread, since it has
@@ -3436,9 +3456,6 @@
   // to regrab the threads_lock
   thread->set_attached();
 
-  // Enable stack overflow checks
-  thread->create_stack_guard_pages();
-
   // Set java thread status.
   java_lang_Thread::set_thread_status(thread->threadObj(),
               java_lang_Thread::RUNNABLE);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jniCheck.cpp
--- a/src/share/vm/prims/jniCheck.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jniCheck.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 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
@@ -96,6 +96,7 @@
 static const char * fatal_class_not_a_class = "JNI received a class argument that is not a class";
 static const char * fatal_class_not_a_throwable_class = "JNI Throw or ThrowNew received a class argument that is not a Throwable or Throwable subclass";
 static const char * fatal_wrong_class_or_method = "Wrong object class or methodID passed to JNI call";
+static const char * fatal_non_weak_method = "non-weak methodID passed to JNI call";
 static const char * fatal_unknown_array_object = "Unknown array object passed to JNI array operations";
 static const char * fatal_object_array_expected = "Object array expected but not received for JNI array operation";
 static const char * fatal_non_array  = "Non-array passed to JNI array operations";
@@ -291,10 +292,16 @@
 
 methodOop jniCheck::validate_jmethod_id(JavaThread* thr, jmethodID method_id) {
   ASSERT_OOPS_ALLOWED;
+  // do the fast jmethodID check first
   methodOop moop = JNIHandles::checked_resolve_jmethod_id(method_id);
   if (moop == NULL) {
     ReportJNIFatalError(thr, fatal_wrong_class_or_method);
   }
+  // jmethodIDs are supposed to be weak global handles, but that
+  // can be expensive so check it last
+  else if (!JNIHandles::is_weak_global_handle((jobject) method_id)) {
+    ReportJNIFatalError(thr, fatal_non_weak_method);
+  }
   return moop;
 }
 
@@ -334,7 +341,7 @@
     ReportJNIFatalError(thr, fatal_received_null_class);
   }
 
-  if (mirror->klass() != SystemDictionary::class_klass()) {
+  if (mirror->klass() != SystemDictionary::Class_klass()) {
     ReportJNIFatalError(thr, fatal_class_not_a_class);
   }
 
@@ -351,7 +358,7 @@
   assert(klass != NULL, "klass argument must have a value");
 
   if (!Klass::cast(klass)->oop_is_instance() ||
-      !instanceKlass::cast(klass)->is_subclass_of(SystemDictionary::throwable_klass())) {
+      !instanceKlass::cast(klass)->is_subclass_of(SystemDictionary::Throwable_klass())) {
     ReportJNIFatalError(thr, fatal_class_not_a_throwable_class);
   }
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvm.cpp
--- a/src/share/vm/prims/jvm.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvm.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -26,6 +26,10 @@
 #include "incls/_jvm.cpp.incl"
 #include <errno.h>
 
+HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__begin, long long);
+HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__end, int);
+HS_DTRACE_PROBE_DECL0(hotspot, thread__yield);
+
 /*
   NOTE about use of any ctor or function call that can trigger a safepoint/GC:
   such ctors and calls MUST NOT come between an oop declaration/init and its
@@ -80,7 +84,7 @@
 
     while (!vfst.at_end()) {
       methodOop m = vfst.method();
-      if (!vfst.method()->method_holder()->klass_part()->is_subclass_of(SystemDictionary::classloader_klass())&&
+      if (!vfst.method()->method_holder()->klass_part()->is_subclass_of(SystemDictionary::ClassLoader_klass())&&
           !vfst.method()->method_holder()->klass_part()->is_subclass_of(access_controller_klass) &&
           !vfst.method()->method_holder()->klass_part()->is_subclass_of(privileged_action_klass)) {
         break;
@@ -257,7 +261,7 @@
   Handle value_str  = java_lang_String::create_from_platform_dependent_str((value != NULL ? value : ""), CHECK);
   JavaCalls::call_virtual(&r,
                           props,
-                          KlassHandle(THREAD, SystemDictionary::properties_klass()),
+                          KlassHandle(THREAD, SystemDictionary::Properties_klass()),
                           vmSymbolHandles::put_name(),
                           vmSymbolHandles::object_object_object_signature(),
                           key_str,
@@ -495,7 +499,7 @@
     guarantee(klass->is_cloneable(), "all arrays are cloneable");
   } else {
     guarantee(obj->is_instance(), "should be instanceOop");
-    bool cloneable = klass->is_subtype_of(SystemDictionary::cloneable_klass());
+    bool cloneable = klass->is_subtype_of(SystemDictionary::Cloneable_klass());
     guarantee(cloneable == klass->is_cloneable(), "incorrect cloneable flag");
   }
 #endif
@@ -762,7 +766,11 @@
 }
 
 // common code for JVM_DefineClass() and JVM_DefineClassWithSource()
-static jclass jvm_define_class_common(JNIEnv *env, const char *name, jobject loader, const jbyte *buf, jsize len, jobject pd, const char *source, TRAPS) {
+// and JVM_DefineClassWithSourceCond()
+static jclass jvm_define_class_common(JNIEnv *env, const char *name,
+                                      jobject loader, const jbyte *buf,
+                                      jsize len, jobject pd, const char *source,
+                                      jboolean verify, TRAPS) {
   if (source == NULL)  source = "__JVM_DefineClass__";
 
   assert(THREAD->is_Java_thread(), "must be a JavaThread");
@@ -803,6 +811,7 @@
   Handle protection_domain (THREAD, JNIHandles::resolve(pd));
   klassOop k = SystemDictionary::resolve_from_stream(class_name, class_loader,
                                                      protection_domain, &st,
+                                                     verify != 0,
                                                      CHECK_NULL);
 
   if (TraceClassResolution && k != NULL) {
@@ -816,16 +825,24 @@
 JVM_ENTRY(jclass, JVM_DefineClass(JNIEnv *env, const char *name, jobject loader, const jbyte *buf, jsize len, jobject pd))
   JVMWrapper2("JVM_DefineClass %s", name);
 
-  return jvm_define_class_common(env, name, loader, buf, len, pd, NULL, THREAD);
+  return jvm_define_class_common(env, name, loader, buf, len, pd, NULL, true, THREAD);
 JVM_END
 
 
 JVM_ENTRY(jclass, JVM_DefineClassWithSource(JNIEnv *env, const char *name, jobject loader, const jbyte *buf, jsize len, jobject pd, const char *source))
   JVMWrapper2("JVM_DefineClassWithSource %s", name);
 
-  return jvm_define_class_common(env, name, loader, buf, len, pd, source, THREAD);
-JVM_END
-
+  return jvm_define_class_common(env, name, loader, buf, len, pd, source, true, THREAD);
+JVM_END
+
+JVM_ENTRY(jclass, JVM_DefineClassWithSourceCond(JNIEnv *env, const char *name,
+                                                jobject loader, const jbyte *buf,
+                                                jsize len, jobject pd,
+                                                const char *source, jboolean verify))
+  JVMWrapper2("JVM_DefineClassWithSourceCond %s", name);
+
+  return jvm_define_class_common(env, name, loader, buf, len, pd, source, verify, THREAD);
+JVM_END
 
 JVM_ENTRY(jclass, JVM_FindLoadedClass(JNIEnv *env, jobject loader, jstring name))
   JVMWrapper("JVM_FindLoadedClass");
@@ -895,7 +912,7 @@
   // Special handling for primitive objects
   if (java_lang_Class::is_primitive(mirror)) {
     // Primitive objects does not have any interfaces
-    objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_NULL);
+    objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_NULL);
     return (jobjectArray) JNIHandles::make_local(env, r);
   }
 
@@ -910,7 +927,7 @@
   }
 
   // Allocate result array
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), size, CHECK_NULL);
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), size, CHECK_NULL);
   objArrayHandle result (THREAD, r);
   // Fill in result
   if (klass->oop_is_instance()) {
@@ -921,8 +938,8 @@
     }
   } else {
     // All arrays implement java.lang.Cloneable and java.io.Serializable
-    result->obj_at_put(0, Klass::cast(SystemDictionary::cloneable_klass())->java_mirror());
-    result->obj_at_put(1, Klass::cast(SystemDictionary::serializable_klass())->java_mirror());
+    result->obj_at_put(0, Klass::cast(SystemDictionary::Cloneable_klass())->java_mirror());
+    result->obj_at_put(1, Klass::cast(SystemDictionary::Serializable_klass())->java_mirror());
   }
   return (jobjectArray) JNIHandles::make_local(env, result());
 JVM_END
@@ -1085,8 +1102,8 @@
     pending_exception = Handle(THREAD, PENDING_EXCEPTION);
     CLEAR_PENDING_EXCEPTION;
 
-    if ( pending_exception->is_a(SystemDictionary::exception_klass()) &&
-        !pending_exception->is_a(SystemDictionary::runtime_exception_klass())) {
+    if ( pending_exception->is_a(SystemDictionary::Exception_klass()) &&
+        !pending_exception->is_a(SystemDictionary::RuntimeException_klass())) {
       // Throw a java.security.PrivilegedActionException(Exception e) exception
       JavaCallArguments args(pending_exception);
       THROW_ARG_0(vmSymbolHandles::java_security_PrivilegedActionException(),
@@ -1177,7 +1194,7 @@
 
   // the resource area must be registered in case of a gc
   RegisterArrayForGC ragc(thread, local_array);
-  objArrayOop context = oopFactory::new_objArray(SystemDictionary::protectionDomain_klass(),
+  objArrayOop context = oopFactory::new_objArray(SystemDictionary::ProtectionDomain_klass(),
                                                  local_array->length(), CHECK_NULL);
   objArrayHandle h_context(thread, context);
   for (int index = 0; index < local_array->length(); index++) {
@@ -1238,7 +1255,7 @@
 
   if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass)) ||
       ! Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_instance()) {
-    oop result = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_NULL);
+    oop result = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_NULL);
     return (jobjectArray)JNIHandles::make_local(env, result);
   }
 
@@ -1246,7 +1263,7 @@
 
   if (k->inner_classes()->length() == 0) {
     // Neither an inner nor outer class
-    oop result = oopFactory::new_objArray(SystemDictionary::class_klass(), 0, CHECK_NULL);
+    oop result = oopFactory::new_objArray(SystemDictionary::Class_klass(), 0, CHECK_NULL);
     return (jobjectArray)JNIHandles::make_local(env, result);
   }
 
@@ -1256,7 +1273,7 @@
   int length = icls->length();
 
   // Allocate temp. result array
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), length/4, CHECK_NULL);
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), length/4, CHECK_NULL);
   objArrayHandle result (THREAD, r);
   int members = 0;
 
@@ -1286,7 +1303,7 @@
 
   if (members != length) {
     // Return array of right length
-    objArrayOop res = oopFactory::new_objArray(SystemDictionary::class_klass(), members, CHECK_NULL);
+    objArrayOop res = oopFactory::new_objArray(SystemDictionary::Class_klass(), members, CHECK_NULL);
     for(int i = 0; i < members; i++) {
       res->obj_at_put(i, result->obj_at(i));
     }
@@ -1305,19 +1322,20 @@
     return NULL;
   }
 
-  symbolOop simple_name = NULL;
+  bool inner_is_member = false;
   klassOop outer_klass
     = instanceKlass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass))
-                          )->compute_enclosing_class(simple_name, CHECK_NULL);
+                          )->compute_enclosing_class(&inner_is_member, CHECK_NULL);
   if (outer_klass == NULL)  return NULL;  // already a top-level class
-  if (simple_name == NULL)  return NULL;  // an anonymous class (inside a method)
+  if (!inner_is_member)  return NULL;     // an anonymous class (inside a method)
   return (jclass) JNIHandles::make_local(env, Klass::cast(outer_klass)->java_mirror());
 }
 JVM_END
 
 // should be in instanceKlass.cpp, but is here for historical reasons
 klassOop instanceKlass::compute_enclosing_class_impl(instanceKlassHandle k,
-                                                     symbolOop& simple_name_result, TRAPS) {
+                                                     bool* inner_is_member,
+                                                     TRAPS) {
   Thread* thread = THREAD;
   const int inner_class_info_index = inner_class_inner_class_info_offset;
   const int outer_class_info_index = inner_class_outer_class_info_offset;
@@ -1334,8 +1352,7 @@
   bool found = false;
   klassOop ok;
   instanceKlassHandle outer_klass;
-  bool inner_is_member = false;
-  int simple_name_index = 0;
+  *inner_is_member = false;
 
   // Find inner_klass attribute
   for (int i = 0; i < i_length && !found; i += inner_class_next_offset) {
@@ -1351,8 +1368,7 @@
         if (found && ooff != 0) {
           ok = i_cp->klass_at(ooff, CHECK_NULL);
           outer_klass = instanceKlassHandle(thread, ok);
-          simple_name_index = noff;
-          inner_is_member = true;
+          *inner_is_member = true;
         }
       }
     }
@@ -1364,7 +1380,7 @@
     if (encl_method_class_idx != 0) {
       ok = i_cp->klass_at(encl_method_class_idx, CHECK_NULL);
       outer_klass = instanceKlassHandle(thread, ok);
-      inner_is_member = false;
+      *inner_is_member = false;
     }
   }
 
@@ -1374,9 +1390,7 @@
   // Throws an exception if outer klass has not declared k as an inner klass
   // We need evidence that each klass knows about the other, or else
   // the system could allow a spoof of an inner class to gain access rights.
-  Reflection::check_for_inner_class(outer_klass, k, inner_is_member, CHECK_NULL);
-
-  simple_name_result = (inner_is_member ? i_cp->symbol_at(simple_name_index) : symbolOop(NULL));
+  Reflection::check_for_inner_class(outer_klass, k, *inner_is_member, CHECK_NULL);
   return outer_klass();
 }
 
@@ -1460,11 +1474,11 @@
   oop mirror    = NULL;
   int slot      = 0;
 
-  if (reflected->klass() == SystemDictionary::reflect_constructor_klass()) {
+  if (reflected->klass() == SystemDictionary::reflect_Constructor_klass()) {
     mirror = java_lang_reflect_Constructor::clazz(reflected);
     slot   = java_lang_reflect_Constructor::slot(reflected);
   } else {
-    assert(reflected->klass() == SystemDictionary::reflect_method_klass(),
+    assert(reflected->klass() == SystemDictionary::reflect_Method_klass(),
            "wrong type");
     mirror = java_lang_reflect_Method::clazz(reflected);
     slot   = java_lang_reflect_Method::slot(reflected);
@@ -1520,7 +1534,7 @@
   if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass)) ||
       Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_javaArray()) {
     // Return empty array
-    oop res = oopFactory::new_objArray(SystemDictionary::reflect_field_klass(), 0, CHECK_NULL);
+    oop res = oopFactory::new_objArray(SystemDictionary::reflect_Field_klass(), 0, CHECK_NULL);
     return (jobjectArray) JNIHandles::make_local(env, res);
   }
 
@@ -1548,13 +1562,13 @@
   } else {
     num_fields = fields_len / instanceKlass::next_offset;
 
-    if (k() == SystemDictionary::throwable_klass()) {
+    if (k() == SystemDictionary::Throwable_klass()) {
       num_fields--;
       skip_backtrace = true;
     }
   }
 
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_field_klass(), num_fields, CHECK_NULL);
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_Field_klass(), num_fields, CHECK_NULL);
   objArrayHandle result (THREAD, r);
 
   int out_idx = 0;
@@ -1588,7 +1602,7 @@
   if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass))
       || Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_javaArray()) {
     // Return empty array
-    oop res = oopFactory::new_objArray(SystemDictionary::reflect_method_klass(), 0, CHECK_NULL);
+    oop res = oopFactory::new_objArray(SystemDictionary::reflect_Method_klass(), 0, CHECK_NULL);
     return (jobjectArray) JNIHandles::make_local(env, res);
   }
 
@@ -1612,7 +1626,7 @@
   }
 
   // Allocate result
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_method_klass(), num_methods, CHECK_NULL);
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_Method_klass(), num_methods, CHECK_NULL);
   objArrayHandle result (THREAD, r);
 
   int out_idx = 0;
@@ -1640,7 +1654,7 @@
   if (java_lang_Class::is_primitive(JNIHandles::resolve_non_null(ofClass))
       || Klass::cast(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(ofClass)))->oop_is_javaArray()) {
     // Return empty array
-    oop res = oopFactory::new_objArray(SystemDictionary::reflect_constructor_klass(), 0 , CHECK_NULL);
+    oop res = oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), 0 , CHECK_NULL);
     return (jobjectArray) JNIHandles::make_local(env, res);
   }
 
@@ -1664,7 +1678,7 @@
   }
 
   // Allocate result
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_constructor_klass(), num_constructors, CHECK_NULL);
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), num_constructors, CHECK_NULL);
   objArrayHandle result(THREAD, r);
 
   int out_idx = 0;
@@ -1877,7 +1891,7 @@
   symbolHandle klass_name (THREAD, cp->klass_name_at(klass_ref));
   symbolHandle member_name(THREAD, cp->uncached_name_ref_at(index));
   symbolHandle member_sig (THREAD, cp->uncached_signature_ref_at(index));
-  objArrayOop  dest_o = oopFactory::new_objArray(SystemDictionary::string_klass(), 3, CHECK_NULL);
+  objArrayOop  dest_o = oopFactory::new_objArray(SystemDictionary::String_klass(), 3, CHECK_NULL);
   objArrayHandle dest(THREAD, dest_o);
   Handle str = java_lang_String::create_from_symbol(klass_name, CHECK_NULL);
   dest->obj_at_put(0, str());
@@ -2244,10 +2258,8 @@
   switch (cp->tag_at(cp_index).value()) {
     case JVM_CONSTANT_InterfaceMethodref:
     case JVM_CONSTANT_Methodref:
+    case JVM_CONSTANT_NameAndType:  // for invokedynamic
       return cp->uncached_name_ref_at(cp_index)->as_utf8();
-    case JVM_CONSTANT_NameAndType:
-      // for invokedynamic
-      return cp->nt_name_ref_at(cp_index)->as_utf8();
     default:
       fatal("JVM_GetCPMethodNameUTF: illegal constant");
   }
@@ -2264,10 +2276,8 @@
   switch (cp->tag_at(cp_index).value()) {
     case JVM_CONSTANT_InterfaceMethodref:
     case JVM_CONSTANT_Methodref:
+    case JVM_CONSTANT_NameAndType:  // for invokedynamic
       return cp->uncached_signature_ref_at(cp_index)->as_utf8();
-    case JVM_CONSTANT_NameAndType:
-      // for invokedynamic
-      return cp->nt_signature_ref_at(cp_index)->as_utf8();
     default:
       fatal("JVM_GetCPMethodSignatureUTF: illegal constant");
   }
@@ -2569,7 +2579,7 @@
   JavaValue result(T_VOID);
   JavaCalls::call_virtual(&result,
                           obj,
-                          KlassHandle(THREAD, SystemDictionary::thread_klass()),
+                          KlassHandle(THREAD, SystemDictionary::Thread_klass()),
                           vmSymbolHandles::run_method_name(),
                           vmSymbolHandles::void_method_signature(),
                           THREAD);
@@ -2667,7 +2677,7 @@
       // Fix for 4314342, 4145910, perhaps others: it now doesn't have
       // any effect on the "liveness" of a thread; see
       // JVM_IsThreadAlive, below.
-      if (java_throwable->is_a(SystemDictionary::threaddeath_klass())) {
+      if (java_throwable->is_a(SystemDictionary::ThreadDeath_klass())) {
         java_lang_Thread::set_stillborn(java_thread);
       }
       THROW_OOP(java_throwable);
@@ -2756,6 +2766,7 @@
 JVM_ENTRY(void, JVM_Yield(JNIEnv *env, jclass threadClass))
   JVMWrapper("JVM_Yield");
   if (os::dont_yield()) return;
+  HS_DTRACE_PROBE0(hotspot, thread__yield);
   // When ConvertYieldToSleep is off (default), this matches the classic VM use of yield.
   // Critical for similar threading behaviour
   if (ConvertYieldToSleep) {
@@ -2781,6 +2792,8 @@
   // And set new thread state to SLEEPING.
   JavaThreadSleepState jtss(thread);
 
+  HS_DTRACE_PROBE1(hotspot, thread__sleep__begin, millis);
+
   if (millis == 0) {
     // When ConvertSleepToYield is on, this matches the classic VM implementation of
     // JVM_Sleep. Critical for similar threading behaviour (Win32)
@@ -2801,6 +2814,7 @@
       // An asynchronous exception (e.g., ThreadDeathException) could have been thrown on
       // us while we were sleeping. We do not overwrite those.
       if (!HAS_PENDING_EXCEPTION) {
+        HS_DTRACE_PROBE1(hotspot, thread__sleep__end,1);
         // TODO-FIXME: THROW_MSG returns which means we will not call set_state()
         // to properly restore the thread state.  That's likely wrong.
         THROW_MSG(vmSymbols::java_lang_InterruptedException(), "sleep interrupted");
@@ -2808,6 +2822,7 @@
     }
     thread->osthread()->set_state(old_state);
   }
+  HS_DTRACE_PROBE1(hotspot, thread__sleep__end,0);
 JVM_END
 
 JVM_ENTRY(jobject, JVM_CurrentThread(JNIEnv* env, jclass threadClass))
@@ -3022,7 +3037,7 @@
   }
 
   // Create result array of type [Ljava/lang/Class;
-  objArrayOop result = oopFactory::new_objArray(SystemDictionary::class_klass(), depth, CHECK_NULL);
+  objArrayOop result = oopFactory::new_objArray(SystemDictionary::Class_klass(), depth, CHECK_NULL);
   // Fill in mirrors corresponding to method holders
   int index = 0;
   while (first != NULL) {
@@ -4318,7 +4333,7 @@
   JvmtiVMObjectAllocEventCollector oam;
 
   int num_threads = tle.num_threads();
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::thread_klass(), num_threads, CHECK_NULL);
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::Thread_klass(), num_threads, CHECK_NULL);
   objArrayHandle threads_ah(THREAD, r);
 
   for (int i = 0; i < num_threads; i++) {
@@ -4352,7 +4367,7 @@
 
   // check if threads is not an array of objects of Thread class
   klassOop k = objArrayKlass::cast(ah->klass())->element_klass();
-  if (k != SystemDictionary::thread_klass()) {
+  if (k != SystemDictionary::Thread_klass()) {
     THROW_(vmSymbols::java_lang_IllegalArgumentException(), 0);
   }
 
@@ -4412,7 +4427,7 @@
   if (encl_method_class_idx == 0) {
     return NULL;
   }
-  objArrayOop dest_o = oopFactory::new_objArray(SystemDictionary::object_klass(), 3, CHECK_NULL);
+  objArrayOop dest_o = oopFactory::new_objArray(SystemDictionary::Object_klass(), 3, CHECK_NULL);
   objArrayHandle dest(THREAD, dest_o);
   klassOop enc_k = ik_h->constants()->klass_at(encl_method_class_idx, CHECK_NULL);
   dest->obj_at_put(0, Klass::cast(enc_k)->java_mirror());
@@ -4526,7 +4541,7 @@
                values_h->int_at(0) == java_lang_Thread::NEW,
              "Invalid threadStatus value");
 
-      objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+      objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
                                                1, /* only 1 substate */
                                                CHECK_NULL);
       names_h = objArrayHandle(THREAD, r);
@@ -4539,7 +4554,7 @@
                values_h->int_at(0) == java_lang_Thread::RUNNABLE,
              "Invalid threadStatus value");
 
-      objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+      objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
                                                1, /* only 1 substate */
                                                CHECK_NULL);
       names_h = objArrayHandle(THREAD, r);
@@ -4552,7 +4567,7 @@
                values_h->int_at(0) == java_lang_Thread::BLOCKED_ON_MONITOR_ENTER,
              "Invalid threadStatus value");
 
-      objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+      objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
                                                1, /* only 1 substate */
                                                CHECK_NULL);
       names_h = objArrayHandle(THREAD, r);
@@ -4565,7 +4580,7 @@
                values_h->int_at(0) == java_lang_Thread::IN_OBJECT_WAIT &&
                values_h->int_at(1) == java_lang_Thread::PARKED,
              "Invalid threadStatus value");
-      objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+      objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
                                                2, /* number of substates */
                                                CHECK_NULL);
       names_h = objArrayHandle(THREAD, r);
@@ -4583,7 +4598,7 @@
                values_h->int_at(1) == java_lang_Thread::IN_OBJECT_WAIT_TIMED &&
                values_h->int_at(2) == java_lang_Thread::PARKED_TIMED,
              "Invalid threadStatus value");
-      objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+      objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
                                                3, /* number of substates */
                                                CHECK_NULL);
       names_h = objArrayHandle(THREAD, r);
@@ -4602,7 +4617,7 @@
       assert(values_h->length() == 1 &&
                values_h->int_at(0) == java_lang_Thread::TERMINATED,
              "Invalid threadStatus value");
-      objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+      objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
                                                1, /* only 1 substate */
                                                CHECK_NULL);
       names_h = objArrayHandle(THREAD, r);
@@ -4637,4 +4652,3 @@
 #endif // KERNEL
 }
 JVM_END
-
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvm.h
--- a/src/share/vm/prims/jvm.h	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvm.h	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -417,6 +417,17 @@
                           const jbyte *buf, jsize len, jobject pd,
                           const char *source);
 
+/* Define a class with a source with conditional verification (added HSX 14)
+ * -Xverify:all will verify anyway, -Xverify:none will not verify,
+ * -Xverify:remote (default) will obey this conditional
+ * i.e. true = should_verify_class
+ */
+JNIEXPORT jclass JNICALL
+JVM_DefineClassWithSourceCond(JNIEnv *env, const char *name,
+                              jobject loader, const jbyte *buf,
+                              jsize len, jobject pd, const char *source,
+                              jboolean verify);
+
 /* Define a class with a source (MLVM) */
 JNIEXPORT jclass JNICALL
 JVM_DefineClassWithCP(JNIEnv *env, const char *name, jobject loader,
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiCodeBlobEvents.cpp
--- a/src/share/vm/prims/jvmtiCodeBlobEvents.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiCodeBlobEvents.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 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
@@ -402,7 +402,7 @@
 
     address scopes_data = nm->scopes_data_begin();
     for( pcd = nm->scopes_pcs_begin(); pcd < nm->scopes_pcs_end(); ++pcd ) {
-      ScopeDesc sc0(nm, pcd->scope_decode_offset());
+      ScopeDesc sc0(nm, pcd->scope_decode_offset(), pcd->should_reexecute(), pcd->return_oop());
       ScopeDesc *sd  = &sc0;
       while( !sd->is_top() ) { sd = sd->sender(); }
       int bci = sd->bci();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiEnter.xsl
--- a/src/share/vm/prims/jvmtiEnter.xsl	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiEnter.xsl	Thu Mar 25 16:54:59 2010 -0700
@@ -773,7 +773,7 @@
     </xsl:apply-templates>
     <xsl:text>
     }
-    if (!thread_oop-&gt;is_a(SystemDictionary::thread_klass())) {
+    if (!thread_oop-&gt;is_a(SystemDictionary::Thread_klass())) {
 </xsl:text>
     <xsl:apply-templates select=".." mode="traceError">     
       <xsl:with-param name="err">JVMTI_ERROR_INVALID_THREAD</xsl:with-param>
@@ -857,7 +857,7 @@
     </xsl:apply-templates>
     <xsl:text>
   }
-  if (!k_mirror->is_a(SystemDictionary::class_klass())) {
+  if (!k_mirror->is_a(SystemDictionary::Class_klass())) {
 </xsl:text>
     <xsl:apply-templates select=".." mode="traceError">     
       <xsl:with-param name="err">JVMTI_ERROR_INVALID_CLASS</xsl:with-param>
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiEnv.cpp
--- a/src/share/vm/prims/jvmtiEnv.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiEnv.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 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
@@ -32,15 +32,15 @@
  // FIXLATER: hook into JvmtiTrace
 #define TraceJVMTICalls false
 
-JvmtiEnv::JvmtiEnv() : JvmtiEnvBase() {
+JvmtiEnv::JvmtiEnv(jint version) : JvmtiEnvBase(version) {
 }
 
 JvmtiEnv::~JvmtiEnv() {
 }
 
 JvmtiEnv*
-JvmtiEnv::create_a_jvmti() {
-  return new JvmtiEnv();
+JvmtiEnv::create_a_jvmti(jint version) {
+  return new JvmtiEnv(version);
 }
 
 // VM operation class to copy jni function table at safepoint.
@@ -133,7 +133,7 @@
     if (thread_oop == NULL) {
       return JVMTI_ERROR_INVALID_THREAD;
     }
-    if (!thread_oop->is_a(SystemDictionary::thread_klass())) {
+    if (!thread_oop->is_a(SystemDictionary::Thread_klass())) {
       return JVMTI_ERROR_INVALID_THREAD;
     }
     JavaThread* java_thread = java_lang_Thread::thread(thread_oop);
@@ -199,7 +199,7 @@
     if (k_mirror == NULL) {
       return JVMTI_ERROR_INVALID_CLASS;
     }
-    if (!k_mirror->is_a(SystemDictionary::class_klass())) {
+    if (!k_mirror->is_a(SystemDictionary::Class_klass())) {
       return JVMTI_ERROR_INVALID_CLASS;
     }
 
@@ -266,7 +266,7 @@
   oop mirror = JNIHandles::resolve_external_guard(object);
   NULL_CHECK(mirror, JVMTI_ERROR_INVALID_OBJECT);
 
-  if (mirror->klass() == SystemDictionary::class_klass()) {
+  if (mirror->klass() == SystemDictionary::Class_klass()) {
     if (!java_lang_Class::is_primitive(mirror)) {
         mirror = java_lang_Class::as_klassOop(mirror);
         assert(mirror != NULL, "class for non-primitive mirror must exist");
@@ -327,7 +327,7 @@
     if (thread_oop == NULL) {
       return JVMTI_ERROR_INVALID_THREAD;
     }
-    if (!thread_oop->is_a(SystemDictionary::thread_klass())) {
+    if (!thread_oop->is_a(SystemDictionary::Thread_klass())) {
       return JVMTI_ERROR_INVALID_THREAD;
     }
     java_thread = java_lang_Thread::thread(thread_oop);
@@ -411,8 +411,15 @@
   if (phase == JVMTI_PHASE_ONLOAD) {
     Arguments::append_sysclasspath(segment);
     return JVMTI_ERROR_NONE;
-  } else {
-    assert(phase == JVMTI_PHASE_LIVE, "sanity check");
+  } else if (use_version_1_0_semantics()) {
+    // This JvmtiEnv requested version 1.0 semantics and this function
+    // is only allowed in the ONLOAD phase in version 1.0 so we need to
+    // return an error here.
+    return JVMTI_ERROR_WRONG_PHASE;
+  } else if (phase == JVMTI_PHASE_LIVE) {
+    // The phase is checked by the wrapper that called this function,
+    // but this thread could be racing with the thread that is
+    // terminating the VM so we check one more time.
 
     // create the zip entry
     ClassPathZipEntry* zip_entry = ClassLoader::create_class_path_zip_entry(segment);
@@ -433,6 +440,8 @@
     }
     ClassLoader::add_to_list(zip_entry);
     return JVMTI_ERROR_NONE;
+  } else {
+    return JVMTI_ERROR_WRONG_PHASE;
   }
 
 } /* end AddToBootstrapClassLoaderSearch */
@@ -451,11 +460,12 @@
       }
     }
     return JVMTI_ERROR_NONE;
-  } else {
+  } else if (phase == JVMTI_PHASE_LIVE) {
+    // The phase is checked by the wrapper that called this function,
+    // but this thread could be racing with the thread that is
+    // terminating the VM so we check one more time.
     HandleMark hm;
 
-    assert(phase == JVMTI_PHASE_LIVE, "sanity check");
-
     // create the zip entry (which will open the zip file and hence
     // check that the segment is indeed a zip file).
     ClassPathZipEntry* zip_entry = ClassLoader::create_class_path_zip_entry(segment);
@@ -504,6 +514,8 @@
     }
 
     return JVMTI_ERROR_NONE;
+  } else {
+    return JVMTI_ERROR_WRONG_PHASE;
   }
 } /* end AddToSystemClassLoaderSearch */
 
@@ -580,7 +592,6 @@
     break;
   case JVMTI_VERBOSE_GC:
     PrintGC = value != 0;
-    TraceClassUnloading = value != 0;
     break;
   case JVMTI_VERBOSE_JNI:
     PrintJNIResolving = value != 0;
@@ -620,7 +631,7 @@
     thread_oop = JNIHandles::resolve_external_guard(thread);
   }
 
-  if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) {
+  if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) {
     return JVMTI_ERROR_INVALID_THREAD;
   }
 
@@ -858,7 +869,7 @@
 jvmtiError
 JvmtiEnv::InterruptThread(jthread thread) {
   oop thread_oop = JNIHandles::resolve_external_guard(thread);
-  if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass()))
+  if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass()))
     return JVMTI_ERROR_INVALID_THREAD;
 
   JavaThread* current_thread  = JavaThread::current();
@@ -895,7 +906,7 @@
   } else {
     thread_oop = JNIHandles::resolve_external_guard(thread);
   }
-  if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass()))
+  if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass()))
     return JVMTI_ERROR_INVALID_THREAD;
 
   Handle thread_obj(current_thread, thread_oop);
@@ -1061,7 +1072,7 @@
 jvmtiError
 JvmtiEnv::RunAgentThread(jthread thread, jvmtiStartFunction proc, const void* arg, jint priority) {
   oop thread_oop = JNIHandles::resolve_external_guard(thread);
-  if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) {
+  if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) {
     return JVMTI_ERROR_INVALID_THREAD;
   }
   if (priority < JVMTI_THREAD_MIN_PRIORITY || priority > JVMTI_THREAD_MAX_PRIORITY) {
@@ -2863,6 +2874,14 @@
 // is_obsolete_ptr - pre-checked for NULL
 jvmtiError
 JvmtiEnv::IsMethodObsolete(methodOop method_oop, jboolean* is_obsolete_ptr) {
+  if (use_version_1_0_semantics() &&
+      get_capabilities()->can_redefine_classes == 0) {
+    // This JvmtiEnv requested version 1.0 semantics and this function
+    // requires the can_redefine_classes capability in version 1.0 so
+    // we need to return an error here.
+    return JVMTI_ERROR_MUST_POSSESS_CAPABILITY;
+  }
+
   if (method_oop == NULL || method_oop->is_obsolete()) {
     *is_obsolete_ptr = true;
   } else {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiEnvBase.cpp
--- a/src/share/vm/prims/jvmtiEnvBase.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiEnvBase.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -123,7 +123,26 @@
 }
 
 
-JvmtiEnvBase::JvmtiEnvBase() : _env_event_enable() {
+bool
+JvmtiEnvBase::use_version_1_0_semantics() {
+  int major, minor, micro;
+
+  JvmtiExport::decode_version_values(_version, &major, &minor, &micro);
+  return major == 1 && minor == 0;  // micro version doesn't matter here
+}
+
+
+bool
+JvmtiEnvBase::use_version_1_1_semantics() {
+  int major, minor, micro;
+
+  JvmtiExport::decode_version_values(_version, &major, &minor, &micro);
+  return major == 1 && minor == 1;  // micro version doesn't matter here
+}
+
+
+JvmtiEnvBase::JvmtiEnvBase(jint version) : _env_event_enable() {
+  _version = version;
   _env_local_storage = NULL;
   _tag_map = NULL;
   _native_method_prefix_count = 0;
@@ -508,7 +527,7 @@
 JavaThread *
 JvmtiEnvBase::get_JavaThread(jthread jni_thread) {
   oop t = JNIHandles::resolve_external_guard(jni_thread);
-  if (t == NULL || !t->is_a(SystemDictionary::thread_klass())) {
+  if (t == NULL || !t->is_a(SystemDictionary::Thread_klass())) {
     return NULL;
   }
   // The following returns NULL if the thread has not yet run or is in
@@ -1250,7 +1269,7 @@
   for (int i = 0; i < _thread_count; ++i) {
     jthread jt = _thread_list[i];
     oop thread_oop = JNIHandles::resolve_external_guard(jt);
-    if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) {
+    if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) {
       set_result(JVMTI_ERROR_INVALID_THREAD);
       return;
     }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiEnvBase.hpp
--- a/src/share/vm/prims/jvmtiEnvBase.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiEnvBase.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 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
@@ -76,6 +76,7 @@
 
   jvmtiEnv _jvmti_external;
   jint _magic;
+  jint _version;  // version value passed to JNI GetEnv()
   JvmtiEnvBase* _next;
   bool _is_retransformable;
   const void *_env_local_storage;     // per env agent allocated data.
@@ -91,7 +92,7 @@
   int    _native_method_prefix_count;
 
  protected:
-  JvmtiEnvBase();
+  JvmtiEnvBase(jint version);
   ~JvmtiEnvBase();
   void dispose();
   void env_dispose();
@@ -122,6 +123,9 @@
 
   bool is_valid();
 
+  bool use_version_1_0_semantics();  // agent asked for version 1.0
+  bool use_version_1_1_semantics();  // agent asked for version 1.1
+
   bool is_retransformable()                        { return _is_retransformable; }
 
   static ByteSize jvmti_external_offset() {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiEventController.cpp
--- a/src/share/vm/prims/jvmtiEventController.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiEventController.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -82,7 +82,7 @@
                                THREAD_START_BIT | THREAD_END_BIT |
                                DYNAMIC_CODE_GENERATED_BIT;
 static const jlong  GLOBAL_EVENT_BITS = ~THREAD_FILTERED_EVENT_BITS;
-
+static const jlong  SHOULD_POST_ON_EXCEPTIONS_BITS = EXCEPTION_BITS | METHOD_EXIT_BIT | FRAME_POP_BIT;
 
 ///////////////////////////////////////////////////////////////
 //
@@ -511,7 +511,12 @@
         leave_interp_only_mode(state);
       }
     }
+
+    // update the JavaThread cached value for thread-specific should_post_on_exceptions value
+    bool should_post_on_exceptions = (any_env_enabled & SHOULD_POST_ON_EXCEPTIONS_BITS) != 0;
+    state->set_should_post_on_exceptions(should_post_on_exceptions);
   }
+
   return any_env_enabled;
 }
 
@@ -615,6 +620,10 @@
 
     // set global truly enabled, that is, any thread in any environment
     JvmtiEventController::_universal_global_event_enabled.set_bits(any_env_thread_enabled);
+
+    // set global should_post_on_exceptions
+    JvmtiExport::set_should_post_on_exceptions((any_env_thread_enabled & SHOULD_POST_ON_EXCEPTIONS_BITS) != 0);
+
   }
 
   EC_TRACE(("JVMTI [-] # recompute enabled - after %llx", any_env_thread_enabled));
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiExport.cpp
--- a/src/share/vm/prims/jvmtiExport.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiExport.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -319,7 +319,27 @@
 
 jint
 JvmtiExport::get_jvmti_interface(JavaVM *jvm, void **penv, jint version) {
-  /* To Do: add version checks */
+  // The JVMTI_VERSION_INTERFACE_JVMTI part of the version number
+  // has already been validated in JNI GetEnv().
+  int major, minor, micro;
+
+  // micro version doesn't matter here (yet?)
+  decode_version_values(version, &major, &minor, &micro);
+  switch (major) {
+  case 1:
+      switch (minor) {
+      case 0:  // version 1.0.<micro> is recognized
+      case 1:  // version 1.1.<micro> is recognized
+          break;
+
+      default:
+          return JNI_EVERSION;  // unsupported minor version number
+      }
+      break;
+
+  default:
+      return JNI_EVERSION;  // unsupported major version number
+  }
 
   if (JvmtiEnv::get_phase() == JVMTI_PHASE_LIVE) {
     JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
@@ -328,13 +348,13 @@
     __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
     debug_only(VMNativeEntryWrapper __vew;)
 
-    JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti();
+    JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
     *penv = jvmti_env->jvmti_external();  // actual type is jvmtiEnv* -- not to be confused with JvmtiEnv*
     return JNI_OK;
 
   } else if (JvmtiEnv::get_phase() == JVMTI_PHASE_ONLOAD) {
     // not live, no thread to transition
-    JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti();
+    JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
     *penv = jvmti_env->jvmti_external();  // actual type is jvmtiEnv* -- not to be confused with JvmtiEnv*
     return JNI_OK;
 
@@ -345,6 +365,15 @@
   }
 }
 
+
+void
+JvmtiExport::decode_version_values(jint version, int * major, int * minor,
+                                   int * micro) {
+  *major = (version & JVMTI_VERSION_MASK_MAJOR) >> JVMTI_VERSION_SHIFT_MAJOR;
+  *minor = (version & JVMTI_VERSION_MASK_MINOR) >> JVMTI_VERSION_SHIFT_MINOR;
+  *micro = (version & JVMTI_VERSION_MASK_MICRO) >> JVMTI_VERSION_SHIFT_MICRO;
+}
+
 void JvmtiExport::enter_primordial_phase() {
   JvmtiEnvBase::set_phase(JVMTI_PHASE_PRIMORDIAL);
 }
@@ -627,7 +656,7 @@
   klassOop k = obj->klass();
 
   // if the object is a java.lang.Class then return the java mirror
-  if (k == SystemDictionary::class_klass()) {
+  if (k == SystemDictionary::Class_klass()) {
     if (!java_lang_Class::is_primitive(obj)) {
       k = java_lang_Class::as_klassOop(obj);
       assert(k != NULL, "class for non-primitive mirror must exist");
@@ -657,11 +686,11 @@
   jvmtiAddrLocationMap *_map;
   const void *_compile_info;
  public:
-  JvmtiCompiledMethodLoadEventMark(JavaThread *thread, nmethod *nm)
+  JvmtiCompiledMethodLoadEventMark(JavaThread *thread, nmethod *nm, void* compile_info_ptr = NULL)
           : JvmtiMethodEventMark(thread,methodHandle(thread, nm->method())) {
     _code_data = nm->code_begin();
     _code_size = nm->code_size();
-    _compile_info = NULL; /* no info for our VM. */
+    _compile_info = compile_info_ptr; // Set void pointer of compiledMethodLoad Event. Default value is NULL.
     JvmtiCodeBlobEvents::build_jvmti_addr_location_map(nm, &_map, &_map_length);
   }
   ~JvmtiCompiledMethodLoadEventMark() {
@@ -848,7 +877,7 @@
 bool              JvmtiExport::_can_get_source_debug_extension            = false;
 bool              JvmtiExport::_can_maintain_original_method_order        = false;
 bool              JvmtiExport::_can_post_interpreter_events               = false;
-bool              JvmtiExport::_can_post_exceptions                       = false;
+bool              JvmtiExport::_can_post_on_exceptions                    = false;
 bool              JvmtiExport::_can_post_breakpoint                       = false;
 bool              JvmtiExport::_can_post_field_access                     = false;
 bool              JvmtiExport::_can_post_field_modification               = false;
@@ -879,6 +908,7 @@
 bool              JvmtiExport::_should_post_object_free                   = false;
 bool              JvmtiExport::_should_post_resource_exhausted            = false;
 bool              JvmtiExport::_should_post_vm_object_alloc               = false;
+bool              JvmtiExport::_should_post_on_exceptions                 = false;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -1723,6 +1753,46 @@
   }
 }
 
+// Returns a record containing inlining information for the given nmethod
+jvmtiCompiledMethodLoadInlineRecord* create_inline_record(nmethod* nm) {
+  jint numstackframes = 0;
+  jvmtiCompiledMethodLoadInlineRecord* record = (jvmtiCompiledMethodLoadInlineRecord*)NEW_RESOURCE_OBJ(jvmtiCompiledMethodLoadInlineRecord);
+  record->header.kind = JVMTI_CMLR_INLINE_INFO;
+  record->header.next = NULL;
+  record->header.majorinfoversion = JVMTI_CMLR_MAJOR_VERSION_1;
+  record->header.minorinfoversion = JVMTI_CMLR_MINOR_VERSION_0;
+  record->numpcs = 0;
+  for(PcDesc* p = nm->scopes_pcs_begin(); p < nm->scopes_pcs_end(); p++) {
+   if(p->scope_decode_offset() == DebugInformationRecorder::serialized_null) continue;
+   record->numpcs++;
+  }
+  record->pcinfo = (PCStackInfo*)(NEW_RESOURCE_ARRAY(PCStackInfo, record->numpcs));
+  int scope = 0;
+  for(PcDesc* p = nm->scopes_pcs_begin(); p < nm->scopes_pcs_end(); p++) {
+    if(p->scope_decode_offset() == DebugInformationRecorder::serialized_null) continue;
+    void* pc_address = (void*)p->real_pc(nm);
+    assert(pc_address != NULL, "pc_address must be non-null");
+    record->pcinfo[scope].pc = pc_address;
+    numstackframes=0;
+    for(ScopeDesc* sd = nm->scope_desc_at(p->real_pc(nm));sd != NULL;sd = sd->sender()) {
+      numstackframes++;
+    }
+    assert(numstackframes != 0, "numstackframes must be nonzero.");
+    record->pcinfo[scope].methods = (jmethodID *)NEW_RESOURCE_ARRAY(jmethodID, numstackframes);
+    record->pcinfo[scope].bcis = (jint *)NEW_RESOURCE_ARRAY(jint, numstackframes);
+    record->pcinfo[scope].numstackframes = numstackframes;
+    int stackframe = 0;
+    for(ScopeDesc* sd = nm->scope_desc_at(p->real_pc(nm));sd != NULL;sd = sd->sender()) {
+      // sd->method() can be NULL for stubs but not for nmethods. To be completely robust, include an assert that we should never see a null sd->method()
+      assert(!sd->method().is_null(), "sd->method() cannot be null.");
+      record->pcinfo[scope].methods[stackframe] = sd->method()->jmethod_id();
+      record->pcinfo[scope].bcis[stackframe] = sd->bci();
+      stackframe++;
+    }
+    scope++;
+  }
+  return record;
+}
 
 void JvmtiExport::post_compiled_method_load(nmethod *nm) {
   // If there are pending CompiledMethodUnload events then these are
@@ -1751,7 +1821,11 @@
                 (nm->method() == NULL) ? "NULL" : nm->method()->name()->as_C_string()));
 
       ResourceMark rm(thread);
-      JvmtiCompiledMethodLoadEventMark jem(thread, nm);
+
+      // Add inlining information
+      jvmtiCompiledMethodLoadInlineRecord* inlinerecord = create_inline_record(nm);
+      // Pass inlining information through the void pointer
+      JvmtiCompiledMethodLoadEventMark jem(thread, nm, inlinerecord);
       JvmtiJavaThreadEventTransition jet(thread);
       jvmtiEventCompiledMethodLoad callback = env->callbacks()->CompiledMethodLoad;
       if (callback != NULL) {
@@ -1896,7 +1970,7 @@
       if (collector != NULL && collector->is_enabled()) {
         // Don't record classes as these will be notified via the ClassLoad
         // event.
-        if (obj->klass() != SystemDictionary::class_klass()) {
+        if (obj->klass() != SystemDictionary::Class_klass()) {
           collector->record_allocation(obj);
         }
       }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiExport.hpp
--- a/src/share/vm/prims/jvmtiExport.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiExport.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
@@ -66,7 +66,7 @@
   JVMTI_SUPPORT_FLAG(can_get_source_debug_extension)
   JVMTI_SUPPORT_FLAG(can_maintain_original_method_order)
   JVMTI_SUPPORT_FLAG(can_post_interpreter_events)
-  JVMTI_SUPPORT_FLAG(can_post_exceptions)
+  JVMTI_SUPPORT_FLAG(can_post_on_exceptions)
   JVMTI_SUPPORT_FLAG(can_post_breakpoint)
   JVMTI_SUPPORT_FLAG(can_post_field_access)
   JVMTI_SUPPORT_FLAG(can_post_field_modification)
@@ -93,6 +93,7 @@
   JVMTI_SUPPORT_FLAG(should_post_data_dump)
   JVMTI_SUPPORT_FLAG(should_post_garbage_collection_start)
   JVMTI_SUPPORT_FLAG(should_post_garbage_collection_finish)
+  JVMTI_SUPPORT_FLAG(should_post_on_exceptions)
 
   // ------ the below maybe don't have to be (but are for now)
   // fixed conditions here ------------
@@ -236,6 +237,8 @@
   static bool is_jvmti_version(jint version)                      { return (version & JVMTI_VERSION_MASK) == JVMTI_VERSION_VALUE; }
   static bool is_jvmdi_version(jint version)                      { return (version & JVMTI_VERSION_MASK) == JVMDI_VERSION_VALUE; }
   static jint get_jvmti_interface(JavaVM *jvm, void **penv, jint version);
+  static void decode_version_values(jint version, int * major, int * minor,
+                                    int * micro);
 
   // single stepping management methods
   static void at_single_stepping_point(JavaThread *thread, methodOop method, address location) KERNEL_RETURN;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiHpp.xsl
--- a/src/share/vm/prims/jvmtiHpp.xsl	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiHpp.xsl	Thu Mar 25 16:54:59 2010 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> 
 <!--
- Copyright 2002-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright 2002-2009 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
@@ -48,12 +48,12 @@
 
 private:
     
-    JvmtiEnv();
+    JvmtiEnv(jint version);
     ~JvmtiEnv();
 
 public:
 
-    static JvmtiEnv* create_a_jvmti();
+    static JvmtiEnv* create_a_jvmti(jint version);
 
 </xsl:text>
   <xsl:apply-templates select="functionsection"/>
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiManageCapabilities.cpp
--- a/src/share/vm/prims/jvmtiManageCapabilities.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiManageCapabilities.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -115,8 +115,10 @@
   jvmtiCapabilities jc;
 
   memset(&jc, 0, sizeof(jc));
+#ifndef CC_INTERP
   jc.can_pop_frame = 1;
   jc.can_force_early_return = 1;
+#endif // !CC_INTERP
   jc.can_get_source_debug_extension = 1;
   jc.can_access_local_variables = 1;
   jc.can_maintain_original_method_order = 1;
@@ -355,7 +357,7 @@
     avail.can_access_local_variables  ||
     avail.can_redefine_classes ||
     avail.can_retransform_classes);
-  JvmtiExport::set_can_post_exceptions(
+  JvmtiExport::set_can_post_on_exceptions(
     avail.can_generate_exception_events ||
     avail.can_generate_frame_pop_events ||
     avail.can_generate_method_exit_events);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiRedefineClasses.cpp
--- a/src/share/vm/prims/jvmtiRedefineClasses.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -933,7 +933,7 @@
       // description.
       RedefineVerifyMark rvm(&the_class, &scratch_class, state);
       Verifier::verify(
-        scratch_class, Verifier::ThrowException, THREAD);
+        scratch_class, Verifier::ThrowException, true, THREAD);
     }
 
     if (HAS_PENDING_EXCEPTION) {
@@ -959,7 +959,7 @@
       // verify what we have done during constant pool merging
       {
         RedefineVerifyMark rvm(&the_class, &scratch_class, state);
-        Verifier::verify(scratch_class, Verifier::ThrowException, THREAD);
+        Verifier::verify(scratch_class, Verifier::ThrowException, true, THREAD);
       }
 
       if (HAS_PENDING_EXCEPTION) {
@@ -3214,7 +3214,7 @@
     //  - all instanceKlasses for redefined classes reused & contents updated
     the_class->vtable()->initialize_vtable(false, THREAD);
     the_class->itable()->initialize_itable(false, THREAD);
-    assert(!HAS_PENDING_EXCEPTION || (THREAD->pending_exception()->is_a(SystemDictionary::threaddeath_klass())), "redefine exception");
+    assert(!HAS_PENDING_EXCEPTION || (THREAD->pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())), "redefine exception");
   }
 
   // Leave arrays of jmethodIDs and itable index cache unchanged
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiTagMap.cpp
--- a/src/share/vm/prims/jvmtiTagMap.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiTagMap.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -579,7 +579,7 @@
 // If the object is a java.lang.Class then return the klassOop,
 // otherwise return the original object
 static inline oop klassOop_if_java_lang_Class(oop o) {
-  if (o->klass() == SystemDictionary::class_klass()) {
+  if (o->klass() == SystemDictionary::Class_klass()) {
     if (!java_lang_Class::is_primitive(o)) {
       o = (oop)java_lang_Class::as_klassOop(o);
       assert(o != NULL, "class for non-primitive mirror must exist");
@@ -644,7 +644,7 @@
     } else {
       // if the object represents a runtime class then use the
       // tag for java.lang.Class
-      _klass = SystemDictionary::class_klass();
+      _klass = SystemDictionary::Class_klass();
     }
     _klass_tag = tag_for(tag_map, _klass);
   }
@@ -747,7 +747,7 @@
       // get referrer class tag.
       klassOop k = (_referrer == referrer) ?  // Check if referrer is a class...
           _referrer->klass()                  // No, just get its class
-         : SystemDictionary::class_klass();   // Yes, its class is Class
+         : SystemDictionary::Class_klass();   // Yes, its class is Class
       _referrer_klass_tag = tag_for(tag_map, k);
     }
   }
@@ -1126,7 +1126,7 @@
                                          oop str,
                                          void* user_data)
 {
-  assert(str->klass() == SystemDictionary::string_klass(), "not a string");
+  assert(str->klass() == SystemDictionary::String_klass(), "not a string");
 
   // get the string value and length
   // (string value may be offset from the base)
@@ -1186,7 +1186,7 @@
   // for static fields only the index will be set
   static jvmtiHeapReferenceInfo reference_info = { 0 };
 
-  assert(obj->klass() == SystemDictionary::class_klass(), "not a class");
+  assert(obj->klass() == SystemDictionary::Class_klass(), "not a class");
   if (java_lang_Class::is_primitive(obj)) {
     return 0;
   }
@@ -1498,7 +1498,7 @@
   if (callbacks()->primitive_field_callback != NULL && obj->is_instance()) {
     jint res;
     jvmtiPrimitiveFieldCallback cb = callbacks()->primitive_field_callback;
-    if (obj->klass() == SystemDictionary::class_klass()) {
+    if (obj->klass() == SystemDictionary::Class_klass()) {
       res = invoke_primitive_field_callback_for_static_fields(&wrapper,
                                                                     obj,
                                                                     cb,
@@ -1515,7 +1515,7 @@
   // string callback
   if (!is_array &&
       callbacks()->string_primitive_value_callback != NULL &&
-      obj->klass() == SystemDictionary::string_klass()) {
+      obj->klass() == SystemDictionary::String_klass()) {
     jint res = invoke_string_value_callback(
                 callbacks()->string_primitive_value_callback,
                 &wrapper,
@@ -2381,7 +2381,7 @@
 
 // invoke the string value callback
 inline bool CallbackInvoker::report_string_value(oop str) {
-  assert(str->klass() == SystemDictionary::string_klass(), "not a string");
+  assert(str->klass() == SystemDictionary::String_klass(), "not a string");
 
   AdvancedHeapWalkContext* context = advanced_context();
   assert(context->string_primitive_value_callback() != NULL, "no callback");
@@ -2928,7 +2928,7 @@
 
     // super (only if something more interesting than java.lang.Object)
     klassOop java_super = ik->java_super();
-    if (java_super != NULL && java_super != SystemDictionary::object_klass()) {
+    if (java_super != NULL && java_super != SystemDictionary::Object_klass()) {
       oop super = Klass::cast(java_super)->java_mirror();
       if (!CallbackInvoker::report_superclass_reference(mirror, super)) {
         return false;
@@ -3070,7 +3070,7 @@
 
   // if the object is a java.lang.String
   if (is_reporting_string_values() &&
-      o->klass() == SystemDictionary::string_klass()) {
+      o->klass() == SystemDictionary::String_klass()) {
     if (!CallbackInvoker::report_string_value(o)) {
       return false;
     }
@@ -3126,6 +3126,12 @@
   // exceptions) will be visible.
   blk.set_kind(JVMTI_HEAP_REFERENCE_OTHER);
   Universe::oops_do(&blk);
+
+  // If there are any non-perm roots in the code cache, visit them.
+  blk.set_kind(JVMTI_HEAP_REFERENCE_OTHER);
+  CodeBlobToOopClosure look_in_blobs(&blk, false);
+  CodeCache::scavenge_root_nmethods_do(&look_in_blobs);
+
   return true;
 }
 
@@ -3249,7 +3255,7 @@
 
   // instance
   if (o->is_instance()) {
-    if (o->klass() == SystemDictionary::class_klass()) {
+    if (o->klass() == SystemDictionary::Class_klass()) {
       o = klassOop_if_java_lang_Class(o);
       if (o->is_klass()) {
         // a java.lang.Class
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/jvmtiThreadState.hpp
--- a/src/share/vm/prims/jvmtiThreadState.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/jvmtiThreadState.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -381,6 +381,9 @@
   static ByteSize earlyret_value_offset() { return byte_offset_of(JvmtiThreadState, _earlyret_value); }
 
   void oops_do(OopClosure* f); // GC support
+
+public:
+  void set_should_post_on_exceptions(bool val) { _thread->set_should_post_on_exceptions_flag(val ? JNI_TRUE : JNI_FALSE); }
 };
 
 class RedefineVerifyMark : public StackObj {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/methodHandleWalk.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/prims/methodHandleWalk.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,1401 @@
+/*
+ * Copyright 2008-2010 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.
+ *
+ */
+
+/*
+ * JSR 292 reference implementation: method handle structure analysis
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_methodHandleWalk.cpp.incl"
+
+
+// -----------------------------------------------------------------------------
+// MethodHandleChain
+
+void MethodHandleChain::set_method_handle(Handle mh, TRAPS) {
+  if (!java_dyn_MethodHandle::is_instance(mh()))  lose("bad method handle", CHECK);
+
+  // set current method handle and unpack partially
+  _method_handle = mh;
+  _is_last       = false;
+  _is_bound      = false;
+  _arg_slot      = -1;
+  _arg_type      = T_VOID;
+  _conversion    = -1;
+  _last_invoke   = Bytecodes::_nop;  //arbitrary non-garbage
+
+  if (sun_dyn_DirectMethodHandle::is_instance(mh())) {
+    set_last_method(mh(), THREAD);
+    return;
+  }
+  if (sun_dyn_AdapterMethodHandle::is_instance(mh())) {
+    _conversion = AdapterMethodHandle_conversion();
+    assert(_conversion != -1, "bad conv value");
+    assert(sun_dyn_BoundMethodHandle::is_instance(mh()), "also BMH");
+  }
+  if (sun_dyn_BoundMethodHandle::is_instance(mh())) {
+    if (!is_adapter())          // keep AMH and BMH separate in this model
+      _is_bound = true;
+    _arg_slot = BoundMethodHandle_vmargslot();
+    oop target = MethodHandle_vmtarget_oop();
+    if (!is_bound() || java_dyn_MethodHandle::is_instance(target)) {
+      _arg_type = compute_bound_arg_type(target, NULL, _arg_slot, CHECK);
+    } else if (target != NULL && target->is_method()) {
+      methodOop m = (methodOop) target;
+      _arg_type = compute_bound_arg_type(NULL, m, _arg_slot, CHECK);
+      set_last_method(mh(), CHECK);
+    } else {
+      _is_bound = false;  // lose!
+    }
+  }
+  if (is_bound() && _arg_type == T_VOID) {
+    lose("bad vmargslot", CHECK);
+  }
+  if (!is_bound() && !is_adapter()) {
+    lose("unrecognized MH type", CHECK);
+  }
+}
+
+
+void MethodHandleChain::set_last_method(oop target, TRAPS) {
+  _is_last = true;
+  klassOop receiver_limit_oop = NULL;
+  int flags = 0;
+  methodOop m = MethodHandles::decode_method(target, receiver_limit_oop, flags);
+  _last_method = methodHandle(THREAD, m);
+  if ((flags & MethodHandles::_dmf_has_receiver) == 0)
+    _last_invoke = Bytecodes::_invokestatic;
+  else if ((flags & MethodHandles::_dmf_does_dispatch) == 0)
+    _last_invoke = Bytecodes::_invokespecial;
+  else if ((flags & MethodHandles::_dmf_from_interface) != 0)
+    _last_invoke = Bytecodes::_invokeinterface;
+  else
+    _last_invoke = Bytecodes::_invokevirtual;
+}
+
+
+BasicType MethodHandleChain::compute_bound_arg_type(oop target, methodOop m, int arg_slot, TRAPS) {
+  // There is no direct indication of whether the argument is primitive or not.
+  // It is implied by the _vmentry code, and by the MethodType of the target.
+  // FIXME: Make it explicit MethodHandleImpl refactors out from MethodHandle
+  BasicType arg_type = T_VOID;
+  if (target != NULL) {
+    oop mtype = java_dyn_MethodHandle::type(target);
+    int arg_num = MethodHandles::argument_slot_to_argnum(mtype, arg_slot);
+    if (arg_num >= 0) {
+      oop ptype = java_dyn_MethodType::ptype(mtype, arg_num);
+      arg_type = java_lang_Class::as_BasicType(ptype);
+    }
+  } else if (m != NULL) {
+    // figure out the argument type from the slot
+    // FIXME: make this explicit in the MH
+    int cur_slot = m->size_of_parameters();
+    if (arg_slot >= cur_slot)
+      return T_VOID;
+    if (!m->is_static()) {
+      cur_slot -= type2size[T_OBJECT];
+      if (cur_slot == arg_slot)
+        return T_OBJECT;
+    }
+    for (SignatureStream ss(m->signature()); !ss.is_done(); ss.next()) {
+      BasicType bt = ss.type();
+      cur_slot -= type2size[bt];
+      if (cur_slot <= arg_slot) {
+        if (cur_slot == arg_slot)
+          arg_type = bt;
+        break;
+      }
+    }
+  }
+  if (arg_type == T_ARRAY)
+    arg_type = T_OBJECT;
+  return arg_type;
+}
+
+
+void MethodHandleChain::lose(const char* msg, TRAPS) {
+  assert(false, "lose");
+  _lose_message = msg;
+  if (!THREAD->is_Java_thread() || ((JavaThread*)THREAD)->thread_state() != _thread_in_vm) {
+    // throw a preallocated exception
+    THROW_OOP(Universe::virtual_machine_error_instance());
+  }
+  THROW_MSG(vmSymbols::java_lang_InternalError(), msg);
+}
+
+
+// -----------------------------------------------------------------------------
+// MethodHandleWalker
+
+Bytecodes::Code MethodHandleWalker::conversion_code(BasicType src, BasicType dest) {
+  if (is_subword_type(src)) {
+    src = T_INT;          // all subword src types act like int
+  }
+  if (src == dest) {
+    return Bytecodes::_nop;
+  }
+
+#define SRC_DEST(s,d) (((int)(s) << 4) + (int)(d))
+  switch (SRC_DEST(src, dest)) {
+  case SRC_DEST(T_INT, T_LONG):           return Bytecodes::_i2l;
+  case SRC_DEST(T_INT, T_FLOAT):          return Bytecodes::_i2f;
+  case SRC_DEST(T_INT, T_DOUBLE):         return Bytecodes::_i2d;
+  case SRC_DEST(T_INT, T_BYTE):           return Bytecodes::_i2b;
+  case SRC_DEST(T_INT, T_CHAR):           return Bytecodes::_i2c;
+  case SRC_DEST(T_INT, T_SHORT):          return Bytecodes::_i2s;
+
+  case SRC_DEST(T_LONG, T_INT):           return Bytecodes::_l2i;
+  case SRC_DEST(T_LONG, T_FLOAT):         return Bytecodes::_l2f;
+  case SRC_DEST(T_LONG, T_DOUBLE):        return Bytecodes::_l2d;
+
+  case SRC_DEST(T_FLOAT, T_INT):          return Bytecodes::_f2i;
+  case SRC_DEST(T_FLOAT, T_LONG):         return Bytecodes::_f2l;
+  case SRC_DEST(T_FLOAT, T_DOUBLE):       return Bytecodes::_f2d;
+
+  case SRC_DEST(T_DOUBLE, T_INT):         return Bytecodes::_d2i;
+  case SRC_DEST(T_DOUBLE, T_LONG):        return Bytecodes::_d2l;
+  case SRC_DEST(T_DOUBLE, T_FLOAT):       return Bytecodes::_d2f;
+  }
+#undef SRC_DEST
+
+  // cannot do it in one step, or at all
+  return Bytecodes::_illegal;
+}
+
+
+// -----------------------------------------------------------------------------
+// MethodHandleWalker::walk
+//
+MethodHandleWalker::ArgToken
+MethodHandleWalker::walk(TRAPS) {
+  ArgToken empty = ArgToken();  // Empty return value.
+
+  walk_incoming_state(CHECK_(empty));
+
+  for (;;) {
+    set_method_handle(chain().method_handle_oop());
+
+    assert(_outgoing_argc == argument_count_slow(), "empty slots under control");
+
+    if (chain().is_adapter()) {
+      int conv_op = chain().adapter_conversion_op();
+      int arg_slot = chain().adapter_arg_slot();
+      SlotState* arg_state = slot_state(arg_slot);
+      if (arg_state == NULL
+          && conv_op > sun_dyn_AdapterMethodHandle::OP_RETYPE_RAW) {
+        lose("bad argument index", CHECK_(empty));
+      }
+
+      // perform the adapter action
+      switch (chain().adapter_conversion_op()) {
+      case sun_dyn_AdapterMethodHandle::OP_RETYPE_ONLY:
+        // No changes to arguments; pass the bits through.
+        break;
+
+      case sun_dyn_AdapterMethodHandle::OP_RETYPE_RAW: {
+        // To keep the verifier happy, emit bitwise ("raw") conversions as needed.
+        // See MethodHandles::same_basic_type_for_arguments for allowed conversions.
+        Handle incoming_mtype(THREAD, chain().method_type_oop());
+        oop outgoing_mh_oop = chain().vmtarget_oop();
+        if (!java_dyn_MethodHandle::is_instance(outgoing_mh_oop))
+          lose("outgoing target not a MethodHandle", CHECK_(empty));
+        Handle outgoing_mtype(THREAD, java_dyn_MethodHandle::type(outgoing_mh_oop));
+        outgoing_mh_oop = NULL;  // GC safety
+
+        int nptypes = java_dyn_MethodType::ptype_count(outgoing_mtype());
+        if (nptypes != java_dyn_MethodType::ptype_count(incoming_mtype()))
+          lose("incoming and outgoing parameter count do not agree", CHECK_(empty));
+
+        for (int i = 0, slot = _outgoing.length() - 1; slot >= 0; slot--) {
+          SlotState* arg_state = slot_state(slot);
+          if (arg_state->_type == T_VOID)  continue;
+          ArgToken arg = _outgoing.at(slot)._arg;
+
+          klassOop  in_klass  = NULL;
+          klassOop  out_klass = NULL;
+          BasicType inpbt  = java_lang_Class::as_BasicType(java_dyn_MethodType::ptype(incoming_mtype(), i), &in_klass);
+          BasicType outpbt = java_lang_Class::as_BasicType(java_dyn_MethodType::ptype(outgoing_mtype(), i), &out_klass);
+          assert(inpbt == arg.basic_type(), "sanity");
+
+          if (inpbt != outpbt) {
+            vmIntrinsics::ID iid = vmIntrinsics::for_raw_conversion(inpbt, outpbt);
+            if (iid == vmIntrinsics::_none) {
+              lose("no raw conversion method", CHECK_(empty));
+            }
+            ArgToken arglist[2];
+            arglist[0] = arg;         // outgoing 'this'
+            arglist[1] = ArgToken();  // sentinel
+            arg = make_invoke(NULL, iid, Bytecodes::_invokestatic, false, 1, &arglist[0], CHECK_(empty));
+            change_argument(inpbt, slot, outpbt, arg);
+          }
+
+          i++;  // We need to skip void slots at the top of the loop.
+        }
+
+        BasicType inrbt  = java_lang_Class::as_BasicType(java_dyn_MethodType::rtype(incoming_mtype()));
+        BasicType outrbt = java_lang_Class::as_BasicType(java_dyn_MethodType::rtype(outgoing_mtype()));
+        if (inrbt != outrbt) {
+          if (inrbt == T_INT && outrbt == T_VOID) {
+            // See comments in MethodHandles::same_basic_type_for_arguments.
+          } else {
+            assert(false, "IMPLEMENT ME");
+            lose("no raw conversion method", CHECK_(empty));
+          }
+        }
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_CHECK_CAST: {
+        // checkcast the Nth outgoing argument in place
+        klassOop dest_klass = NULL;
+        BasicType dest = java_lang_Class::as_BasicType(chain().adapter_arg_oop(), &dest_klass);
+        assert(dest == T_OBJECT, "");
+        assert(dest == arg_state->_type, "");
+        ArgToken arg = arg_state->_arg;
+        ArgToken new_arg = make_conversion(T_OBJECT, dest_klass, Bytecodes::_checkcast, arg, CHECK_(empty));
+        assert(arg.index() == new_arg.index(), "should be the same index");
+        debug_only(dest_klass = (klassOop)badOop);
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_PRIM_TO_PRIM: {
+        // i2l, etc., on the Nth outgoing argument in place
+        BasicType src = chain().adapter_conversion_src_type(),
+                  dest = chain().adapter_conversion_dest_type();
+        Bytecodes::Code bc = conversion_code(src, dest);
+        ArgToken arg = arg_state->_arg;
+        if (bc == Bytecodes::_nop) {
+          break;
+        } else if (bc != Bytecodes::_illegal) {
+          arg = make_conversion(dest, NULL, bc, arg, CHECK_(empty));
+        } else if (is_subword_type(dest)) {
+          bc = conversion_code(src, T_INT);
+          if (bc != Bytecodes::_illegal) {
+            arg = make_conversion(dest, NULL, bc, arg, CHECK_(empty));
+            bc = conversion_code(T_INT, dest);
+            arg = make_conversion(dest, NULL, bc, arg, CHECK_(empty));
+          }
+        }
+        if (bc == Bytecodes::_illegal) {
+          lose("bad primitive conversion", CHECK_(empty));
+        }
+        change_argument(src, arg_slot, dest, arg);
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_REF_TO_PRIM: {
+        // checkcast to wrapper type & call intValue, etc.
+        BasicType dest = chain().adapter_conversion_dest_type();
+        ArgToken arg = arg_state->_arg;
+        arg = make_conversion(T_OBJECT, SystemDictionary::box_klass(dest),
+                              Bytecodes::_checkcast, arg, CHECK_(empty));
+        vmIntrinsics::ID unboxer = vmIntrinsics::for_unboxing(dest);
+        if (unboxer == vmIntrinsics::_none) {
+          lose("no unboxing method", CHECK_(empty));
+        }
+        ArgToken arglist[2];
+        arglist[0] = arg;         // outgoing 'this'
+        arglist[1] = ArgToken();  // sentinel
+        arg = make_invoke(NULL, unboxer, Bytecodes::_invokevirtual, false, 1, &arglist[0], CHECK_(empty));
+        change_argument(T_OBJECT, arg_slot, dest, arg);
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_PRIM_TO_REF: {
+        // call wrapper type.valueOf
+        BasicType src = chain().adapter_conversion_src_type();
+        ArgToken arg = arg_state->_arg;
+        vmIntrinsics::ID boxer = vmIntrinsics::for_boxing(src);
+        if (boxer == vmIntrinsics::_none) {
+          lose("no boxing method", CHECK_(empty));
+        }
+        ArgToken arglist[2];
+        arglist[0] = arg;         // outgoing value
+        arglist[1] = ArgToken();  // sentinel
+        assert(false, "I think the argument count must be 1 instead of 0");
+        arg = make_invoke(NULL, boxer, Bytecodes::_invokevirtual, false, 0, &arglist[0], CHECK_(empty));
+        change_argument(src, arg_slot, T_OBJECT, arg);
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_SWAP_ARGS: {
+        int dest_arg_slot = chain().adapter_conversion_vminfo();
+        if (!slot_has_argument(dest_arg_slot)) {
+          lose("bad swap index", CHECK_(empty));
+        }
+        // a simple swap between two arguments
+        SlotState* dest_arg_state = slot_state(dest_arg_slot);
+        SlotState temp = (*dest_arg_state);
+        (*dest_arg_state) = (*arg_state);
+        (*arg_state) = temp;
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_ROT_ARGS: {
+        int dest_arg_slot = chain().adapter_conversion_vminfo();
+        if (!slot_has_argument(dest_arg_slot) || arg_slot == dest_arg_slot) {
+          lose("bad rotate index", CHECK_(empty));
+        }
+        SlotState* dest_arg_state = slot_state(dest_arg_slot);
+        // Rotate the source argument (plus following N slots) into the
+        // position occupied by the dest argument (plus following N slots).
+        int rotate_count = type2size[dest_arg_state->_type];
+        // (no other rotate counts are currently supported)
+        if (arg_slot < dest_arg_slot) {
+          for (int i = 0; i < rotate_count; i++) {
+            SlotState temp = _outgoing.at(arg_slot);
+            _outgoing.remove_at(arg_slot);
+            _outgoing.insert_before(dest_arg_slot + rotate_count - 1, temp);
+          }
+        } else { // arg_slot > dest_arg_slot
+          for (int i = 0; i < rotate_count; i++) {
+            SlotState temp = _outgoing.at(arg_slot + rotate_count - 1);
+            _outgoing.remove_at(arg_slot + rotate_count - 1);
+            _outgoing.insert_before(dest_arg_slot, temp);
+          }
+        }
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_DUP_ARGS: {
+        int dup_slots = chain().adapter_conversion_stack_pushes();
+        if (dup_slots <= 0) {
+          lose("bad dup count", CHECK_(empty));
+        }
+        for (int i = 0; i < dup_slots; i++) {
+          SlotState* dup = slot_state(arg_slot + 2*i);
+          if (dup == NULL)              break;  // safety net
+          if (dup->_type != T_VOID)     _outgoing_argc += 1;
+          _outgoing.insert_before(i, (*dup));
+        }
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_DROP_ARGS: {
+        int drop_slots = -chain().adapter_conversion_stack_pushes();
+        if (drop_slots <= 0) {
+          lose("bad drop count", CHECK_(empty));
+        }
+        for (int i = 0; i < drop_slots; i++) {
+          SlotState* drop = slot_state(arg_slot);
+          if (drop == NULL)             break;  // safety net
+          if (drop->_type != T_VOID)    _outgoing_argc -= 1;
+          _outgoing.remove_at(arg_slot);
+        }
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_COLLECT_ARGS: { //NYI, may GC
+        lose("unimplemented", CHECK_(empty));
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_SPREAD_ARGS: {
+        klassOop array_klass_oop = NULL;
+        BasicType array_type = java_lang_Class::as_BasicType(chain().adapter_arg_oop(),
+                                                             &array_klass_oop);
+        assert(array_type == T_OBJECT, "");
+        assert(Klass::cast(array_klass_oop)->oop_is_array(), "");
+        arrayKlassHandle array_klass(THREAD, array_klass_oop);
+        debug_only(array_klass_oop = (klassOop)badOop);
+
+        klassOop element_klass_oop = NULL;
+        BasicType element_type = java_lang_Class::as_BasicType(array_klass->component_mirror(),
+                                                               &element_klass_oop);
+        KlassHandle element_klass(THREAD, element_klass_oop);
+        debug_only(element_klass_oop = (klassOop)badOop);
+
+        // Fetch the argument, which we will cast to the required array type.
+        assert(arg_state->_type == T_OBJECT, "");
+        ArgToken array_arg = arg_state->_arg;
+        array_arg = make_conversion(T_OBJECT, array_klass(), Bytecodes::_checkcast, array_arg, CHECK_(empty));
+        change_argument(T_OBJECT, arg_slot, T_VOID, ArgToken(tt_void));
+
+        // Check the required length.
+        int spread_slots = 1 + chain().adapter_conversion_stack_pushes();
+        int spread_length = spread_slots;
+        if (type2size[element_type] == 2) {
+          if (spread_slots % 2 != 0)  spread_slots = -1;  // force error
+          spread_length = spread_slots / 2;
+        }
+        if (spread_slots < 0) {
+          lose("bad spread length", CHECK_(empty));
+        }
+
+        jvalue   length_jvalue;  length_jvalue.i = spread_length;
+        ArgToken length_arg = make_prim_constant(T_INT, &length_jvalue, CHECK_(empty));
+        // Call a built-in method known to the JVM to validate the length.
+        ArgToken arglist[3];
+        arglist[0] = array_arg;   // value to check
+        arglist[1] = length_arg;  // length to check
+        arglist[2] = ArgToken();  // sentinel
+        make_invoke(NULL, vmIntrinsics::_checkSpreadArgument,
+                    Bytecodes::_invokestatic, false, 3, &arglist[0], CHECK_(empty));
+
+        // Spread out the array elements.
+        Bytecodes::Code aload_op = Bytecodes::_aaload;
+        if (element_type != T_OBJECT) {
+          lose("primitive array NYI", CHECK_(empty));
+        }
+        int ap = arg_slot;
+        for (int i = 0; i < spread_length; i++) {
+          jvalue   offset_jvalue;  offset_jvalue.i = i;
+          ArgToken offset_arg = make_prim_constant(T_INT, &offset_jvalue, CHECK_(empty));
+          ArgToken element_arg = make_fetch(element_type, element_klass(), aload_op, array_arg, offset_arg, CHECK_(empty));
+          change_argument(T_VOID, ap, element_type, element_arg);
+          ap += type2size[element_type];
+        }
+        break;
+      }
+
+      case sun_dyn_AdapterMethodHandle::OP_FLYBY: //NYI, runs Java code
+      case sun_dyn_AdapterMethodHandle::OP_RICOCHET: //NYI, runs Java code
+        lose("unimplemented", CHECK_(empty));
+        break;
+
+      default:
+        lose("bad adapter conversion", CHECK_(empty));
+        break;
+      }
+    }
+
+    if (chain().is_bound()) {
+      // push a new argument
+      BasicType arg_type  = chain().bound_arg_type();
+      jint      arg_slot  = chain().bound_arg_slot();
+      oop       arg_oop   = chain().bound_arg_oop();
+      ArgToken  arg;
+      if (arg_type == T_OBJECT) {
+        arg = make_oop_constant(arg_oop, CHECK_(empty));
+      } else {
+        jvalue arg_value;
+        BasicType bt = java_lang_boxing_object::get_value(arg_oop, &arg_value);
+        if (bt == arg_type) {
+          arg = make_prim_constant(arg_type, &arg_value, CHECK_(empty));
+        } else {
+          lose("bad bound value", CHECK_(empty));
+        }
+      }
+      debug_only(arg_oop = badOop);
+      change_argument(T_VOID, arg_slot, arg_type, arg);
+    }
+
+    // this test must come after the body of the loop
+    if (!chain().is_last()) {
+      chain().next(CHECK_(empty));
+    } else {
+      break;
+    }
+  }
+
+  // finish the sequence with a tail-call to the ultimate target
+  // parameters are passed in logical order (recv 1st), not slot order
+  ArgToken* arglist = NEW_RESOURCE_ARRAY(ArgToken, _outgoing.length() + 1);
+  int ap = 0;
+  for (int i = _outgoing.length() - 1; i >= 0; i--) {
+    SlotState* arg_state = slot_state(i);
+    if (arg_state->_type == T_VOID)  continue;
+    arglist[ap++] = _outgoing.at(i)._arg;
+  }
+  assert(ap == _outgoing_argc, "");
+  arglist[ap] = ArgToken();  // add a sentinel, for the sake of asserts
+  return make_invoke(chain().last_method_oop(),
+                     vmIntrinsics::_none,
+                     chain().last_invoke_code(), true,
+                     ap, arglist, THREAD);
+}
+
+
+// -----------------------------------------------------------------------------
+// MethodHandleWalker::walk_incoming_state
+//
+void MethodHandleWalker::walk_incoming_state(TRAPS) {
+  Handle mtype(THREAD, chain().method_type_oop());
+  int nptypes = java_dyn_MethodType::ptype_count(mtype());
+  _outgoing_argc = nptypes;
+  int argp = nptypes - 1;
+  if (argp >= 0) {
+    _outgoing.at_grow(argp, make_state(T_VOID, ArgToken(tt_void))); // presize
+  }
+  for (int i = 0; i < nptypes; i++) {
+    klassOop  arg_type_klass = NULL;
+    BasicType arg_type = java_lang_Class::as_BasicType(
+                java_dyn_MethodType::ptype(mtype(), i), &arg_type_klass);
+    int index = new_local_index(arg_type);
+    ArgToken arg = make_parameter(arg_type, arg_type_klass, index, CHECK);
+    debug_only(arg_type_klass = (klassOop) NULL);
+    _outgoing.at_put(argp, make_state(arg_type, arg));
+    if (type2size[arg_type] == 2) {
+      // add the extra slot, so we can model the JVM stack
+      _outgoing.insert_before(argp+1, make_state(T_VOID, ArgToken(tt_void)));
+    }
+    --argp;
+  }
+  // call make_parameter at the end of the list for the return type
+  klassOop  ret_type_klass = NULL;
+  BasicType ret_type = java_lang_Class::as_BasicType(
+              java_dyn_MethodType::rtype(mtype()), &ret_type_klass);
+  ArgToken  ret = make_parameter(ret_type, ret_type_klass, -1, CHECK);
+  // ignore ret; client can catch it if needed
+}
+
+
+// -----------------------------------------------------------------------------
+// MethodHandleWalker::change_argument
+//
+// This is messy because some kinds of arguments are paired with
+// companion slots containing an empty value.
+void MethodHandleWalker::change_argument(BasicType old_type, int slot, BasicType new_type,
+                                         const ArgToken& new_arg) {
+  int old_size = type2size[old_type];
+  int new_size = type2size[new_type];
+  if (old_size == new_size) {
+    // simple case first
+    _outgoing.at_put(slot, make_state(new_type, new_arg));
+  } else if (old_size > new_size) {
+    for (int i = old_size - 1; i >= new_size; i--) {
+      assert((i != 0) == (_outgoing.at(slot + i)._type == T_VOID), "");
+      _outgoing.remove_at(slot + i);
+    }
+    if (new_size > 0)
+      _outgoing.at_put(slot, make_state(new_type, new_arg));
+    else
+      _outgoing_argc -= 1;      // deleted a real argument
+  } else {
+    for (int i = old_size; i < new_size; i++) {
+      _outgoing.insert_before(slot + i, make_state(T_VOID, ArgToken(tt_void)));
+    }
+    _outgoing.at_put(slot, make_state(new_type, new_arg));
+    if (old_size == 0)
+      _outgoing_argc += 1;      // inserted a real argument
+  }
+}
+
+
+#ifdef ASSERT
+int MethodHandleWalker::argument_count_slow() {
+  int args_seen = 0;
+  for (int i = _outgoing.length() - 1; i >= 0; i--) {
+    if (_outgoing.at(i)._type != T_VOID) {
+      ++args_seen;
+    }
+  }
+  return args_seen;
+}
+#endif
+
+
+// -----------------------------------------------------------------------------
+// MethodHandleCompiler
+
+MethodHandleCompiler::MethodHandleCompiler(Handle root, methodHandle callee, bool is_invokedynamic, TRAPS)
+  : MethodHandleWalker(root, is_invokedynamic, THREAD),
+    _callee(callee),
+    _thread(THREAD),
+    _bytecode(THREAD, 50),
+    _constants(THREAD, 10),
+    _cur_stack(0),
+    _max_stack(0),
+    _rtype(T_ILLEGAL)
+{
+
+  // Element zero is always the null constant.
+  (void) _constants.append(NULL);
+
+  // Set name and signature index.
+  _name_index      = cpool_symbol_put(_callee->name());
+  _signature_index = cpool_symbol_put(_callee->signature());
+
+  // Get return type klass.
+  Handle first_mtype(THREAD, chain().method_type_oop());
+  // _rklass is NULL for primitives.
+  _rtype = java_lang_Class::as_BasicType(java_dyn_MethodType::rtype(first_mtype()), &_rklass);
+  if (_rtype == T_ARRAY)  _rtype = T_OBJECT;
+
+  int params = _callee->size_of_parameters();  // Incoming arguments plus receiver.
+  _num_params = for_invokedynamic() ? params - 1 : params;  // XXX Check if callee is static?
+}
+
+
+// -----------------------------------------------------------------------------
+// MethodHandleCompiler::compile
+//
+// Compile this MethodHandle into a bytecode adapter and return a
+// methodOop.
+methodHandle MethodHandleCompiler::compile(TRAPS) {
+  assert(_thread == THREAD, "must be same thread");
+  methodHandle nullHandle;
+  (void) walk(CHECK_(nullHandle));
+  return get_method_oop(CHECK_(nullHandle));
+}
+
+
+void MethodHandleCompiler::emit_bc(Bytecodes::Code op, int index) {
+  Bytecodes::check(op);  // Are we legal?
+
+  switch (op) {
+  // b
+  case Bytecodes::_aconst_null:
+  case Bytecodes::_iconst_m1:
+  case Bytecodes::_iconst_0:
+  case Bytecodes::_iconst_1:
+  case Bytecodes::_iconst_2:
+  case Bytecodes::_iconst_3:
+  case Bytecodes::_iconst_4:
+  case Bytecodes::_iconst_5:
+  case Bytecodes::_lconst_0:
+  case Bytecodes::_lconst_1:
+  case Bytecodes::_fconst_0:
+  case Bytecodes::_fconst_1:
+  case Bytecodes::_fconst_2:
+  case Bytecodes::_dconst_0:
+  case Bytecodes::_dconst_1:
+  case Bytecodes::_iload_0:
+  case Bytecodes::_iload_1:
+  case Bytecodes::_iload_2:
+  case Bytecodes::_iload_3:
+  case Bytecodes::_lload_0:
+  case Bytecodes::_lload_1:
+  case Bytecodes::_lload_2:
+  case Bytecodes::_lload_3:
+  case Bytecodes::_fload_0:
+  case Bytecodes::_fload_1:
+  case Bytecodes::_fload_2:
+  case Bytecodes::_fload_3:
+  case Bytecodes::_dload_0:
+  case Bytecodes::_dload_1:
+  case Bytecodes::_dload_2:
+  case Bytecodes::_dload_3:
+  case Bytecodes::_aload_0:
+  case Bytecodes::_aload_1:
+  case Bytecodes::_aload_2:
+  case Bytecodes::_aload_3:
+  case Bytecodes::_istore_0:
+  case Bytecodes::_istore_1:
+  case Bytecodes::_istore_2:
+  case Bytecodes::_istore_3:
+  case Bytecodes::_lstore_0:
+  case Bytecodes::_lstore_1:
+  case Bytecodes::_lstore_2:
+  case Bytecodes::_lstore_3:
+  case Bytecodes::_fstore_0:
+  case Bytecodes::_fstore_1:
+  case Bytecodes::_fstore_2:
+  case Bytecodes::_fstore_3:
+  case Bytecodes::_dstore_0:
+  case Bytecodes::_dstore_1:
+  case Bytecodes::_dstore_2:
+  case Bytecodes::_dstore_3:
+  case Bytecodes::_astore_0:
+  case Bytecodes::_astore_1:
+  case Bytecodes::_astore_2:
+  case Bytecodes::_astore_3:
+  case Bytecodes::_i2l:
+  case Bytecodes::_i2f:
+  case Bytecodes::_i2d:
+  case Bytecodes::_i2b:
+  case Bytecodes::_i2c:
+  case Bytecodes::_i2s:
+  case Bytecodes::_l2i:
+  case Bytecodes::_l2f:
+  case Bytecodes::_l2d:
+  case Bytecodes::_f2i:
+  case Bytecodes::_f2l:
+  case Bytecodes::_f2d:
+  case Bytecodes::_d2i:
+  case Bytecodes::_d2l:
+  case Bytecodes::_d2f:
+  case Bytecodes::_ireturn:
+  case Bytecodes::_lreturn:
+  case Bytecodes::_freturn:
+  case Bytecodes::_dreturn:
+  case Bytecodes::_areturn:
+  case Bytecodes::_return:
+    assert(strcmp(Bytecodes::format(op), "b") == 0, "wrong bytecode format");
+    _bytecode.push(op);
+    break;
+
+  // bi
+  case Bytecodes::_ldc:
+  case Bytecodes::_iload:
+  case Bytecodes::_lload:
+  case Bytecodes::_fload:
+  case Bytecodes::_dload:
+  case Bytecodes::_aload:
+  case Bytecodes::_istore:
+  case Bytecodes::_lstore:
+  case Bytecodes::_fstore:
+  case Bytecodes::_dstore:
+  case Bytecodes::_astore:
+    assert(strcmp(Bytecodes::format(op), "bi") == 0, "wrong bytecode format");
+    assert((char) index == index, "index does not fit in 8-bit");
+    _bytecode.push(op);
+    _bytecode.push(index);
+    break;
+
+  // bii
+  case Bytecodes::_ldc2_w:
+  case Bytecodes::_checkcast:
+    assert(strcmp(Bytecodes::format(op), "bii") == 0, "wrong bytecode format");
+    assert((short) index == index, "index does not fit in 16-bit");
+    _bytecode.push(op);
+    _bytecode.push(index >> 8);
+    _bytecode.push(index);
+    break;
+
+  // bjj
+  case Bytecodes::_invokestatic:
+  case Bytecodes::_invokespecial:
+  case Bytecodes::_invokevirtual:
+    assert(strcmp(Bytecodes::format(op), "bjj") == 0, "wrong bytecode format");
+    assert((short) index == index, "index does not fit in 16-bit");
+    _bytecode.push(op);
+    _bytecode.push(index >> 8);
+    _bytecode.push(index);
+    break;
+
+  default:
+    ShouldNotReachHere();
+  }
+}
+
+
+void MethodHandleCompiler::emit_load(BasicType bt, int index) {
+  if (index <= 3) {
+    switch (bt) {
+    case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT:
+    case T_INT:    emit_bc(Bytecodes::cast(Bytecodes::_iload_0 + index)); break;
+    case T_LONG:   emit_bc(Bytecodes::cast(Bytecodes::_lload_0 + index)); break;
+    case T_FLOAT:  emit_bc(Bytecodes::cast(Bytecodes::_fload_0 + index)); break;
+    case T_DOUBLE: emit_bc(Bytecodes::cast(Bytecodes::_dload_0 + index)); break;
+    case T_OBJECT: emit_bc(Bytecodes::cast(Bytecodes::_aload_0 + index)); break;
+    default:
+      ShouldNotReachHere();
+    }
+  }
+  else {
+    switch (bt) {
+    case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT:
+    case T_INT:    emit_bc(Bytecodes::_iload, index); break;
+    case T_LONG:   emit_bc(Bytecodes::_lload, index); break;
+    case T_FLOAT:  emit_bc(Bytecodes::_fload, index); break;
+    case T_DOUBLE: emit_bc(Bytecodes::_dload, index); break;
+    case T_OBJECT: emit_bc(Bytecodes::_aload, index); break;
+    default:
+      ShouldNotReachHere();
+    }
+  }
+  stack_push(bt);
+}
+
+void MethodHandleCompiler::emit_store(BasicType bt, int index) {
+  if (index <= 3) {
+    switch (bt) {
+    case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT:
+    case T_INT:    emit_bc(Bytecodes::cast(Bytecodes::_istore_0 + index)); break;
+    case T_LONG:   emit_bc(Bytecodes::cast(Bytecodes::_lstore_0 + index)); break;
+    case T_FLOAT:  emit_bc(Bytecodes::cast(Bytecodes::_fstore_0 + index)); break;
+    case T_DOUBLE: emit_bc(Bytecodes::cast(Bytecodes::_dstore_0 + index)); break;
+    case T_OBJECT: emit_bc(Bytecodes::cast(Bytecodes::_astore_0 + index)); break;
+    default:
+      ShouldNotReachHere();
+    }
+  }
+  else {
+    switch (bt) {
+    case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT:
+    case T_INT:    emit_bc(Bytecodes::_istore, index); break;
+    case T_LONG:   emit_bc(Bytecodes::_lstore, index); break;
+    case T_FLOAT:  emit_bc(Bytecodes::_fstore, index); break;
+    case T_DOUBLE: emit_bc(Bytecodes::_dstore, index); break;
+    case T_OBJECT: emit_bc(Bytecodes::_astore, index); break;
+    default:
+      ShouldNotReachHere();
+    }
+  }
+  stack_pop(bt);
+}
+
+
+void MethodHandleCompiler::emit_load_constant(ArgToken arg) {
+  BasicType bt = arg.basic_type();
+  switch (bt) {
+  case T_INT: {
+    jint value = arg.get_jint();
+    if (-1 <= value && value <= 5)
+      emit_bc(Bytecodes::cast(Bytecodes::_iconst_0 + value));
+    else
+      emit_bc(Bytecodes::_ldc, cpool_int_put(value));
+    break;
+  }
+  case T_LONG: {
+    jlong value = arg.get_jlong();
+    if (0 <= value && value <= 1)
+      emit_bc(Bytecodes::cast(Bytecodes::_lconst_0 + (int) value));
+    else
+      emit_bc(Bytecodes::_ldc2_w, cpool_long_put(value));
+    break;
+  }
+  case T_FLOAT: {
+    jfloat value  = arg.get_jfloat();
+    if (value == 0.0 || value == 1.0 || value == 2.0)
+      emit_bc(Bytecodes::cast(Bytecodes::_fconst_0 + (int) value));
+    else
+      emit_bc(Bytecodes::_ldc, cpool_float_put(value));
+    break;
+  }
+  case T_DOUBLE: {
+    jdouble value = arg.get_jdouble();
+    if (value == 0.0 || value == 1.0)
+      emit_bc(Bytecodes::cast(Bytecodes::_dconst_0 + (int) value));
+    else
+      emit_bc(Bytecodes::_ldc2_w, cpool_double_put(value));
+    break;
+  }
+  case T_OBJECT: {
+    Handle value = arg.object();
+    if (value.is_null())
+      emit_bc(Bytecodes::_aconst_null);
+    else
+      emit_bc(Bytecodes::_ldc, cpool_object_put(value));
+    break;
+  }
+  default:
+    ShouldNotReachHere();
+  }
+  stack_push(bt);
+}
+
+
+MethodHandleWalker::ArgToken
+MethodHandleCompiler::make_conversion(BasicType type, klassOop tk, Bytecodes::Code op,
+                                      const ArgToken& src, TRAPS) {
+
+  BasicType srctype = src.basic_type();
+  int index = src.index();
+
+  switch (op) {
+  case Bytecodes::_i2l:
+  case Bytecodes::_i2f:
+  case Bytecodes::_i2d:
+  case Bytecodes::_i2b:
+  case Bytecodes::_i2c:
+  case Bytecodes::_i2s:
+
+  case Bytecodes::_l2i:
+  case Bytecodes::_l2f:
+  case Bytecodes::_l2d:
+
+  case Bytecodes::_f2i:
+  case Bytecodes::_f2l:
+  case Bytecodes::_f2d:
+
+  case Bytecodes::_d2i:
+  case Bytecodes::_d2l:
+  case Bytecodes::_d2f:
+    emit_load(srctype, index);
+    stack_pop(srctype);  // pop the src type
+    emit_bc(op);
+    stack_push(type);    // push the dest value
+    if (srctype != type)
+      index = new_local_index(type);
+    emit_store(type, index);
+    break;
+
+  case Bytecodes::_checkcast:
+    emit_load(srctype, index);
+    emit_bc(op, cpool_klass_put(tk));
+    emit_store(srctype, index);
+    break;
+
+  default:
+    ShouldNotReachHere();
+  }
+
+  return make_parameter(type, tk, index, THREAD);
+}
+
+
+// -----------------------------------------------------------------------------
+// MethodHandleCompiler
+//
+
+static jvalue zero_jvalue;
+
+// Emit bytecodes for the given invoke instruction.
+MethodHandleWalker::ArgToken
+MethodHandleCompiler::make_invoke(methodOop m, vmIntrinsics::ID iid,
+                                  Bytecodes::Code op, bool tailcall,
+                                  int argc, MethodHandleWalker::ArgToken* argv,
+                                  TRAPS) {
+  if (m == NULL) {
+    // Get the intrinsic methodOop.
+    m = vmIntrinsics::method_for(iid);
+  }
+
+  klassOop  klass     = m->method_holder();
+  symbolOop name      = m->name();
+  symbolOop signature = m->signature();
+
+  if (tailcall) {
+    // Actually, in order to make these methods more recognizable,
+    // let's put them in holder classes MethodHandle and InvokeDynamic.
+    // That way stack walkers and compiler heuristics can recognize them.
+    _target_klass = (for_invokedynamic()
+                     ? SystemDictionary::InvokeDynamic_klass()
+                     : SystemDictionary::MethodHandle_klass());
+  }
+
+  // instanceKlass* ik = instanceKlass::cast(klass);
+  // tty->print_cr("MethodHandleCompiler::make_invoke: %s %s.%s%s", Bytecodes::name(op), ik->external_name(), name->as_C_string(), signature->as_C_string());
+
+  // Inline the method.
+  InvocationCounter* ic = m->invocation_counter();
+  ic->set_carry();
+
+  for (int i = 0; i < argc; i++) {
+    ArgToken arg = argv[i];
+    TokenType tt = arg.token_type();
+    BasicType bt = arg.basic_type();
+
+    switch (tt) {
+    case tt_parameter:
+    case tt_temporary:
+      emit_load(bt, arg.index());
+      break;
+    case tt_constant:
+      emit_load_constant(arg);
+      break;
+    case tt_illegal:
+      // Sentinel.
+      assert(i == (argc - 1), "sentinel must be last entry");
+      break;
+    case tt_void:
+    default:
+      ShouldNotReachHere();
+    }
+  }
+
+  // Populate constant pool.
+  int name_index          = cpool_symbol_put(name);
+  int signature_index     = cpool_symbol_put(signature);
+  int name_and_type_index = cpool_name_and_type_put(name_index, signature_index);
+  int klass_index         = cpool_klass_put(klass);
+  int methodref_index     = cpool_methodref_put(klass_index, name_and_type_index);
+
+  // Generate invoke.
+  switch (op) {
+  case Bytecodes::_invokestatic:
+  case Bytecodes::_invokespecial:
+  case Bytecodes::_invokevirtual:
+    emit_bc(op, methodref_index);
+    break;
+  case Bytecodes::_invokeinterface:
+    Unimplemented();
+    break;
+  default:
+    ShouldNotReachHere();
+  }
+
+  // If tailcall, we have walked all the way to a direct method handle.
+  // Otherwise, make a recursive call to some helper routine.
+  BasicType rbt = m->result_type();
+  if (rbt == T_ARRAY)  rbt = T_OBJECT;
+  ArgToken ret;
+  if (tailcall) {
+    if (rbt != _rtype) {
+      if (rbt == T_VOID) {
+        // push a zero of the right sort
+        ArgToken zero;
+        if (_rtype == T_OBJECT) {
+          zero = make_oop_constant(NULL, CHECK_(zero));
+        } else {
+          zero = make_prim_constant(_rtype, &zero_jvalue, CHECK_(zero));
+        }
+        emit_load_constant(zero);
+      } else if (_rtype == T_VOID) {
+        // We'll emit a _return with something on the stack.
+        // It's OK to ignore what's on the stack.
+      } else {
+        tty->print_cr("*** rbt=%d != rtype=%d", rbt, _rtype);
+        assert(false, "IMPLEMENT ME");
+      }
+    }
+    switch (_rtype) {
+    case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT:
+    case T_INT:    emit_bc(Bytecodes::_ireturn); break;
+    case T_LONG:   emit_bc(Bytecodes::_lreturn); break;
+    case T_FLOAT:  emit_bc(Bytecodes::_freturn); break;
+    case T_DOUBLE: emit_bc(Bytecodes::_dreturn); break;
+    case T_VOID:   emit_bc(Bytecodes::_return);  break;
+    case T_OBJECT:
+      if (_rklass.not_null() && _rklass() != SystemDictionary::Object_klass())
+        emit_bc(Bytecodes::_checkcast, cpool_klass_put(_rklass()));
+      emit_bc(Bytecodes::_areturn);
+      break;
+    default: ShouldNotReachHere();
+    }
+    ret = ArgToken();  // Dummy return value.
+  }
+  else {
+    stack_push(rbt);  // The return value is already pushed onto the stack.
+    int index = new_local_index(rbt);
+    switch (rbt) {
+    case T_BOOLEAN: case T_BYTE: case T_CHAR:  case T_SHORT:
+    case T_INT:     case T_LONG: case T_FLOAT: case T_DOUBLE:
+    case T_OBJECT:
+      emit_store(rbt, index);
+      ret = ArgToken(tt_temporary, rbt, index);
+      break;
+    case T_VOID:
+      ret = ArgToken(tt_void);
+      break;
+    default:
+      ShouldNotReachHere();
+    }
+  }
+
+  return ret;
+}
+
+MethodHandleWalker::ArgToken
+MethodHandleCompiler::make_fetch(BasicType type, klassOop tk, Bytecodes::Code op,
+                                 const MethodHandleWalker::ArgToken& base,
+                                 const MethodHandleWalker::ArgToken& offset,
+                                 TRAPS) {
+  Unimplemented();
+  return ArgToken();
+}
+
+
+int MethodHandleCompiler::cpool_primitive_put(BasicType bt, jvalue* con) {
+  jvalue con_copy;
+  assert(bt < T_OBJECT, "");
+  if (type2aelembytes(bt) < jintSize) {
+    // widen to int
+    con_copy = (*con);
+    con = &con_copy;
+    switch (bt) {
+    case T_BOOLEAN: con->i = (con->z ? 1 : 0); break;
+    case T_BYTE:    con->i = con->b;           break;
+    case T_CHAR:    con->i = con->c;           break;
+    case T_SHORT:   con->i = con->s;           break;
+    default: ShouldNotReachHere();
+    }
+    bt = T_INT;
+  }
+
+//   for (int i = 1, imax = _constants.length(); i < imax; i++) {
+//     ConstantValue* con = _constants.at(i);
+//     if (con != NULL && con->is_primitive() && con->_type == bt) {
+//       bool match = false;
+//       switch (type2size[bt]) {
+//       case 1:  if (pcon->_value.i == con->i)  match = true;  break;
+//       case 2:  if (pcon->_value.j == con->j)  match = true;  break;
+//       }
+//       if (match)
+//         return i;
+//     }
+//   }
+  ConstantValue* cv = new ConstantValue(bt, *con);
+  int index = _constants.append(cv);
+
+  // long and double entries take 2 slots, we add another empty entry.
+  if (type2size[bt] == 2)
+    (void) _constants.append(NULL);
+
+  return index;
+}
+
+
+constantPoolHandle MethodHandleCompiler::get_constant_pool(TRAPS) const {
+  constantPoolHandle nullHandle;
+  bool is_conc_safe = true;
+  constantPoolOop cpool_oop = oopFactory::new_constantPool(_constants.length(), is_conc_safe, CHECK_(nullHandle));
+  constantPoolHandle cpool(THREAD, cpool_oop);
+
+  // Fill the real constant pool skipping the zero element.
+  for (int i = 1; i < _constants.length(); i++) {
+    ConstantValue* cv = _constants.at(i);
+    switch (cv->tag()) {
+    case JVM_CONSTANT_Utf8:        cpool->symbol_at_put(       i, cv->symbol_oop()                     ); break;
+    case JVM_CONSTANT_Integer:     cpool->int_at_put(          i, cv->get_jint()                       ); break;
+    case JVM_CONSTANT_Float:       cpool->float_at_put(        i, cv->get_jfloat()                     ); break;
+    case JVM_CONSTANT_Long:        cpool->long_at_put(         i, cv->get_jlong()                      ); break;
+    case JVM_CONSTANT_Double:      cpool->double_at_put(       i, cv->get_jdouble()                    ); break;
+    case JVM_CONSTANT_Class:       cpool->klass_at_put(        i, cv->klass_oop()                      ); break;
+    case JVM_CONSTANT_Methodref:   cpool->method_at_put(       i, cv->first_index(), cv->second_index()); break;
+    case JVM_CONSTANT_NameAndType: cpool->name_and_type_at_put(i, cv->first_index(), cv->second_index()); break;
+    case JVM_CONSTANT_Object:      cpool->object_at_put(       i, cv->object_oop()                     ); break;
+    default: ShouldNotReachHere();
+    }
+
+    switch (cv->tag()) {
+    case JVM_CONSTANT_Long:
+    case JVM_CONSTANT_Double:
+      i++;  // Skip empty entry.
+      assert(_constants.at(i) == NULL, "empty entry");
+      break;
+    }
+  }
+
+  // Set the constant pool holder to the target method's class.
+  cpool->set_pool_holder(_target_klass());
+
+  return cpool;
+}
+
+
+methodHandle MethodHandleCompiler::get_method_oop(TRAPS) const {
+  methodHandle nullHandle;
+  // Create a method that holds the generated bytecode.  invokedynamic
+  // has no receiver, normal MH calls do.
+  int flags_bits;
+  if (for_invokedynamic())
+    flags_bits = (/*JVM_MH_INVOKE_BITS |*/ JVM_ACC_PUBLIC | JVM_ACC_FINAL | JVM_ACC_STATIC);
+  else
+    flags_bits = (/*JVM_MH_INVOKE_BITS |*/ JVM_ACC_PUBLIC | JVM_ACC_FINAL);
+
+  bool is_conc_safe = true;
+  methodOop m_oop = oopFactory::new_method(bytecode_length(),
+                                           accessFlags_from(flags_bits),
+                                           0, 0, 0, is_conc_safe, CHECK_(nullHandle));
+  methodHandle m(THREAD, m_oop);
+  m_oop = NULL;  // oop not GC safe
+
+  constantPoolHandle cpool = get_constant_pool(CHECK_(nullHandle));
+  m->set_constants(cpool());
+
+  m->set_name_index(_name_index);
+  m->set_signature_index(_signature_index);
+
+  m->set_code((address) bytecode());
+
+  m->set_max_stack(_max_stack);
+  m->set_max_locals(max_locals());
+  m->set_size_of_parameters(_num_params);
+
+  typeArrayHandle exception_handlers(THREAD, Universe::the_empty_int_array());
+  m->set_exception_table(exception_handlers());
+
+  // Set the carry bit of the invocation counter to force inlining of
+  // the adapter.
+  InvocationCounter* ic = m->invocation_counter();
+  ic->set_carry();
+
+  // Rewrite the method and set up the constant pool cache.
+  objArrayOop m_array = oopFactory::new_system_objArray(1, CHECK_(nullHandle));
+  objArrayHandle methods(THREAD, m_array);
+  methods->obj_at_put(0, m());
+  Rewriter::rewrite(_target_klass(), cpool, methods, CHECK_(nullHandle));  // Use fake class.
+
+#ifndef PRODUCT
+  if (TraceMethodHandles) {
+    m->print();
+    m->print_codes();
+  }
+#endif //PRODUCT
+
+  return m;
+}
+
+
+#ifndef PRODUCT
+
+#if 0
+// MH printer for debugging.
+
+class MethodHandlePrinter : public MethodHandleWalker {
+private:
+  outputStream* _out;
+  bool          _verbose;
+  int           _temp_num;
+  stringStream  _strbuf;
+  const char* strbuf() {
+    const char* s = _strbuf.as_string();
+    _strbuf.reset();
+    return s;
+  }
+  ArgToken token(const char* str) {
+    return (ArgToken) str;
+  }
+  void start_params() {
+    _out->print("(");
+  }
+  void end_params() {
+    if (_verbose)  _out->print("\n");
+    _out->print(") => {");
+  }
+  void put_type_name(BasicType type, klassOop tk, outputStream* s) {
+    const char* kname = NULL;
+    if (tk != NULL)
+      kname = Klass::cast(tk)->external_name();
+    s->print("%s", (kname != NULL) ? kname : type2name(type));
+  }
+  ArgToken maybe_make_temp(const char* statement_op, BasicType type, const char* temp_name) {
+    const char* value = strbuf();
+    if (!_verbose)  return token(value);
+    // make an explicit binding for each separate value
+    _strbuf.print("%s%d", temp_name, ++_temp_num);
+    const char* temp = strbuf();
+    _out->print("\n  %s %s %s = %s;", statement_op, type2name(type), temp, value);
+    return token(temp);
+  }
+
+public:
+  MethodHandlePrinter(Handle root, bool verbose, outputStream* out, TRAPS)
+    : MethodHandleWalker(root, THREAD),
+      _out(out),
+      _verbose(verbose),
+      _temp_num(0)
+  {
+    start_params();
+  }
+  virtual ArgToken make_parameter(BasicType type, klassOop tk, int argnum, TRAPS) {
+    if (argnum < 0) {
+      end_params();
+      return NULL;
+    }
+    if (argnum == 0) {
+      _out->print(_verbose ? "\n  " : "");
+    } else {
+      _out->print(_verbose ? ",\n  " : ", ");
+    }
+    if (argnum >= _temp_num)
+      _temp_num = argnum;
+    // generate an argument name
+    _strbuf.print("a%d", argnum);
+    const char* arg = strbuf();
+    put_type_name(type, tk, _out);
+    _out->print(" %s", arg);
+    return token(arg);
+  }
+  virtual ArgToken make_oop_constant(oop con, TRAPS) {
+    if (con == NULL)
+      _strbuf.print("null");
+    else
+      con->print_value_on(&_strbuf);
+    if (_strbuf.size() == 0) {  // yuck
+      _strbuf.print("(a ");
+      put_type_name(T_OBJECT, con->klass(), &_strbuf);
+      _strbuf.print(")");
+    }
+    return maybe_make_temp("constant", T_OBJECT, "k");
+  }
+  virtual ArgToken make_prim_constant(BasicType type, jvalue* con, TRAPS) {
+    java_lang_boxing_object::print(type, con, &_strbuf);
+    return maybe_make_temp("constant", type, "k");
+  }
+  virtual ArgToken make_conversion(BasicType type, klassOop tk, Bytecodes::Code op, ArgToken src, TRAPS) {
+    _strbuf.print("%s(%s", Bytecodes::name(op), (const char*)src);
+    if (tk != NULL) {
+      _strbuf.print(", ");
+      put_type_name(type, tk, &_strbuf);
+    }
+    _strbuf.print(")");
+    return maybe_make_temp("convert", type, "v");
+  }
+  virtual ArgToken make_fetch(BasicType type, klassOop tk, Bytecodes::Code op, ArgToken base, ArgToken offset, TRAPS) {
+    _strbuf.print("%s(%s, %s", Bytecodes::name(op), (const char*)base, (const char*)offset);
+    if (tk != NULL) {
+      _strbuf.print(", ");
+      put_type_name(type, tk, &_strbuf);
+    }
+    _strbuf.print(")");
+    return maybe_make_temp("fetch", type, "x");
+  }
+  virtual ArgToken make_invoke(methodOop m, vmIntrinsics::ID iid,
+                               Bytecodes::Code op, bool tailcall,
+                               int argc, ArgToken* argv, TRAPS) {
+    symbolOop name, sig;
+    if (m != NULL) {
+      name = m->name();
+      sig  = m->signature();
+    } else {
+      name = vmSymbols::symbol_at(vmIntrinsics::name_for(iid));
+      sig  = vmSymbols::symbol_at(vmIntrinsics::signature_for(iid));
+    }
+    _strbuf.print("%s %s%s(", Bytecodes::name(op), name->as_C_string(), sig->as_C_string());
+    for (int i = 0; i < argc; i++) {
+      _strbuf.print("%s%s", (i > 0 ? ", " : ""), (const char*)argv[i]);
+    }
+    _strbuf.print(")");
+    if (!tailcall) {
+      BasicType rt = char2type(sig->byte_at(sig->utf8_length()-1));
+      if (rt == T_ILLEGAL)  rt = T_OBJECT;  // ';' at the end of '(...)L...;'
+      return maybe_make_temp("invoke", rt, "x");
+    } else {
+      const char* ret = strbuf();
+      _out->print(_verbose ? "\n  return " : " ");
+      _out->print("%s", ret);
+      _out->print(_verbose ? "\n}\n" : " }");
+    }
+    return ArgToken();
+  }
+
+  virtual void set_method_handle(oop mh) {
+    if (WizardMode && Verbose) {
+      tty->print("\n--- next target: ");
+      mh->print();
+    }
+  }
+
+  static void print(Handle root, bool verbose, outputStream* out, TRAPS) {
+    ResourceMark rm;
+    MethodHandlePrinter printer(root, verbose, out, CHECK);
+    printer.walk(CHECK);
+    out->print("\n");
+  }
+  static void print(Handle root, bool verbose = Verbose, outputStream* out = tty) {
+    EXCEPTION_MARK;
+    ResourceMark rm;
+    MethodHandlePrinter printer(root, verbose, out, THREAD);
+    if (!HAS_PENDING_EXCEPTION)
+      printer.walk(THREAD);
+    if (HAS_PENDING_EXCEPTION) {
+      oop ex = PENDING_EXCEPTION;
+      CLEAR_PENDING_EXCEPTION;
+      out->print("\n*** ");
+      if (ex != Universe::virtual_machine_error_instance())
+        ex->print_on(out);
+      else
+        out->print("lose: %s", printer.lose_message());
+      out->print("\n}\n");
+    }
+    out->print("\n");
+  }
+};
+#endif // 0
+
+extern "C"
+void print_method_handle(oop mh) {
+  if (java_dyn_MethodHandle::is_instance(mh)) {
+    //MethodHandlePrinter::print(mh);
+  } else {
+    tty->print("*** not a method handle: ");
+    mh->print();
+  }
+}
+
+#endif // PRODUCT
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/methodHandleWalk.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/prims/methodHandleWalk.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,413 @@
+/*
+ * Copyright 2008-2010 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.
+ *
+ */
+
+// Low-level parser for method handle chains.
+class MethodHandleChain : StackObj {
+public:
+  typedef MethodHandles::EntryKind EntryKind;
+
+private:
+  Handle        _root;          // original target
+  Handle        _method_handle; // current target
+  bool          _is_last;       // final guy in chain
+  bool          _is_bound;      // has a bound argument
+  BasicType     _arg_type;      // if is_bound, the bound argument type
+  int           _arg_slot;      // if is_bound or is_adapter, affected argument slot
+  jint          _conversion;    // conversion field of AMH or -1
+  methodHandle  _last_method;   // if is_last, which method we target
+  Bytecodes::Code _last_invoke; // if is_last, type of invoke
+  const char*   _lose_message;  // saved argument to lose()
+
+  void set_method_handle(Handle target, TRAPS);
+  void set_last_method(oop target, TRAPS);
+  static BasicType compute_bound_arg_type(oop target, methodOop m, int arg_slot, TRAPS);
+
+  oop MethodHandle_type_oop()     { return java_dyn_MethodHandle::type(method_handle_oop()); }
+  oop MethodHandle_vmtarget_oop() { return java_dyn_MethodHandle::vmtarget(method_handle_oop()); }
+  int MethodHandle_vmslots()      { return java_dyn_MethodHandle::vmslots(method_handle_oop()); }
+  int DirectMethodHandle_vmindex()     { return sun_dyn_DirectMethodHandle::vmindex(method_handle_oop()); }
+  oop BoundMethodHandle_argument_oop() { return sun_dyn_BoundMethodHandle::argument(method_handle_oop()); }
+  int BoundMethodHandle_vmargslot()    { return sun_dyn_BoundMethodHandle::vmargslot(method_handle_oop()); }
+  int AdapterMethodHandle_conversion() { return sun_dyn_AdapterMethodHandle::conversion(method_handle_oop()); }
+
+public:
+  MethodHandleChain(Handle root, TRAPS)
+    : _root(root)
+  { set_method_handle(root, THREAD); }
+
+  bool is_adapter()             { return _conversion != -1; }
+  bool is_bound()               { return _is_bound; }
+  bool is_last()                { return _is_last; }
+
+  void next(TRAPS) {
+    assert(!is_last(), "");
+    set_method_handle(MethodHandle_vmtarget_oop(), THREAD);
+  }
+
+  Handle method_handle()        { return _method_handle; }
+  oop    method_handle_oop()    { return _method_handle(); }
+  oop    method_type_oop()      { return MethodHandle_type_oop(); }
+  oop    vmtarget_oop()         { return MethodHandle_vmtarget_oop(); }
+
+  jint adapter_conversion()     { assert(is_adapter(), ""); return _conversion; }
+  int  adapter_conversion_op()  { return MethodHandles::adapter_conversion_op(adapter_conversion()); }
+  BasicType adapter_conversion_src_type()
+                                { return MethodHandles::adapter_conversion_src_type(adapter_conversion()); }
+  BasicType adapter_conversion_dest_type()
+                                { return MethodHandles::adapter_conversion_dest_type(adapter_conversion()); }
+  int  adapter_conversion_stack_move()
+                                { return MethodHandles::adapter_conversion_stack_move(adapter_conversion()); }
+  int  adapter_conversion_stack_pushes()
+                                { return adapter_conversion_stack_move() / MethodHandles::stack_move_unit(); }
+  int  adapter_conversion_vminfo()
+                                { return MethodHandles::adapter_conversion_vminfo(adapter_conversion()); }
+  int adapter_arg_slot()        { assert(is_adapter(), ""); return _arg_slot; }
+  oop adapter_arg_oop()         { assert(is_adapter(), ""); return BoundMethodHandle_argument_oop(); }
+
+  BasicType bound_arg_type()    { assert(is_bound(), ""); return _arg_type; }
+  int       bound_arg_slot()    { assert(is_bound(), ""); return _arg_slot; }
+  oop       bound_arg_oop()     { assert(is_bound(), ""); return BoundMethodHandle_argument_oop(); }
+
+  methodOop last_method_oop()   { assert(is_last(), ""); return _last_method(); }
+  Bytecodes::Code last_invoke_code() { assert(is_last(), ""); return _last_invoke; }
+
+  void lose(const char* msg, TRAPS);
+  const char* lose_message()    { return _lose_message; }
+};
+
+
+// Structure walker for method handles.
+// Does abstract interpretation on top of low-level parsing.
+// You supply the tokens shuffled by the abstract interpretation.
+class MethodHandleWalker : StackObj {
+public:
+  // Stack values:
+  enum TokenType {
+    tt_void,
+    tt_parameter,
+    tt_temporary,
+    tt_constant,
+    tt_illegal
+  };
+
+  // Argument token:
+  class ArgToken {
+  private:
+    TokenType _tt;
+    BasicType _bt;
+    jvalue    _value;
+    Handle    _handle;
+
+  public:
+    ArgToken(TokenType tt = tt_illegal) : _tt(tt) {}
+    ArgToken(TokenType tt, BasicType bt, jvalue value) : _tt(tt), _bt(bt), _value(value) {}
+
+    ArgToken(TokenType tt, BasicType bt, int index) : _tt(tt), _bt(bt) {
+      _value.i = index;
+    }
+
+    ArgToken(TokenType tt, BasicType bt, Handle value) : _tt(tt), _bt(bt) {
+      _handle = value;
+    }
+
+    TokenType token_type()  const { return _tt; }
+    BasicType basic_type()  const { return _bt; }
+    int       index()       const { return _value.i; }
+    Handle    object()      const { return _handle; }
+
+    jint      get_jint()    const { return _value.i; }
+    jlong     get_jlong()   const { return _value.j; }
+    jfloat    get_jfloat()  const { return _value.f; }
+    jdouble   get_jdouble() const { return _value.d; }
+  };
+
+  // Abstract interpretation state:
+  struct SlotState {
+    BasicType _type;
+    ArgToken  _arg;
+    SlotState() : _type(), _arg() {}
+  };
+  static SlotState make_state(BasicType type, ArgToken arg) {
+    SlotState ss;
+    ss._type = type; ss._arg = arg;
+    return ss;
+  }
+
+private:
+  MethodHandleChain _chain;
+  bool              _for_invokedynamic;
+  int               _local_index;
+
+  GrowableArray<SlotState> _outgoing;       // current outgoing parameter slots
+  int                      _outgoing_argc;  // # non-empty outgoing slots
+
+  // Replace a value of type old_type at slot (and maybe slot+1) with the new value.
+  // If old_type != T_VOID, remove the old argument at that point.
+  // If new_type != T_VOID, insert the new argument at that point.
+  // Insert or delete a second empty slot as needed.
+  void change_argument(BasicType old_type, int slot, BasicType new_type, const ArgToken& new_arg);
+
+  SlotState* slot_state(int slot) {
+    if (slot < 0 || slot >= _outgoing.length())
+      return NULL;
+    return _outgoing.adr_at(slot);
+  }
+  BasicType slot_type(int slot) {
+    SlotState* ss = slot_state(slot);
+    if (ss == NULL)
+      return T_ILLEGAL;
+    return ss->_type;
+  }
+  bool slot_has_argument(int slot) {
+    return slot_type(slot) < T_VOID;
+  }
+
+#ifdef ASSERT
+  int argument_count_slow();
+#endif
+
+  // Return a bytecode for converting src to dest, if one exists.
+  Bytecodes::Code conversion_code(BasicType src, BasicType dest);
+
+  void walk_incoming_state(TRAPS);
+
+public:
+  MethodHandleWalker(Handle root, bool for_invokedynamic, TRAPS)
+    : _chain(root, THREAD),
+      _for_invokedynamic(for_invokedynamic),
+      _outgoing(THREAD, 10),
+      _outgoing_argc(0)
+  {
+    _local_index = for_invokedynamic ? 0 : 1;
+  }
+
+  MethodHandleChain& chain() { return _chain; }
+
+  bool for_invokedynamic() const { return _for_invokedynamic; }
+
+  int new_local_index(BasicType bt) {
+    //int index = _for_invokedynamic ? _local_index : _local_index - 1;
+    int index = _local_index;
+    _local_index += type2size[bt];
+    return index;
+  }
+
+  int max_locals() const { return _local_index; }
+
+  // plug-in abstract interpretation steps:
+  virtual ArgToken make_parameter( BasicType type, klassOop tk, int argnum, TRAPS ) = 0;
+  virtual ArgToken make_prim_constant( BasicType type, jvalue* con, TRAPS ) = 0;
+  virtual ArgToken make_oop_constant( oop con, TRAPS ) = 0;
+  virtual ArgToken make_conversion( BasicType type, klassOop tk, Bytecodes::Code op, const ArgToken& src, TRAPS ) = 0;
+  virtual ArgToken make_fetch( BasicType type, klassOop tk, Bytecodes::Code op, const ArgToken& base, const ArgToken& offset, TRAPS ) = 0;
+  virtual ArgToken make_invoke( methodOop m, vmIntrinsics::ID iid, Bytecodes::Code op, bool tailcall, int argc, ArgToken* argv, TRAPS ) = 0;
+
+  // For make_invoke, the methodOop can be NULL if the intrinsic ID
+  // is something other than vmIntrinsics::_none.
+
+  // and in case anyone cares to related the previous actions to the chain:
+  virtual void set_method_handle(oop mh) { }
+
+  void lose(const char* msg, TRAPS) { chain().lose(msg, THREAD); }
+  const char* lose_message()        { return chain().lose_message(); }
+
+  ArgToken walk(TRAPS);
+};
+
+
+// An abstract interpreter for method handle chains.
+// Produces an account of the semantics of a chain, in terms of a static IR.
+// The IR happens to be JVM bytecodes.
+class MethodHandleCompiler : public MethodHandleWalker {
+private:
+  methodHandle _callee;
+  KlassHandle  _rklass;        // Return type for casting.
+  BasicType    _rtype;
+  KlassHandle  _target_klass;
+  Thread*      _thread;
+
+  // Fake constant pool entry.
+  class ConstantValue {
+  private:
+    int       _tag;   // Constant pool tag type.
+    JavaValue _value;
+    Handle    _handle;
+
+  public:
+    // Constructor for oop types.
+    ConstantValue(int tag, Handle con) : _tag(tag), _handle(con) {
+      assert(tag == JVM_CONSTANT_Utf8   ||
+             tag == JVM_CONSTANT_Class  ||
+             tag == JVM_CONSTANT_String ||
+             tag == JVM_CONSTANT_Object, "must be oop type");
+    }
+
+    // Constructor for oop reference types.
+    ConstantValue(int tag, int index) : _tag(tag) {
+      assert(JVM_CONSTANT_Fieldref <= tag && tag <= JVM_CONSTANT_NameAndType, "must be ref type");
+      _value.set_jint(index);
+    }
+    ConstantValue(int tag, int first_index, int second_index) : _tag(tag) {
+      assert(JVM_CONSTANT_Fieldref <= tag && tag <= JVM_CONSTANT_NameAndType, "must be ref type");
+      _value.set_jint(first_index << 16 | second_index);
+    }
+
+    // Constructor for primitive types.
+    ConstantValue(BasicType bt, jvalue con) {
+      _value.set_type(bt);
+      switch (bt) {
+      case T_INT:    _tag = JVM_CONSTANT_Integer; _value.set_jint(   con.i); break;
+      case T_LONG:   _tag = JVM_CONSTANT_Long;    _value.set_jlong(  con.j); break;
+      case T_FLOAT:  _tag = JVM_CONSTANT_Float;   _value.set_jfloat( con.f); break;
+      case T_DOUBLE: _tag = JVM_CONSTANT_Double;  _value.set_jdouble(con.d); break;
+      default: ShouldNotReachHere();
+      }
+    }
+
+    int       tag()          const { return _tag; }
+    symbolOop symbol_oop()   const { return (symbolOop) _handle(); }
+    klassOop  klass_oop()    const { return (klassOop)  _handle(); }
+    oop       object_oop()   const { return _handle(); }
+    int       index()        const { return _value.get_jint(); }
+    int       first_index()  const { return _value.get_jint() >> 16; }
+    int       second_index() const { return _value.get_jint() & 0x0000FFFF; }
+
+    bool      is_primitive() const { return is_java_primitive(_value.get_type()); }
+    jint      get_jint()     const { return _value.get_jint();    }
+    jlong     get_jlong()    const { return _value.get_jlong();   }
+    jfloat    get_jfloat()   const { return _value.get_jfloat();  }
+    jdouble   get_jdouble()  const { return _value.get_jdouble(); }
+  };
+
+  // Fake constant pool.
+  GrowableArray<ConstantValue*> _constants;
+
+  // Accumulated compiler state:
+  GrowableArray<unsigned char> _bytecode;
+
+  int _cur_stack;
+  int _max_stack;
+  int _num_params;
+  int _name_index;
+  int _signature_index;
+
+  void stack_push(BasicType bt) {
+    _cur_stack += type2size[bt];
+    if (_cur_stack > _max_stack) _max_stack = _cur_stack;
+  }
+  void stack_pop(BasicType bt) {
+    _cur_stack -= type2size[bt];
+    assert(_cur_stack >= 0, "sanity");
+  }
+
+  unsigned char* bytecode()        const { return _bytecode.adr_at(0); }
+  int            bytecode_length() const { return _bytecode.length(); }
+
+  // Fake constant pool.
+  int cpool_oop_put(int tag, Handle con) {
+    if (con.is_null())  return 0;
+    ConstantValue* cv = new ConstantValue(tag, con);
+    return _constants.append(cv);
+  }
+
+  int cpool_oop_reference_put(int tag, int first_index, int second_index) {
+    if (first_index == 0 && second_index == 0)  return 0;
+    assert(first_index != 0 && second_index != 0, "no zero indexes");
+    ConstantValue* cv = new ConstantValue(tag, first_index, second_index);
+    return _constants.append(cv);
+  }
+
+  int cpool_primitive_put(BasicType type, jvalue* con);
+
+  int cpool_int_put(jint value) {
+    jvalue con; con.i = value;
+    return cpool_primitive_put(T_INT, &con);
+  }
+  int cpool_long_put(jlong value) {
+    jvalue con; con.j = value;
+    return cpool_primitive_put(T_LONG, &con);
+  }
+  int cpool_float_put(jfloat value) {
+    jvalue con; con.f = value;
+    return cpool_primitive_put(T_FLOAT, &con);
+  }
+  int cpool_double_put(jdouble value) {
+    jvalue con; con.d = value;
+    return cpool_primitive_put(T_DOUBLE, &con);
+  }
+
+  int cpool_object_put(Handle obj) {
+    return cpool_oop_put(JVM_CONSTANT_Object, obj);
+  }
+  int cpool_symbol_put(symbolOop sym) {
+    return cpool_oop_put(JVM_CONSTANT_Utf8, sym);
+  }
+  int cpool_klass_put(klassOop klass) {
+    return cpool_oop_put(JVM_CONSTANT_Class, klass);
+  }
+  int cpool_methodref_put(int class_index, int name_and_type_index) {
+    return cpool_oop_reference_put(JVM_CONSTANT_Methodref, class_index, name_and_type_index);
+  }
+  int cpool_name_and_type_put(int name_index, int signature_index) {
+    return cpool_oop_reference_put(JVM_CONSTANT_NameAndType, name_index, signature_index);
+  }
+
+  void emit_bc(Bytecodes::Code op, int index = 0);
+  void emit_load(BasicType bt, int index);
+  void emit_store(BasicType bt, int index);
+  void emit_load_constant(ArgToken arg);
+
+  virtual ArgToken make_parameter(BasicType type, klassOop tk, int argnum, TRAPS) {
+    return ArgToken(tt_parameter, type, argnum);
+  }
+  virtual ArgToken make_oop_constant(oop con, TRAPS) {
+    Handle h(THREAD, con);
+    return ArgToken(tt_constant, T_OBJECT, h);
+  }
+  virtual ArgToken make_prim_constant(BasicType type, jvalue* con, TRAPS) {
+    return ArgToken(tt_constant, type, *con);
+  }
+
+  virtual ArgToken make_conversion(BasicType type, klassOop tk, Bytecodes::Code op, const ArgToken& src, TRAPS);
+  virtual ArgToken make_fetch(BasicType type, klassOop tk, Bytecodes::Code op, const ArgToken& base, const ArgToken& offset, TRAPS);
+  virtual ArgToken make_invoke(methodOop m, vmIntrinsics::ID iid, Bytecodes::Code op, bool tailcall, int argc, ArgToken* argv, TRAPS);
+
+  // Get a real constant pool.
+  constantPoolHandle get_constant_pool(TRAPS) const;
+
+  // Get a real methodOop.
+  methodHandle get_method_oop(TRAPS) const;
+
+public:
+  MethodHandleCompiler(Handle root, methodHandle call_method, bool for_invokedynamic, TRAPS);
+
+  // Compile the given MH chain into bytecode.
+  methodHandle compile(TRAPS);
+
+  // Tests if the given class is a MH adapter holder.
+  static bool klass_is_method_handle_adapter_holder(klassOop klass) {
+    return (klass == SystemDictionary::MethodHandle_klass() ||
+            klass == SystemDictionary::InvokeDynamic_klass());
+  }
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/methodHandles.cpp
--- a/src/share/vm/prims/methodHandles.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/methodHandles.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -33,8 +33,7 @@
 
 MethodHandleEntry* MethodHandles::_entries[MethodHandles::_EK_LIMIT] = {NULL};
 const char*        MethodHandles::_entry_names[_EK_LIMIT+1] = {
-  "check_mtype",
-  "wrong_method_type",          // what happens when there is a type mismatch
+  "raise_exception",
   "invokestatic",               // how a MH emulates invokestatic
   "invokespecial",              // ditto for the other invokes...
   "invokevirtual",
@@ -48,6 +47,7 @@
 
   // starting at _adapter_mh_first:
   "adapter_retype_only",       // these are for AMH...
+  "adapter_retype_raw",
   "adapter_check_cast",
   "adapter_prim_to_prim",
   "adapter_ref_to_prim",
@@ -82,6 +82,8 @@
   NULL
 };
 
+jobject MethodHandles::_raise_exception_method;
+
 #ifdef ASSERT
 bool MethodHandles::spot_check_entry_names() {
   assert(!strcmp(entry_name(_invokestatic_mh), "invokestatic"), "");
@@ -130,8 +132,9 @@
     }
     return m;
   } else {
+    assert(vmtarget->is_klass(), "must be class or interface");
     decode_flags_result |= MethodHandles::_dmf_does_dispatch;
-    assert(vmtarget->is_klass(), "must be class or interface");
+    decode_flags_result |= MethodHandles::_dmf_has_receiver;
     receiver_limit_result = (klassOop)vmtarget;
     Klass* tk = Klass::cast((klassOop)vmtarget);
     if (tk->is_interface()) {
@@ -140,7 +143,7 @@
       return klassItable::method_for_itable_index((klassOop)vmtarget, vmindex);
     } else {
       if (!tk->oop_is_instance())
-        tk = instanceKlass::cast(SystemDictionary::object_klass());
+        tk = instanceKlass::cast(SystemDictionary::Object_klass());
       return ((instanceKlass*)tk)->method_at_vtable(vmindex);
     }
   }
@@ -157,7 +160,8 @@
 }
 
 methodOop MethodHandles::decode_BoundMethodHandle(oop mh, klassOop& receiver_limit_result, int& decode_flags_result) {
-  assert(mh->klass() == SystemDictionary::BoundMethodHandle_klass(), "");
+  assert(sun_dyn_BoundMethodHandle::is_instance(mh), "");
+  assert(mh->klass() != SystemDictionary::AdapterMethodHandle_klass(), "");
   for (oop bmh = mh;;) {
     // Bound MHs can be stacked to bind several arguments.
     oop target = java_dyn_MethodHandle::vmtarget(bmh);
@@ -174,11 +178,12 @@
       } else {
         // Optimized case:  binding a receiver to a non-dispatched DMH
         // short-circuits directly to the methodOop.
+        // (It might be another argument besides a receiver also.)
         assert(target->is_method(), "must be a simple method");
+        decode_flags_result |= MethodHandles::_dmf_binds_method;
         methodOop m = (methodOop) target;
-        DEBUG_ONLY(int argslot = sun_dyn_BoundMethodHandle::vmargslot(bmh));
-        assert(argslot == m->size_of_parameters() - 1, "must be initial argument (receiver)");
-        decode_flags_result |= MethodHandles::_dmf_binds_method;
+        if (!m->is_static())
+          decode_flags_result |= MethodHandles::_dmf_has_receiver;
         return m;
       }
     }
@@ -214,6 +219,9 @@
     return decode_BoundMethodHandle(mh, receiver_limit_result, decode_flags_result);
   } else if (mhk == SystemDictionary::AdapterMethodHandle_klass()) {
     return decode_AdapterMethodHandle(mh, receiver_limit_result, decode_flags_result);
+  } else if (sun_dyn_BoundMethodHandle::is_subclass(mhk)) {
+    // could be a JavaMethodHandle (but not an adapter MH)
+    return decode_BoundMethodHandle(mh, receiver_limit_result, decode_flags_result);
   } else {
     assert(false, "cannot parse this MH");
     return NULL;              // random MH?
@@ -228,8 +236,8 @@
     BasicType recv_bt = char2type(sig->byte_at(1));
     // Note: recv_bt might be T_ILLEGAL if byte_at(2) is ')'
     assert(sig->byte_at(0) == '(', "must be method sig");
-    if (recv_bt == T_OBJECT || recv_bt == T_ARRAY)
-      decode_flags_result |= _dmf_has_receiver;
+//     if (recv_bt == T_OBJECT || recv_bt == T_ARRAY)
+//       decode_flags_result |= _dmf_has_receiver;
   } else {
     // non-static method
     decode_flags_result |= _dmf_has_receiver;
@@ -256,14 +264,14 @@
     return decode_MemberName(x, receiver_limit_result, decode_flags_result);
   } else if (java_dyn_MethodHandle::is_subclass(xk)) {
     return decode_MethodHandle(x, receiver_limit_result, decode_flags_result);
-  } else if (xk == SystemDictionary::reflect_method_klass()) {
+  } else if (xk == SystemDictionary::reflect_Method_klass()) {
     oop clazz  = java_lang_reflect_Method::clazz(x);
     int slot   = java_lang_reflect_Method::slot(x);
     klassOop k = java_lang_Class::as_klassOop(clazz);
     if (k != NULL && Klass::cast(k)->oop_is_instance())
       return decode_methodOop(instanceKlass::cast(k)->method_with_idnum(slot),
                               decode_flags_result);
-  } else if (xk == SystemDictionary::reflect_constructor_klass()) {
+  } else if (xk == SystemDictionary::reflect_Constructor_klass()) {
     oop clazz  = java_lang_reflect_Constructor::clazz(x);
     int slot   = java_lang_reflect_Constructor::slot(x);
     klassOop k = java_lang_Class::as_klassOop(clazz);
@@ -320,7 +328,7 @@
 };
 
 void MethodHandles::init_MemberName(oop mname_oop, oop target_oop) {
-  if (target_oop->klass() == SystemDictionary::reflect_field_klass()) {
+  if (target_oop->klass() == SystemDictionary::reflect_Field_klass()) {
     oop clazz = java_lang_reflect_Field::clazz(target_oop); // fd.field_holder()
     int slot  = java_lang_reflect_Field::slot(target_oop);  // fd.index()
     int mods  = java_lang_reflect_Field::modifiers(target_oop);
@@ -366,7 +374,13 @@
   oop vmtarget = sun_dyn_MemberName::vmtarget(mname);
   int vmindex  = sun_dyn_MemberName::vmindex(mname);
   if (vmindex == VM_INDEX_UNINITIALIZED)  return NULL; // not resolved
-  return decode_vmtarget(vmtarget, vmindex, NULL, receiver_limit_result, decode_flags_result);
+  methodOop m = decode_vmtarget(vmtarget, vmindex, NULL, receiver_limit_result, decode_flags_result);
+  oop clazz = sun_dyn_MemberName::clazz(mname);
+  if (clazz != NULL && java_lang_Class::is_instance(clazz)) {
+    klassOop klass = java_lang_Class::as_klassOop(clazz);
+    if (klass != NULL)  receiver_limit_result = klass;
+  }
+  return m;
 }
 
 // An unresolved member name is a mere symbolic reference.
@@ -399,7 +413,7 @@
   if (defc_klassOop == NULL)  return;  // a primitive; no resolution possible
   if (!Klass::cast(defc_klassOop)->oop_is_instance()) {
     if (!Klass::cast(defc_klassOop)->oop_is_array())  return;
-    defc_klassOop = SystemDictionary::object_klass();
+    defc_klassOop = SystemDictionary::Object_klass();
   }
   instanceKlassHandle defc(THREAD, defc_klassOop);
   defc_klassOop = NULL;  // safety
@@ -735,7 +749,7 @@
       return NULL;                // unformed MH
     }
     klassOop tklass = target->klass();
-    if (Klass::cast(tklass)->is_subclass_of(SystemDictionary::object_klass())) {
+    if (Klass::cast(tklass)->is_subclass_of(SystemDictionary::Object_klass())) {
       return target;              // target is another MH (or something else?)
     }
   }
@@ -789,34 +803,70 @@
   THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), msg);
 }
 
+static const char* always_null_names[] = {
+  "java/lang/Void",
+  "java/lang/Null",
+  //"java/lang/Nothing",
+  "sun/dyn/empty/Empty",
+  NULL
+};
+
+static bool is_always_null_type(klassOop klass) {
+  if (!Klass::cast(klass)->oop_is_instance())  return false;
+  instanceKlass* ik = instanceKlass::cast(klass);
+  // Must be on the boot class path:
+  if (ik->class_loader() != NULL)  return false;
+  // Check the name.
+  symbolOop name = ik->name();
+  for (int i = 0; ; i++) {
+    const char* test_name = always_null_names[i];
+    if (test_name == NULL)  break;
+    if (name->equals(test_name))
+      return true;
+  }
+  return false;
+}
+
 bool MethodHandles::class_cast_needed(klassOop src, klassOop dst) {
-  if (src == dst || dst == SystemDictionary::object_klass())
+  if (src == dst || dst == SystemDictionary::Object_klass())
     return false;                               // quickest checks
   Klass* srck = Klass::cast(src);
   Klass* dstk = Klass::cast(dst);
   if (dstk->is_interface()) {
     // interface receivers can safely be viewed as untyped,
     // because interface calls always include a dynamic check
-    //dstk = Klass::cast(SystemDictionary::object_klass());
+    //dstk = Klass::cast(SystemDictionary::Object_klass());
     return false;
   }
   if (srck->is_interface()) {
     // interface arguments must be viewed as untyped
-    //srck = Klass::cast(SystemDictionary::object_klass());
+    //srck = Klass::cast(SystemDictionary::Object_klass());
     return true;
   }
+  if (is_always_null_type(src)) {
+    // some source types are known to be never instantiated;
+    // they represent references which are always null
+    // such null references never fail to convert safely
+    return false;
+  }
   return !srck->is_subclass_of(dstk->as_klassOop());
 }
 
 static oop object_java_mirror() {
-  return Klass::cast(SystemDictionary::object_klass())->java_mirror();
+  return Klass::cast(SystemDictionary::Object_klass())->java_mirror();
 }
 
 bool MethodHandles::same_basic_type_for_arguments(BasicType src,
                                                   BasicType dst,
+                                                  bool raw,
                                                   bool for_return) {
-  // return values can always be forgotten:
-  if (for_return && dst == T_VOID)  return true;
+  if (for_return) {
+    // return values can always be forgotten:
+    if (dst == T_VOID)  return true;
+    if (src == T_VOID)  return raw && (dst == T_INT);
+    // We allow caller to receive a garbage int, which is harmless.
+    // This trick is pulled by trusted code (see VerifyType.canPassRaw).
+  }
   assert(src != T_VOID && dst != T_VOID, "should not be here");
   if (src == dst)  return true;
   if (type2size[src] != type2size[dst])  return false;
@@ -929,8 +979,8 @@
   const char* err = NULL;
 
   int first_ptype_pos = m_needs_receiver ? 1 : 0;
-  if (has_bound_recv && err == NULL) {
-    first_ptype_pos -= 1;
+  if (has_bound_recv) {
+    first_ptype_pos -= 1;  // ptypes do not include the bound argument; start earlier in them
     if (m_needs_receiver && bound_recv_type.is_null())
       { err = "bound receiver is not an object"; goto die; }
   }
@@ -939,10 +989,10 @@
     objArrayOop ptypes = java_dyn_MethodType::ptypes(mtype());
     if (ptypes->length() < first_ptype_pos)
       { err = "receiver argument is missing"; goto die; }
-    if (first_ptype_pos == -1)
+    if (has_bound_recv)
       err = check_method_receiver(m(), bound_recv_type->as_klassOop());
     else
-      err = check_method_receiver(m(), java_lang_Class::as_klassOop(ptypes->obj_at(0)));
+      err = check_method_receiver(m(), java_lang_Class::as_klassOop(ptypes->obj_at(first_ptype_pos-1)));
     if (err != NULL)  goto die;
   }
 
@@ -983,7 +1033,8 @@
                                                     int insert_argnum, oop insert_type,
                                                     int change_argnum, oop change_type,
                                                     int delete_argnum,
-                                                    oop dst_mtype, int dst_beg, int dst_end) {
+                                                    oop dst_mtype, int dst_beg, int dst_end,
+                                                    bool raw) {
   objArrayOop src_ptypes = java_dyn_MethodType::ptypes(src_mtype);
   objArrayOop dst_ptypes = java_dyn_MethodType::ptypes(dst_mtype);
 
@@ -1042,7 +1093,7 @@
     if (src_type != dst_type) {
       if (src_type == NULL)  return "not enough arguments";
       if (dst_type == NULL)  return "too many arguments";
-      err = check_argument_type_change(src_type, dst_type, dst_idx);
+      err = check_argument_type_change(src_type, dst_type, dst_idx, raw);
       if (err != NULL)  return err;
     }
   }
@@ -1051,7 +1102,7 @@
   oop src_rtype = java_dyn_MethodType::rtype(src_mtype);
   oop dst_rtype = java_dyn_MethodType::rtype(dst_mtype);
   if (src_rtype != dst_rtype) {
-    err = check_return_type_change(dst_rtype, src_rtype); // note reversal!
+    err = check_return_type_change(dst_rtype, src_rtype, raw); // note reversal!
     if (err != NULL)  return err;
   }
 
@@ -1061,38 +1112,45 @@
 
 
 const char* MethodHandles::check_argument_type_change(BasicType src_type,
-                                                     klassOop src_klass,
-                                                     BasicType dst_type,
-                                                     klassOop dst_klass,
-                                                     int argnum) {
+                                                      klassOop src_klass,
+                                                      BasicType dst_type,
+                                                      klassOop dst_klass,
+                                                      int argnum,
+                                                      bool raw) {
   const char* err = NULL;
+  bool for_return = (argnum < 0);
 
   // just in case:
   if (src_type == T_ARRAY)  src_type = T_OBJECT;
   if (dst_type == T_ARRAY)  dst_type = T_OBJECT;
 
   // Produce some nice messages if VerifyMethodHandles is turned on:
-  if (!same_basic_type_for_arguments(src_type, dst_type, (argnum < 0))) {
+  if (!same_basic_type_for_arguments(src_type, dst_type, raw, for_return)) {
     if (src_type == T_OBJECT) {
+      if (raw && dst_type == T_INT && is_always_null_type(src_klass))
+        return NULL;    // OK to convert a null pointer to a garbage int
       err = ((argnum >= 0)
              ? "type mismatch: passing a %s for method argument #%d, which expects primitive %s"
              : "type mismatch: returning a %s, but caller expects primitive %s");
     } else if (dst_type == T_OBJECT) {
-      err = ((argnum < 0)
+      err = ((argnum >= 0)
              ? "type mismatch: passing a primitive %s for method argument #%d, which expects %s"
              : "type mismatch: returning a primitive %s, but caller expects %s");
     } else {
-      err = ((argnum < 0)
+      err = ((argnum >= 0)
              ? "type mismatch: passing a %s for method argument #%d, which expects %s"
              : "type mismatch: returning a %s, but caller expects %s");
     }
-  } else if (src_type == T_OBJECT && class_cast_needed(src_klass, dst_klass)) {
+  } else if (src_type == T_OBJECT && dst_type == T_OBJECT &&
+             class_cast_needed(src_klass, dst_klass)) {
     if (!class_cast_needed(dst_klass, src_klass)) {
-      err = ((argnum < 0)
+      if (raw)
+        return NULL;    // reverse cast is OK; the MH target is trusted to enforce it
+      err = ((argnum >= 0)
              ? "cast required: passing a %s for method argument #%d, which expects %s"
              : "cast required: returning a %s, but caller expects %s");
     } else {
-      err = ((argnum < 0)
+      err = ((argnum >= 0)
              ? "reference mismatch: passing a %s for method argument #%d, which expects %s"
              : "reference mismatch: returning a %s, but caller expects %s");
     }
@@ -1391,7 +1449,7 @@
       break;
     }
     // check subrange of Integer.value, if necessary
-    if (argument == NULL || argument->klass() != SystemDictionary::int_klass()) {
+    if (argument == NULL || argument->klass() != SystemDictionary::Integer_klass()) {
       err = "bound integer argument must be of type java.lang.Integer";
       break;
     }
@@ -1414,7 +1472,7 @@
       BasicType argbox = java_lang_boxing_object::basic_type(argument);
       if (argbox != ptype) {
         err = check_argument_type_change(T_OBJECT, (argument == NULL
-                                                    ? SystemDictionary::object_klass()
+                                                    ? SystemDictionary::Object_klass()
                                                     : argument->klass()),
                                          ptype, ptype_klass(), argnum);
         assert(err != NULL, "this must be an error");
@@ -1429,11 +1487,12 @@
       assert(this_pushes == slots_pushed, "BMH pushes one or two stack slots");
       assert(slots_pushed <= MethodHandlePushLimit, "");
     } else {
-      int prev_pushes = decode_MethodHandle_stack_pushes(target());
-      assert(this_pushes == slots_pushed + prev_pushes, "BMH stack motion must be correct");
+      int target_pushes = decode_MethodHandle_stack_pushes(target());
+      assert(this_pushes == slots_pushed + target_pushes, "BMH stack motion must be correct");
       // do not blow the stack; use a Java-based adapter if this limit is exceeded
-      if (slots_pushed + prev_pushes > MethodHandlePushLimit)
-        err = "too many bound parameters";
+      // FIXME
+      // if (slots_pushed + target_pushes > MethodHandlePushLimit)
+      //   err = "too many bound parameters";
     }
   }
 
@@ -1463,6 +1522,11 @@
     verify_vmslots(mh, CHECK);
   }
 
+  // Get bound type and required slots.
+  oop ptype_oop = java_dyn_MethodType::ptype(java_dyn_MethodHandle::type(target()), argnum);
+  BasicType ptype = java_lang_Class::as_BasicType(ptype_oop);
+  int slots_pushed = type2size[ptype];
+
   // If (a) the target is a direct non-dispatched method handle,
   // or (b) the target is a dispatched direct method handle and we
   // are binding the receiver, cut out the middle-man.
@@ -1474,7 +1538,7 @@
     int decode_flags = 0; klassOop receiver_limit_oop = NULL;
     methodHandle m(THREAD, decode_method(target(), receiver_limit_oop, decode_flags));
     if (m.is_null()) { THROW_MSG(vmSymbols::java_lang_InternalError(), "DMH failed to decode"); }
-    DEBUG_ONLY(int m_vmslots = m->size_of_parameters() - 1); // pos. of 1st arg.
+    DEBUG_ONLY(int m_vmslots = m->size_of_parameters() - slots_pushed); // pos. of 1st arg.
     assert(sun_dyn_BoundMethodHandle::vmslots(mh()) == m_vmslots, "type w/ m sig");
     if (argnum == 0 && (decode_flags & _dmf_has_receiver) != 0) {
       KlassHandle receiver_limit(THREAD, receiver_limit_oop);
@@ -1499,10 +1563,6 @@
   }
 
   // Next question:  Is this a ref, int, or long bound value?
-  oop ptype_oop = java_dyn_MethodType::ptype(java_dyn_MethodHandle::type(target()), argnum);
-  BasicType ptype = java_lang_Class::as_BasicType(ptype_oop);
-  int slots_pushed = type2size[ptype];
-
   MethodHandleEntry* me = NULL;
   if (ptype == T_OBJECT) {
     if (direct_to_method)  me = MethodHandles::entry(_bound_ref_direct_mh);
@@ -1588,6 +1648,11 @@
   if (err == NULL) {
     // Check that the src/dest types are supplied if needed.
     switch (ek) {
+    case _adapter_check_cast:
+      if (src != T_OBJECT || dest != T_OBJECT) {
+        err = "adapter requires object src/dest conversion subfields";
+      }
+      break;
     case _adapter_prim_to_prim:
       if (!is_java_primitive(src) || !is_java_primitive(dest) || src == dest) {
         err = "adapter requires primitive src/dest conversion subfields"; break;
@@ -1616,9 +1681,9 @@
           err = "adapter requires src/dest conversion subfields for swap"; break;
         }
         int swap_size = type2size[src];
-        oop src_mtype  = sun_dyn_AdapterMethodHandle::type(target());
-        oop dest_mtype = sun_dyn_AdapterMethodHandle::type(mh());
-        int slot_limit = sun_dyn_AdapterMethodHandle::vmslots(src_mtype);
+        oop src_mtype  = sun_dyn_AdapterMethodHandle::type(mh());
+        oop dest_mtype = sun_dyn_AdapterMethodHandle::type(target());
+        int slot_limit = sun_dyn_AdapterMethodHandle::vmslots(target());
         int src_slot   = argslot;
         int dest_slot  = vminfo;
         bool rotate_up = (src_slot > dest_slot); // upward rotation
@@ -1729,22 +1794,22 @@
     // Make sure this adapter does not push too deeply.
     int slots_pushed = stack_move / stack_move_unit();
     int this_vmslots = java_dyn_MethodHandle::vmslots(mh());
-    int prev_vmslots = java_dyn_MethodHandle::vmslots(target());
-    if (slots_pushed != (this_vmslots - prev_vmslots)) {
+    int target_vmslots = java_dyn_MethodHandle::vmslots(target());
+    if (slots_pushed != (target_vmslots - this_vmslots)) {
       err = "stack_move inconsistent with previous and current MethodType vmslots";
     } else if (slots_pushed > 0)  {
       // verify stack_move against MethodHandlePushLimit
-      int prev_pushes = decode_MethodHandle_stack_pushes(target());
+      int target_pushes = decode_MethodHandle_stack_pushes(target());
       // do not blow the stack; use a Java-based adapter if this limit is exceeded
-      if (slots_pushed + prev_pushes > MethodHandlePushLimit) {
+      if (slots_pushed + target_pushes > MethodHandlePushLimit) {
         err = "adapter pushes too many parameters";
       }
     }
 
     // While we're at it, check that the stack motion decoder works:
-    DEBUG_ONLY(int prev_pushes = decode_MethodHandle_stack_pushes(target()));
+    DEBUG_ONLY(int target_pushes = decode_MethodHandle_stack_pushes(target()));
     DEBUG_ONLY(int this_pushes = decode_MethodHandle_stack_pushes(mh()));
-    assert(this_pushes == slots_pushed + prev_pushes, "AMH stack motion must be correct");
+    assert(this_pushes == slots_pushed + target_pushes, "AMH stack motion must be correct");
   }
 
   if (err == NULL && vminfo != 0) {
@@ -1761,7 +1826,11 @@
   if (err == NULL) {
     switch (ek) {
     case _adapter_retype_only:
-      err = check_method_type_passthrough(src_mtype(), dst_mtype());
+      err = check_method_type_passthrough(src_mtype(), dst_mtype(), false);
+      break;
+
+    case _adapter_retype_raw:
+      err = check_method_type_passthrough(src_mtype(), dst_mtype(), true);
       break;
 
     case _adapter_check_cast:
@@ -1821,6 +1890,7 @@
   // Now it's time to finish the case analysis and pick a MethodHandleEntry.
   switch (ek_orig) {
   case _adapter_retype_only:
+  case _adapter_retype_raw:
   case _adapter_check_cast:
   case _adapter_dup_args:
   case _adapter_drop_args:
@@ -1888,8 +1958,7 @@
   case _adapter_rot_args:
     {
       int swap_slots = type2size[src];
-      oop mtype      = sun_dyn_AdapterMethodHandle::type(mh());
-      int slot_limit = sun_dyn_AdapterMethodHandle::vmslots(mtype);
+      int slot_limit = sun_dyn_AdapterMethodHandle::vmslots(mh());
       int src_slot   = argslot;
       int dest_slot  = vminfo;
       int rotate     = (ek_orig == _adapter_swap_args) ? 0 : (src_slot > dest_slot) ? 1 : -1;
@@ -2106,7 +2175,7 @@
       symbolOop name = vmSymbols::toString_name(), sig = vmSymbols::void_string_signature();
       JavaCallArguments args(Handle(THREAD, JNIHandles::resolve_non_null(erased_jh)));
       JavaValue result(T_OBJECT);
-      JavaCalls::call_virtual(&result, SystemDictionary::object_klass(), name, sig,
+      JavaCalls::call_virtual(&result, SystemDictionary::Object_klass(), name, sig,
                               &args, CHECK);
       Handle str(THREAD, (oop)result.get_jobject());
       java_lang_String::print(str, tty);
@@ -2133,7 +2202,7 @@
     guarantee(MethodHandlePushLimit >= 2 && MethodHandlePushLimit <= 0xFF,
               "MethodHandlePushLimit parameter must be in valid range");
     return MethodHandlePushLimit;
-  case MethodHandles::GC_JVM_STACK_MOVE_LIMIT:
+  case MethodHandles::GC_JVM_STACK_MOVE_UNIT:
     // return number of words per slot, signed according to stack direction
     return MethodHandles::stack_move_unit();
   }
@@ -2144,7 +2213,7 @@
 #ifndef PRODUCT
 #define EACH_NAMED_CON(template) \
     template(MethodHandles,GC_JVM_PUSH_LIMIT) \
-    template(MethodHandles,GC_JVM_STACK_MOVE_LIMIT) \
+    template(MethodHandles,GC_JVM_STACK_MOVE_UNIT) \
     template(MethodHandles,ETF_HANDLE_OR_METHOD_NAME) \
     template(MethodHandles,ETF_DIRECT_HANDLE) \
     template(MethodHandles,ETF_METHOD_NAME) \
@@ -2157,6 +2226,7 @@
     template(sun_dyn_MemberName,MN_SEARCH_INTERFACES) \
     template(sun_dyn_MemberName,VM_INDEX_UNINITIALIZED) \
     template(sun_dyn_AdapterMethodHandle,OP_RETYPE_ONLY) \
+    template(sun_dyn_AdapterMethodHandle,OP_RETYPE_RAW) \
     template(sun_dyn_AdapterMethodHandle,OP_CHECK_CAST) \
     template(sun_dyn_AdapterMethodHandle,OP_PRIM_TO_PRIM) \
     template(sun_dyn_AdapterMethodHandle,OP_REF_TO_PRIM) \
@@ -2282,9 +2352,9 @@
 JVM_ENTRY(void, MH_linkCallSite(JNIEnv *env, jobject igcls, jobject site_jh, jobject target_jh)) {
   // No special action required, yet.
   oop site_oop = JNIHandles::resolve(site_jh);
-  if (site_oop == NULL || site_oop->klass() != SystemDictionary::CallSiteImpl_klass())
+  if (site_oop == NULL || site_oop->klass() != SystemDictionary::CallSite_klass())
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "call site");
-  sun_dyn_CallSiteImpl::set_target(site_oop, JNIHandles::resolve(target_jh));
+  java_dyn_CallSite::set_target(site_oop, JNIHandles::resolve(target_jh));
 }
 JVM_END
 
@@ -2300,6 +2370,7 @@
 #define OBJ   LANG"Object;"
 #define CLS   LANG"Class;"
 #define STRG  LANG"String;"
+#define CST   JDYN"CallSite;"
 #define MT    JDYN"MethodType;"
 #define MH    JDYN"MethodHandle;"
 #define MHI   IDYN"MethodHandleImpl;"
@@ -2307,7 +2378,6 @@
 #define AMH   IDYN"AdapterMethodHandle;"
 #define BMH   IDYN"BoundMethodHandle;"
 #define DMH   IDYN"DirectMethodHandle;"
-#define CSTI  IDYN"CallSiteImpl;"
 
 #define CC (char*)  /*cast a literal from (const char*)*/
 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
@@ -2333,7 +2403,7 @@
 
 // More entry points specifically for EnableInvokeDynamic.
 static JNINativeMethod methods2[] = {
-  {CC"linkCallSite",            CC"("CSTI MH")V",               FN_PTR(MH_linkCallSite)}
+  {CC"linkCallSite",            CC"("CST MH")V",                FN_PTR(MH_linkCallSite)}
 };
 
 
@@ -2345,10 +2415,12 @@
   // note: this explicit warning-producing stuff will be replaced by auto-detection of the JSR 292 classes
 
   if (!EnableMethodHandles) {
-    warning("JSR 292 method handles are disabled in this JVM.  Use -XX:+EnableMethodHandles to enable.");
+    warning("JSR 292 method handles are disabled in this JVM.  Use -XX:+UnlockExperimentalVMOptions -XX:+EnableMethodHandles to enable.");
     return;  // bind nothing
   }
 
+  bool enable_MH = true;
+
   {
     ThreadToNativeFromVM ttnfv(thread);
 
@@ -2356,14 +2428,33 @@
     if (env->ExceptionOccurred()) {
       MethodHandles::set_enabled(false);
       warning("JSR 292 method handle code is mismatched to this JVM.  Disabling support.");
+      enable_MH = false;
       env->ExceptionClear();
-    } else {
-      MethodHandles::set_enabled(true);
     }
   }
 
+  if (enable_MH) {
+    KlassHandle MHI_klass = SystemDictionaryHandles::MethodHandleImpl_klass();
+    if (MHI_klass.not_null()) {
+      symbolHandle raiseException_name = oopFactory::new_symbol_handle("raiseException", CHECK);
+      symbolHandle raiseException_sig  = oopFactory::new_symbol_handle("(ILjava/lang/Object;Ljava/lang/Object;)V", CHECK);
+      methodOop raiseException_method  = instanceKlass::cast(MHI_klass->as_klassOop())
+                    ->find_method(raiseException_name(), raiseException_sig());
+      if (raiseException_method != NULL && raiseException_method->is_static()) {
+        MethodHandles::set_raise_exception_method(raiseException_method);
+      } else {
+        warning("JSR 292 method handle code is mismatched to this JVM.  Disabling support.");
+        enable_MH = false;
+      }
+    }
+  }
+
+  if (enable_MH) {
+    MethodHandles::set_enabled(true);
+  }
+
   if (!EnableInvokeDynamic) {
-    warning("JSR 292 invokedynamic is disabled in this JVM.  Use -XX:+EnableInvokeDynamic to enable.");
+    warning("JSR 292 invokedynamic is disabled in this JVM.  Use -XX:+UnlockExperimentalVMOptions -XX:+EnableInvokeDynamic to enable.");
     return;  // bind nothing
   }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/methodHandles.hpp
--- a/src/share/vm/prims/methodHandles.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/methodHandles.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -32,8 +32,7 @@
   // See also  javaClasses for layouts java_dyn_Method{Handle,Type,Type::Form}.
  public:
   enum EntryKind {
-    _check_mtype,               // how a caller calls a MH
-    _wrong_method_type,         // what happens when there is a type mismatch
+    _raise_exception,           // stub for error generation from other stubs
     _invokestatic_mh,           // how a MH emulates invokestatic
     _invokespecial_mh,          // ditto for the other invokes...
     _invokevirtual_mh,
@@ -47,6 +46,7 @@
 
     _adapter_mh_first,     // adapter sequence goes here...
     _adapter_retype_only   = _adapter_mh_first + sun_dyn_AdapterMethodHandle::OP_RETYPE_ONLY,
+    _adapter_retype_raw    = _adapter_mh_first + sun_dyn_AdapterMethodHandle::OP_RETYPE_RAW,
     _adapter_check_cast    = _adapter_mh_first + sun_dyn_AdapterMethodHandle::OP_CHECK_CAST,
     _adapter_prim_to_prim  = _adapter_mh_first + sun_dyn_AdapterMethodHandle::OP_PRIM_TO_PRIM,
     _adapter_ref_to_prim   = _adapter_mh_first + sun_dyn_AdapterMethodHandle::OP_REF_TO_PRIM,
@@ -113,6 +113,8 @@
   static bool _enabled;
   static MethodHandleEntry* _entries[_EK_LIMIT];
   static const char*        _entry_names[_EK_LIMIT+1];
+  static jobject            _raise_exception_method;
+
   static bool ek_valid(EntryKind ek)            { return (uint)ek < (uint)_EK_LIMIT; }
   static bool conv_op_valid(int op)             { return (uint)op < (uint)CONV_OP_LIMIT; }
 
@@ -131,6 +133,16 @@
     _entries[ek] = me;
   }
 
+  static methodOop raise_exception_method() {
+    oop rem = JNIHandles::resolve(_raise_exception_method);
+    assert(rem == NULL || rem->is_method(), "");
+    return (methodOop) rem;
+  }
+  static void set_raise_exception_method(methodOop rem) {
+    assert(_raise_exception_method == NULL, "");
+    _raise_exception_method = JNIHandles::make_global(Handle(rem));
+  }
+
   static jint adapter_conversion(int conv_op, BasicType src, BasicType dest,
                                  int stack_move = 0, int vminfo = 0) {
     assert(conv_op_valid(conv_op), "oob");
@@ -243,7 +255,7 @@
   enum {
     // format of query to getConstant:
     GC_JVM_PUSH_LIMIT = 0,
-    GC_JVM_STACK_MOVE_LIMIT = 1,
+    GC_JVM_STACK_MOVE_UNIT = 1,
 
     // format of result from getTarget / encode_target:
     ETF_HANDLE_OR_METHOD_NAME = 0, // all available data (immediate MH or method)
@@ -261,7 +273,8 @@
                                               int insert_argnum, oop insert_type,
                                               int change_argnum, oop change_type,
                                               int delete_argnum,
-                                              oop dst_mtype, int dst_beg, int dst_end);
+                                              oop dst_mtype, int dst_beg, int dst_end,
+                                              bool raw = false);
   static const char* check_method_type_insertion(oop src_mtype,
                                                  int insert_argnum, oop insert_type,
                                                  oop dst_mtype) {
@@ -278,29 +291,29 @@
                                     change_argnum, change_type,
                                     -1, dst_mtype, 0, -1);
   }
-  static const char* check_method_type_passthrough(oop src_mtype, oop dst_mtype) {
+  static const char* check_method_type_passthrough(oop src_mtype, oop dst_mtype, bool raw) {
     oop no_ref = NULL;
     return check_method_type_change(src_mtype, 0, -1,
                                     -1, no_ref, -1, no_ref, -1,
-                                    dst_mtype, 0, -1);
+                                    dst_mtype, 0, -1, raw);
   }
 
   // These checkers operate on pairs of argument or return types:
   static const char* check_argument_type_change(BasicType src_type, klassOop src_klass,
                                                 BasicType dst_type, klassOop dst_klass,
-                                                int argnum);
+                                                int argnum, bool raw = false);
 
   static const char* check_argument_type_change(oop src_type, oop dst_type,
-                                                int argnum) {
+                                                int argnum, bool raw = false) {
     klassOop src_klass = NULL, dst_klass = NULL;
     BasicType src_bt = java_lang_Class::as_BasicType(src_type, &src_klass);
     BasicType dst_bt = java_lang_Class::as_BasicType(dst_type, &dst_klass);
     return check_argument_type_change(src_bt, src_klass,
-                                      dst_bt, dst_klass, argnum);
+                                      dst_bt, dst_klass, argnum, raw);
   }
 
-  static const char* check_return_type_change(oop src_type, oop dst_type) {
-    return check_argument_type_change(src_type, dst_type, -1);
+  static const char* check_return_type_change(oop src_type, oop dst_type, bool raw = false) {
+    return check_argument_type_change(src_type, dst_type, -1, raw);
   }
 
   static const char* check_return_type_change(BasicType src_type, klassOop src_klass,
@@ -357,9 +370,10 @@
                                               TRAPS);
 
   static bool same_basic_type_for_arguments(BasicType src, BasicType dst,
+                                            bool raw = false,
                                             bool for_return = false);
-  static bool same_basic_type_for_returns(BasicType src, BasicType dst) {
-    return same_basic_type_for_arguments(src, dst, true);
+  static bool same_basic_type_for_returns(BasicType src, BasicType dst, bool raw = false) {
+    return same_basic_type_for_arguments(src, dst, raw, true);
   }
 
   enum {                        // arg_mask values
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/nativeLookup.cpp
--- a/src/share/vm/prims/nativeLookup.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/nativeLookup.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -137,7 +137,7 @@
   }
 
   // Otherwise call static method findNative in ClassLoader
-  KlassHandle   klass (THREAD, SystemDictionary::classloader_klass());
+  KlassHandle   klass (THREAD, SystemDictionary::ClassLoader_klass());
   Handle name_arg = java_lang_String::create_from_str(jni_name, CHECK_NULL);
 
   JavaValue result(T_LONG);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/prims/unsafe.cpp
--- a/src/share/vm/prims/unsafe.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/prims/unsafe.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -29,6 +29,10 @@
 #include "incls/_precompiled.incl"
 #include "incls/_unsafe.cpp.incl"
 
+HS_DTRACE_PROBE_DECL3(hotspot, thread__park__begin, uintptr_t, int, long long);
+HS_DTRACE_PROBE_DECL1(hotspot, thread__park__end, uintptr_t);
+HS_DTRACE_PROBE_DECL1(hotspot, thread__unpark, uintptr_t);
+
 #define MAX_OBJECT_SIZE \
   ( arrayOopDesc::header_size(T_DOUBLE) * HeapWordSize \
     + ((julong)max_jint * sizeof(double)) )
@@ -1083,8 +1087,10 @@
 
 UNSAFE_ENTRY(void, Unsafe_Park(JNIEnv *env, jobject unsafe, jboolean isAbsolute, jlong time))
   UnsafeWrapper("Unsafe_Park");
+  HS_DTRACE_PROBE3(hotspot, thread__park__begin, thread->parker(), (int) isAbsolute, time);
   JavaThreadParkedState jtps(thread, time != 0);
   thread->parker()->park(isAbsolute != 0, time);
+  HS_DTRACE_PROBE1(hotspot, thread__park__end, thread->parker());
 UNSAFE_END
 
 UNSAFE_ENTRY(void, Unsafe_Unpark(JNIEnv *env, jobject unsafe, jobject jthread))
@@ -1116,6 +1122,7 @@
     }
   }
   if (p != NULL) {
+    HS_DTRACE_PROBE1(hotspot, thread__unpark, p);
     p->unpark();
   }
 UNSAFE_END
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -37,7 +37,6 @@
 const char*  Arguments::_gc_log_filename        = NULL;
 bool   Arguments::_has_profile                  = false;
 bool   Arguments::_has_alloc_profile            = false;
-uintx  Arguments::_initial_heap_size            = 0;
 uintx  Arguments::_min_heap_size                = 0;
 Arguments::Mode Arguments::_mode                = _mixed;
 bool   Arguments::_java_compiler                = false;
@@ -182,6 +181,9 @@
   { "ProcessingToTenuringRatio",     JDK_Version::jdk(5), JDK_Version::jdk(7) },
   { "MinTrainLength",                JDK_Version::jdk(5), JDK_Version::jdk(7) },
   { "AppendRatio",         JDK_Version::jdk_update(6,10), JDK_Version::jdk(7) },
+  { "DefaultMaxRAM",       JDK_Version::jdk_update(6,18), JDK_Version::jdk(7) },
+  { "DefaultInitialRAMFraction",
+                           JDK_Version::jdk_update(6,18), JDK_Version::jdk(7) },
   { NULL, JDK_Version(0), JDK_Version(0) }
 };
 
@@ -555,6 +557,10 @@
   if (!is_neg && CommandLineFlags::uintxAtPut(name, &uintx_v, origin)) {
     return true;
   }
+  uint64_t uint64_t_v = (uint64_t) v;
+  if (!is_neg && CommandLineFlags::uint64_tAtPut(name, &uint64_t_v, origin)) {
+    return true;
+  }
   return false;
 }
 
@@ -942,12 +948,13 @@
   }
 }
 
+#ifndef KERNEL
 // If the user has chosen ParallelGCThreads > 0, we set UseParNewGC
 // if it's not explictly set or unset. If the user has chosen
 // UseParNewGC and not explicitly set ParallelGCThreads we
 // set it, unless this is a single cpu machine.
 void Arguments::set_parnew_gc_flags() {
-  assert(!UseSerialGC && !UseParallelGC && !UseG1GC,
+  assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC && !UseG1GC,
          "control point invariant");
   assert(UseParNewGC, "Error");
 
@@ -960,13 +967,13 @@
   if (ParallelGCThreads == 0) {
     FLAG_SET_DEFAULT(ParallelGCThreads,
                      Abstract_VM_Version::parallel_worker_threads());
-    if (FLAG_IS_DEFAULT(ParallelGCThreads) && ParallelGCThreads == 1) {
+    if (ParallelGCThreads == 1) {
       FLAG_SET_DEFAULT(UseParNewGC, false);
+      FLAG_SET_DEFAULT(ParallelGCThreads, 0);
     }
   }
-  if (!UseParNewGC) {
-    FLAG_SET_DEFAULT(ParallelGCThreads, 0);
-  } else {
+  if (UseParNewGC) {
+    // CDS doesn't work with ParNew yet
     no_shared_spaces();
 
     // By default YoungPLABSize and OldPLABSize are set to 4096 and 1024 respectively,
@@ -980,7 +987,7 @@
       FLAG_SET_DEFAULT(OldPLABSize, (intx)1024);
     }
 
-    // AlwaysTenure flag should make ParNew to promote all at first collection.
+    // AlwaysTenure flag should make ParNew promote all at first collection.
     // See CR 6362902.
     if (AlwaysTenure) {
       FLAG_SET_CMDLINE(intx, MaxTenuringThreshold, 0);
@@ -1003,7 +1010,7 @@
 // further optimization and tuning efforts, and would almost
 // certainly gain from analysis of platform and environment.
 void Arguments::set_cms_and_parnew_gc_flags() {
-  assert(!UseSerialGC && !UseParallelGC, "Error");
+  assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC, "Error");
   assert(UseConcMarkSweepGC, "CMS is expected to be on here");
 
   // If we are using CMS, we prefer to UseParNewGC,
@@ -1068,7 +1075,7 @@
     } else {
       FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
     }
-    if(PrintGCDetails && Verbose) {
+    if (PrintGCDetails && Verbose) {
       // Too early to use gclog_or_tty
       tty->print_cr("Ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
     }
@@ -1097,15 +1104,15 @@
     } else {
       min_new = NewSize;
     }
-    size_t prev_initial_size = initial_heap_size();
-    if (prev_initial_size != 0 && prev_initial_size < min_new+OldSize) {
-      set_initial_heap_size(min_new+OldSize);
+    size_t prev_initial_size = InitialHeapSize;
+    if (prev_initial_size != 0 && prev_initial_size < min_new + OldSize) {
+      FLAG_SET_ERGO(uintx, InitialHeapSize, min_new + OldSize);
       // Currently minimum size and the initial heap sizes are the same.
-      set_min_heap_size(initial_heap_size());
+      set_min_heap_size(InitialHeapSize);
       if (PrintGCDetails && Verbose) {
         warning("Initial heap size increased to " SIZE_FORMAT " M from "
                 SIZE_FORMAT " M; use -XX:NewSize=... for finer control.",
-                initial_heap_size()/M, prev_initial_size/M);
+                InitialHeapSize/M, prev_initial_size/M);
       }
     }
 
@@ -1114,12 +1121,12 @@
       align_size_down(MaxHeapSize,
                       CardTableRS::ct_max_alignment_constraint());
 
-    if(PrintGCDetails && Verbose) {
+    if (PrintGCDetails && Verbose) {
       // Too early to use gclog_or_tty
       tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
            " initial_heap_size:  " SIZE_FORMAT
            " max_heap: " SIZE_FORMAT,
-           min_heap_size(), initial_heap_size(), max_heap);
+           min_heap_size(), InitialHeapSize, max_heap);
     }
     if (max_heap > min_new) {
       // Unless explicitly requested otherwise, make young gen
@@ -1127,7 +1134,7 @@
       if (FLAG_IS_DEFAULT(NewSize)) {
         FLAG_SET_ERGO(uintx, NewSize, MAX2(NewSize, min_new));
         FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, NewSize));
-        if(PrintGCDetails && Verbose) {
+        if (PrintGCDetails && Verbose) {
           // Too early to use gclog_or_tty
           tty->print_cr("Ergo set NewSize: " SIZE_FORMAT, NewSize);
         }
@@ -1137,8 +1144,8 @@
       // later NewRatio will decide how it grows; see above.
       if (FLAG_IS_DEFAULT(OldSize)) {
         if (max_heap > NewSize) {
-          FLAG_SET_ERGO(uintx, OldSize, MIN2(3*NewSize,  max_heap - NewSize));
-          if(PrintGCDetails && Verbose) {
+          FLAG_SET_ERGO(uintx, OldSize, MIN2(3*NewSize, max_heap - NewSize));
+          if (PrintGCDetails && Verbose) {
             // Too early to use gclog_or_tty
             tty->print_cr("Ergo set OldSize: " SIZE_FORMAT, OldSize);
           }
@@ -1171,8 +1178,7 @@
       // the value (either from the command line or ergonomics) of
       // OldPLABSize.  Following OldPLABSize is an ergonomics decision.
       FLAG_SET_ERGO(uintx, CMSParPromoteBlocksToClaim, OldPLABSize);
-    }
-    else {
+    } else {
       // OldPLABSize and CMSParPromoteBlocksToClaim are both set.
       // CMSParPromoteBlocksToClaim is a collector-specific flag, so
       // we'll let it to take precedence.
@@ -1182,11 +1188,32 @@
                   " CMSParPromoteBlocksToClaim will take precedence.\n");
     }
   }
+  if (!FLAG_IS_DEFAULT(ResizeOldPLAB) && !ResizeOldPLAB) {
+    // OldPLAB sizing manually turned off: Use a larger default setting,
+    // unless it was manually specified. This is because a too-low value
+    // will slow down scavenges.
+    if (FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim)) {
+      FLAG_SET_ERGO(uintx, CMSParPromoteBlocksToClaim, 50); // default value before 6631166
+    }
+  }
+  // Overwrite OldPLABSize which is the variable we will internally use everywhere.
+  FLAG_SET_ERGO(uintx, OldPLABSize, CMSParPromoteBlocksToClaim);
+  // If either of the static initialization defaults have changed, note this
+  // modification.
+  if (!FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim) || !FLAG_IS_DEFAULT(OldPLABWeight)) {
+    CFLS_LAB::modify_initialization(OldPLABSize, OldPLABWeight);
+  }
+  if (PrintGCDetails && Verbose) {
+    tty->print_cr("MarkStackSize: %uk  MarkStackSizeMax: %uk",
+      MarkStackSize / K, MarkStackSizeMax / K);
+    tty->print_cr("ConcGCThreads: %u", ConcGCThreads);
+  }
 }
+#endif // KERNEL
 
 inline uintx max_heap_for_compressed_oops() {
   LP64_ONLY(return oopDesc::OopEncodingHeapMax - MaxPermSize - os::vm_page_size());
-  NOT_LP64(return DefaultMaxRAM);
+  NOT_LP64(ShouldNotReachHere(); return 0);
 }
 
 bool Arguments::should_auto_select_low_pause_collector() {
@@ -1205,7 +1232,7 @@
 
 void Arguments::set_ergonomics_flags() {
   // Parallel GC is not compatible with sharing. If one specifies
-  // that they want sharing explicitly, do not set ergonmics flags.
+  // that they want sharing explicitly, do not set ergonomics flags.
   if (DumpSharedSpaces || ForceSharedSpaces) {
     return;
   }
@@ -1229,15 +1256,16 @@
     }
   }
 
+#ifndef ZERO
 #ifdef _LP64
   // Check that UseCompressedOops can be set with the max heap size allocated
   // by ergonomics.
   if (MaxHeapSize <= max_heap_for_compressed_oops()) {
-    if (FLAG_IS_DEFAULT(UseCompressedOops)) {
-      // Turn off until bug is fixed.
-      // the following line to return it to default status.
-      // FLAG_SET_ERGO(bool, UseCompressedOops, true);
+#ifndef COMPILER1
+    if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) {
+      FLAG_SET_ERGO(bool, UseCompressedOops, true);
     }
+#endif
 #ifdef _WIN64
     if (UseLargePages && UseCompressedOops) {
       // Cannot allocate guard pages for implicit checks in indexed addressing
@@ -1256,6 +1284,7 @@
   // Also checks that certain machines are slower with compressed oops
   // in vm_version initialization code.
 #endif // _LP64
+#endif // !ZERO
 }
 
 void Arguments::set_parallel_gc_flags() {
@@ -1271,8 +1300,6 @@
     FLAG_SET_ERGO(uintx, ParallelGCThreads,
                   Abstract_VM_Version::parallel_worker_threads());
 
-    // PS is a server collector, setup the heap sizes accordingly.
-    set_server_heap_size();
     // If InitialSurvivorRatio or MinSurvivorRatio were not specified, but the
     // SurvivorRatio has been set, reset their default values to SurvivorRatio +
     // 2.  By doing this we make SurvivorRatio also work for Parallel Scavenger.
@@ -1302,8 +1329,6 @@
 
 void Arguments::set_g1_gc_flags() {
   assert(UseG1GC, "Error");
-  // G1 is a server collector, setup the heap sizes accordingly.
-  set_server_heap_size();
 #ifdef COMPILER1
   FastTLABRefill = false;
 #endif
@@ -1319,52 +1344,92 @@
   if (FLAG_IS_DEFAULT(MaxGCPauseMillis)) {
     FLAG_SET_DEFAULT(MaxGCPauseMillis, 200);
   }
+
+  if (FLAG_IS_DEFAULT(MarkStackSize)) {
+    // Size as a multiple of TaskQueueSuper::N which is larger
+    // for 64-bit.
+    FLAG_SET_DEFAULT(MarkStackSize, 128 * TaskQueueSuper::total_size());
+  }
+  if (PrintGCDetails && Verbose) {
+    tty->print_cr("MarkStackSize: %uk  MarkStackSizeMax: %uk",
+      MarkStackSize / K, MarkStackSizeMax / K);
+    tty->print_cr("ConcGCThreads: %u", ConcGCThreads);
+  }
 }
 
-void Arguments::set_server_heap_size() {
+void Arguments::set_heap_size() {
+  if (!FLAG_IS_DEFAULT(DefaultMaxRAMFraction)) {
+    // Deprecated flag
+    FLAG_SET_CMDLINE(uintx, MaxRAMFraction, DefaultMaxRAMFraction);
+  }
+
+  const julong phys_mem =
+    FLAG_IS_DEFAULT(MaxRAM) ? MIN2(os::physical_memory(), (julong)MaxRAM)
+                            : (julong)MaxRAM;
+
+  // If the maximum heap size has not been set with -Xmx,
+  // then set it as fraction of the size of physical memory,
+  // respecting the maximum and minimum sizes of the heap.
   if (FLAG_IS_DEFAULT(MaxHeapSize)) {
-    const uint64_t reasonable_fraction =
-      os::physical_memory() / DefaultMaxRAMFraction;
-    const uint64_t maximum_size = (uint64_t)
-                 (FLAG_IS_DEFAULT(DefaultMaxRAM) && UseCompressedOops ?
-                     MIN2(max_heap_for_compressed_oops(), DefaultMaxRAM) :
-                     DefaultMaxRAM);
-    size_t reasonable_max =
-      (size_t) os::allocatable_physical_memory(reasonable_fraction);
-    if (reasonable_max > maximum_size) {
-      reasonable_max = maximum_size;
+    julong reasonable_max = phys_mem / MaxRAMFraction;
+
+    if (phys_mem <= MaxHeapSize * MinRAMFraction) {
+      // Small physical memory, so use a minimum fraction of it for the heap
+      reasonable_max = phys_mem / MinRAMFraction;
+    } else {
+      // Not-small physical memory, so require a heap at least
+      // as large as MaxHeapSize
+      reasonable_max = MAX2(reasonable_max, (julong)MaxHeapSize);
+    }
+    if (!FLAG_IS_DEFAULT(ErgoHeapSizeLimit) && ErgoHeapSizeLimit != 0) {
+      // Limit the heap size to ErgoHeapSizeLimit
+      reasonable_max = MIN2(reasonable_max, (julong)ErgoHeapSizeLimit);
     }
+    if (UseCompressedOops) {
+      // Limit the heap size to the maximum possible when using compressed oops
+      reasonable_max = MIN2(reasonable_max, (julong)max_heap_for_compressed_oops());
+    }
+    reasonable_max = os::allocatable_physical_memory(reasonable_max);
+
+    if (!FLAG_IS_DEFAULT(InitialHeapSize)) {
+      // An initial heap size was specified on the command line,
+      // so be sure that the maximum size is consistent.  Done
+      // after call to allocatable_physical_memory because that
+      // method might reduce the allocation size.
+      reasonable_max = MAX2(reasonable_max, (julong)InitialHeapSize);
+    }
+
     if (PrintGCDetails && Verbose) {
       // Cannot use gclog_or_tty yet.
-      tty->print_cr("  Max heap size for server class platform "
-                    SIZE_FORMAT, reasonable_max);
+      tty->print_cr("  Maximum heap size " SIZE_FORMAT, reasonable_max);
     }
-    // If the initial_heap_size has not been set with -Xms,
-    // then set it as fraction of size of physical memory
-    // respecting the maximum and minimum sizes of the heap.
-    if (initial_heap_size() == 0) {
-      const uint64_t reasonable_initial_fraction =
-        os::physical_memory() / DefaultInitialRAMFraction;
-      const size_t reasonable_initial =
-        (size_t) os::allocatable_physical_memory(reasonable_initial_fraction);
-      const size_t minimum_size = NewSize + OldSize;
-      set_initial_heap_size(MAX2(MIN2(reasonable_initial, reasonable_max),
-                                minimum_size));
-      // Currently the minimum size and the initial heap sizes are the same.
-      set_min_heap_size(initial_heap_size());
-      if (PrintGCDetails && Verbose) {
-        // Cannot use gclog_or_tty yet.
-        tty->print_cr("  Initial heap size for server class platform "
-                      SIZE_FORMAT, initial_heap_size());
-      }
-    } else {
-      // A minimum size was specified on the command line.  Be sure
-      // that the maximum size is consistent.
-      if (initial_heap_size() > reasonable_max) {
-        reasonable_max = initial_heap_size();
-      }
+    FLAG_SET_ERGO(uintx, MaxHeapSize, (uintx)reasonable_max);
+  }
+
+  // If the initial_heap_size has not been set with InitialHeapSize
+  // or -Xms, then set it as fraction of the size of physical memory,
+  // respecting the maximum and minimum sizes of the heap.
+  if (FLAG_IS_DEFAULT(InitialHeapSize)) {
+    julong reasonable_minimum = (julong)(OldSize + NewSize);
+
+    reasonable_minimum = MIN2(reasonable_minimum, (julong)MaxHeapSize);
+
+    reasonable_minimum = os::allocatable_physical_memory(reasonable_minimum);
+
+    julong reasonable_initial = phys_mem / InitialRAMFraction;
+
+    reasonable_initial = MAX2(reasonable_initial, reasonable_minimum);
+    reasonable_initial = MIN2(reasonable_initial, (julong)MaxHeapSize);
+
+    reasonable_initial = os::allocatable_physical_memory(reasonable_initial);
+
+    if (PrintGCDetails && Verbose) {
+      // Cannot use gclog_or_tty yet.
+      tty->print_cr("  Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
+      tty->print_cr("  Minimum heap size " SIZE_FORMAT, (uintx)reasonable_minimum);
     }
-    FLAG_SET_ERGO(uintx, MaxHeapSize, (uintx) reasonable_max);
+    FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
+    set_min_heap_size((uintx)reasonable_minimum);
   }
 }
 
@@ -1438,6 +1503,20 @@
 //===========================================================================================================
 // Parsing of main arguments
 
+bool Arguments::verify_interval(uintx val, uintx min,
+                                uintx max, const char* name) {
+  // Returns true iff value is in the inclusive interval [min..max]
+  // false, otherwise.
+  if (val >= min && val <= max) {
+    return true;
+  }
+  jio_fprintf(defaultStream::error_stream(),
+              "%s of " UINTX_FORMAT " is invalid; must be between " UINTX_FORMAT
+              " and " UINTX_FORMAT "\n",
+              name, val, min, max);
+  return false;
+}
+
 bool Arguments::verify_percentage(uintx value, const char* name) {
   if (value <= 100) {
     return true;
@@ -1448,10 +1527,11 @@
   return false;
 }
 
-static void set_serial_gc_flags() {
+static void force_serial_gc() {
   FLAG_SET_DEFAULT(UseSerialGC, true);
   FLAG_SET_DEFAULT(UseParNewGC, false);
   FLAG_SET_DEFAULT(UseConcMarkSweepGC, false);
+  FLAG_SET_DEFAULT(CMSIncrementalMode, false);  // special CMS suboption
   FLAG_SET_DEFAULT(UseParallelGC, false);
   FLAG_SET_DEFAULT(UseParallelOldGC, false);
   FLAG_SET_DEFAULT(UseG1GC, false);
@@ -1459,7 +1539,7 @@
 
 static bool verify_serial_gc_flags() {
   return (UseSerialGC &&
-        !(UseParNewGC || UseConcMarkSweepGC || UseG1GC ||
+        !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC ||
           UseParallelGC || UseParallelOldGC));
 }
 
@@ -1574,7 +1654,7 @@
   status = status && verify_percentage(GCHeapFreeLimit, "GCHeapFreeLimit");
 
   // Check user specified sharing option conflict with Parallel GC
-  bool cannot_share = (UseConcMarkSweepGC || UseG1GC || UseParNewGC ||
+  bool cannot_share = ((UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC || UseParNewGC ||
                        UseParallelGC || UseParallelOldGC ||
                        SOLARIS_ONLY(UseISM) NOT_SOLARIS(UseLargePages));
 
@@ -1582,9 +1662,17 @@
     // Either force sharing on by forcing the other options off, or
     // force sharing off.
     if (DumpSharedSpaces || ForceSharedSpaces) {
-      set_serial_gc_flags();
+      jio_fprintf(defaultStream::error_stream(),
+                  "Reverting to Serial GC because of %s\n",
+                  ForceSharedSpaces ? " -Xshare:on" : "-Xshare:dump");
+      force_serial_gc();
       FLAG_SET_DEFAULT(SOLARIS_ONLY(UseISM) NOT_SOLARIS(UseLargePages), false);
     } else {
+      if (UseSharedSpaces && Verbose) {
+        jio_fprintf(defaultStream::error_stream(),
+                    "Turning off use of shared archive because of "
+                    "choice of garbage collector or large pages\n");
+      }
       no_shared_spaces();
     }
   }
@@ -1665,6 +1753,21 @@
     status = false;
   }
 
+  if (UseG1GC) {
+    status = status && verify_percentage(InitiatingHeapOccupancyPercent,
+                                         "InitiatingHeapOccupancyPercent");
+  }
+
+  status = status && verify_interval(RefDiscoveryPolicy,
+                                     ReferenceProcessor::DiscoveryPolicyMin,
+                                     ReferenceProcessor::DiscoveryPolicyMax,
+                                     "RefDiscoveryPolicy");
+
+  // Limit the lower bound of this flag to 1 as it is used in a division
+  // expression.
+  status = status && verify_interval(TLABWasteTargetPercent,
+                                     1, 100, "TLABWasteTargetPercent");
+
   return status;
 }
 
@@ -1713,6 +1816,29 @@
   return false;
 }
 
+bool Arguments::parse_uintx(const char* value,
+                            uintx* uintx_arg,
+                            uintx min_size) {
+
+  // Check the sign first since atomull() parses only unsigned values.
+  bool value_is_positive = !(*value == '-');
+
+  if (value_is_positive) {
+    julong n;
+    bool good_return = atomull(value, &n);
+    if (good_return) {
+      bool above_minimum = n >= min_size;
+      bool value_is_too_large = n > max_uintx;
+
+      if (above_minimum && !value_is_too_large) {
+        *uintx_arg = n;
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 Arguments::ArgsRange Arguments::parse_memory_size(const char* s,
                                                   julong* long_arg,
                                                   julong min_size) {
@@ -1808,7 +1934,6 @@
         FLAG_SET_CMDLINE(bool, TraceClassUnloading, true);
       } else if (!strcmp(tail, ":gc")) {
         FLAG_SET_CMDLINE(bool, PrintGC, true);
-        FLAG_SET_CMDLINE(bool, TraceClassUnloading, true);
       } else if (!strcmp(tail, ":jni")) {
         FLAG_SET_CMDLINE(bool, PrintJNIResolving, true);
       }
@@ -1916,8 +2041,8 @@
         describe_range_error(errcode);
         return JNI_EINVAL;
       }
-      FLAG_SET_CMDLINE(uintx, MaxNewSize, (size_t) long_initial_eden_size);
-      FLAG_SET_CMDLINE(uintx, NewSize, (size_t) long_initial_eden_size);
+      FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_eden_size);
+      FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_eden_size);
     // -Xms
     } else if (match_option(option, "-Xms", &tail)) {
       julong long_initial_heap_size = 0;
@@ -1928,9 +2053,9 @@
         describe_range_error(errcode);
         return JNI_EINVAL;
       }
-      set_initial_heap_size((size_t) long_initial_heap_size);
+      FLAG_SET_CMDLINE(uintx, InitialHeapSize, (uintx)long_initial_heap_size);
       // Currently the minimum size and the initial heap sizes are the same.
-      set_min_heap_size(initial_heap_size());
+      set_min_heap_size(InitialHeapSize);
     // -Xmx
     } else if (match_option(option, "-Xmx", &tail)) {
       julong long_max_heap_size = 0;
@@ -1941,7 +2066,7 @@
         describe_range_error(errcode);
         return JNI_EINVAL;
       }
-      FLAG_SET_CMDLINE(uintx, MaxHeapSize, (size_t) long_max_heap_size);
+      FLAG_SET_CMDLINE(uintx, MaxHeapSize, (uintx)long_max_heap_size);
     // Xmaxf
     } else if (match_option(option, "-Xmaxf", &tail)) {
       int maxf = (int)(atof(tail) * 100);
@@ -2187,9 +2312,9 @@
 
       if (FLAG_IS_DEFAULT(MaxHeapSize)) {
          FLAG_SET_CMDLINE(uintx, MaxHeapSize, initHeapSize);
-         set_initial_heap_size(MaxHeapSize);
+         FLAG_SET_CMDLINE(uintx, InitialHeapSize, initHeapSize);
          // Currently the minimum size and the initial heap sizes are the same.
-         set_min_heap_size(initial_heap_size());
+         set_min_heap_size(initHeapSize);
       }
       if (FLAG_IS_DEFAULT(NewSize)) {
          // Make the young generation 3/8ths of the total heap.
@@ -2328,22 +2453,25 @@
                   "ExtendedDTraceProbes flag is only applicable on Solaris\n");
       return JNI_EINVAL;
 #endif // ndef SOLARIS
-    } else
 #ifdef ASSERT
-    if (match_option(option, "-XX:+FullGCALot", &tail)) {
+    } else if (match_option(option, "-XX:+FullGCALot", &tail)) {
       FLAG_SET_CMDLINE(bool, FullGCALot, true);
       // disable scavenge before parallel mark-compact
       FLAG_SET_CMDLINE(bool, ScavengeBeforeFullGC, false);
-    } else
 #endif
-    if (match_option(option, "-XX:ParCMSPromoteBlocksToClaim=", &tail)) {
+    } else if (match_option(option, "-XX:CMSParPromoteBlocksToClaim=", &tail)) {
       julong cms_blocks_to_claim = (julong)atol(tail);
       FLAG_SET_CMDLINE(uintx, CMSParPromoteBlocksToClaim, cms_blocks_to_claim);
       jio_fprintf(defaultStream::error_stream(),
-        "Please use -XX:CMSParPromoteBlocksToClaim in place of "
+        "Please use -XX:OldPLABSize in place of "
+        "-XX:CMSParPromoteBlocksToClaim in the future\n");
+    } else if (match_option(option, "-XX:ParCMSPromoteBlocksToClaim=", &tail)) {
+      julong cms_blocks_to_claim = (julong)atol(tail);
+      FLAG_SET_CMDLINE(uintx, CMSParPromoteBlocksToClaim, cms_blocks_to_claim);
+      jio_fprintf(defaultStream::error_stream(),
+        "Please use -XX:OldPLABSize in place of "
         "-XX:ParCMSPromoteBlocksToClaim in the future\n");
-    } else
-    if (match_option(option, "-XX:ParallelGCOldGenAllocBufferSize=", &tail)) {
+    } else if (match_option(option, "-XX:ParallelGCOldGenAllocBufferSize=", &tail)) {
       julong old_plab_size = 0;
       ArgsRange errcode = parse_memory_size(tail, &old_plab_size, 1);
       if (errcode != arg_in_range) {
@@ -2356,8 +2484,7 @@
       jio_fprintf(defaultStream::error_stream(),
                   "Please use -XX:OldPLABSize in place of "
                   "-XX:ParallelGCOldGenAllocBufferSize in the future\n");
-    } else
-    if (match_option(option, "-XX:ParallelGCToSpaceAllocBufferSize=", &tail)) {
+    } else if (match_option(option, "-XX:ParallelGCToSpaceAllocBufferSize=", &tail)) {
       julong young_plab_size = 0;
       ArgsRange errcode = parse_memory_size(tail, &young_plab_size, 1);
       if (errcode != arg_in_range) {
@@ -2370,8 +2497,38 @@
       jio_fprintf(defaultStream::error_stream(),
                   "Please use -XX:YoungPLABSize in place of "
                   "-XX:ParallelGCToSpaceAllocBufferSize in the future\n");
-    } else
-    if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
+    } else if (match_option(option, "-XX:CMSMarkStackSize=", &tail) ||
+               match_option(option, "-XX:G1MarkStackSize=", &tail)) {
+      julong stack_size = 0;
+      ArgsRange errcode = parse_memory_size(tail, &stack_size, 1);
+      if (errcode != arg_in_range) {
+        jio_fprintf(defaultStream::error_stream(),
+                    "Invalid mark stack size: %s\n", option->optionString);
+        describe_range_error(errcode);
+        return JNI_EINVAL;
+      }
+      FLAG_SET_CMDLINE(uintx, MarkStackSize, stack_size);
+    } else if (match_option(option, "-XX:CMSMarkStackSizeMax=", &tail)) {
+      julong max_stack_size = 0;
+      ArgsRange errcode = parse_memory_size(tail, &max_stack_size, 1);
+      if (errcode != arg_in_range) {
+        jio_fprintf(defaultStream::error_stream(),
+                    "Invalid maximum mark stack size: %s\n",
+                    option->optionString);
+        describe_range_error(errcode);
+        return JNI_EINVAL;
+      }
+      FLAG_SET_CMDLINE(uintx, MarkStackSizeMax, max_stack_size);
+    } else if (match_option(option, "-XX:ParallelMarkingThreads=", &tail) ||
+               match_option(option, "-XX:ParallelCMSThreads=", &tail)) {
+      uintx conc_threads = 0;
+      if (!parse_uintx(tail, &conc_threads, 1)) {
+        jio_fprintf(defaultStream::error_stream(),
+                    "Invalid concurrent threads: %s\n", option->optionString);
+        return JNI_EINVAL;
+      }
+      FLAG_SET_CMDLINE(uintx, ConcGCThreads, conc_threads);
+    } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
       // Skip -XX:Flags= since that case has already been handled
       if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) {
         if (!process_argument(tail, args->ignoreUnrecognized, origin)) {
@@ -2442,6 +2599,9 @@
     SOLARIS_ONLY(FLAG_SET_DEFAULT(UseISM, false));
   }
 
+  // Tiered compilation is undefined with C1.
+  TieredCompilation = false;
+
 #else
   if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) {
     FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1);
@@ -2591,6 +2751,10 @@
     if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
       IgnoreUnrecognizedVMOptions = false;
     }
+    if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
+      CommandLineFlags::printFlags();
+      vm_exit(0);
+    }
   }
 
   if (IgnoreUnrecognizedVMOptions) {
@@ -2641,27 +2805,43 @@
 
   if (EnableInvokeDynamic && !EnableMethodHandles) {
     if (!FLAG_IS_DEFAULT(EnableMethodHandles)) {
-      warning("forcing EnableMethodHandles true to allow EnableInvokeDynamic");
+      warning("forcing EnableMethodHandles true because EnableInvokeDynamic is true");
     }
     EnableMethodHandles = true;
   }
   if (EnableMethodHandles && !AnonymousClasses) {
     if (!FLAG_IS_DEFAULT(AnonymousClasses)) {
-      warning("forcing AnonymousClasses true to enable EnableMethodHandles");
+      warning("forcing AnonymousClasses true because EnableMethodHandles is true");
     }
     AnonymousClasses = true;
   }
+  if ((EnableMethodHandles || AnonymousClasses) && ScavengeRootsInCode == 0) {
+    if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
+      warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true");
+    }
+    ScavengeRootsInCode = 1;
+  }
+#ifdef COMPILER2
+  if (EnableInvokeDynamic && DoEscapeAnalysis) {
+    // TODO: We need to find rules for invokedynamic and EA.  For now,
+    // simply disable EA by default.
+    if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
+      DoEscapeAnalysis = false;
+    }
+  }
+#endif
 
   if (PrintGCDetails) {
     // Turn on -verbose:gc options as well
     PrintGC = true;
-    if (FLAG_IS_DEFAULT(TraceClassUnloading)) {
-      TraceClassUnloading = true;
-    }
   }
 
+#if defined(_LP64) && defined(COMPILER1)
+  UseCompressedOops = false;
+#endif
+
 #ifdef SERIALGC
-  set_serial_gc_flags();
+  force_serial_gc();
 #endif // SERIALGC
 #ifdef KERNEL
   no_shared_spaces();
@@ -2670,24 +2850,39 @@
   // Set flags based on ergonomics.
   set_ergonomics_flags();
 
+#ifdef _LP64
+  // XXX JSR 292 currently does not support compressed oops.
+  if (EnableMethodHandles && UseCompressedOops) {
+    if (FLAG_IS_DEFAULT(UseCompressedOops) || FLAG_IS_ERGO(UseCompressedOops)) {
+      UseCompressedOops = false;
+    }
+  }
+#endif // _LP64
+
   // Check the GC selections again.
   if (!check_gc_consistency()) {
     return JNI_EINVAL;
   }
 
-  if (UseParallelGC || UseParallelOldGC) {
-    // Set some flags for ParallelGC if needed.
-    set_parallel_gc_flags();
-  } else if (UseConcMarkSweepGC) {
-    // Set some flags for CMS
+#ifndef KERNEL
+  if (UseConcMarkSweepGC) {
+    // Set flags for CMS and ParNew.  Check UseConcMarkSweep first
+    // to ensure that when both UseConcMarkSweepGC and UseParNewGC
+    // are true, we don't call set_parnew_gc_flags() as well.
     set_cms_and_parnew_gc_flags();
-  } else if (UseParNewGC) {
-    // Set some flags for ParNew
-    set_parnew_gc_flags();
-  } else if (UseG1GC) {
-    // Set some flags for garbage-first, if needed.
-    set_g1_gc_flags();
+  } else {
+    // Set heap size based on available physical memory
+    set_heap_size();
+    // Set per-collector flags
+    if (UseParallelGC || UseParallelOldGC) {
+      set_parallel_gc_flags();
+    } else if (UseParNewGC) {
+      set_parnew_gc_flags();
+    } else if (UseG1GC) {
+      set_g1_gc_flags();
+    }
   }
+#endif // KERNEL
 
 #ifdef SERIALGC
   assert(verify_serial_gc_flags(), "SerialGC unset");
@@ -2700,9 +2895,16 @@
   set_aggressive_opts_flags();
 
 #ifdef CC_INTERP
-  // Biased locking is not implemented with c++ interpreter
+  // Clear flags not supported by the C++ interpreter
+  FLAG_SET_DEFAULT(ProfileInterpreter, false);
   FLAG_SET_DEFAULT(UseBiasedLocking, false);
-#endif /* CC_INTERP */
+  LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));
+#endif // CC_INTERP
+
+#ifdef ZERO
+  // Clear flags not supported by Zero
+  FLAG_SET_DEFAULT(TaggedStackInterpreter, false);
+#endif // ZERO
 
 #ifdef COMPILER2
   if (!UseBiasedLocking || EmitSync != 0) {
@@ -2710,15 +2912,27 @@
   }
 #endif
 
+  if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
+    warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output");
+    DebugNonSafepoints = true;
+  }
+
+#ifndef PRODUCT
+  if (CompileTheWorld) {
+    // Force NmethodSweeper to sweep whole CodeCache each time.
+    if (FLAG_IS_DEFAULT(NmethodSweepFraction)) {
+      NmethodSweepFraction = 1;
+    }
+  }
+#endif
+
   if (PrintCommandLineFlags) {
     CommandLineFlags::printSetFlags();
   }
 
-#ifdef ASSERT
   if (PrintFlagsFinal) {
     CommandLineFlags::printFlags();
   }
-#endif
 
   return JNI_OK;
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/arguments.hpp
--- a/src/share/vm/runtime/arguments.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/arguments.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -254,7 +254,6 @@
   static bool   _has_profile;
   static bool   _has_alloc_profile;
   static const char*  _gc_log_filename;
-  static uintx  _initial_heap_size;
   static uintx  _min_heap_size;
 
   // -Xrun arguments
@@ -300,8 +299,8 @@
   static void set_g1_gc_flags();
   // GC ergonomics
   static void set_ergonomics_flags();
-  // Setup heap size for a server platform
-  static void set_server_heap_size();
+  // Setup heap size
+  static void set_heap_size();
   // Based on automatic selection criteria, should the
   // low pause collector be used.
   static bool should_auto_select_low_pause_collector();
@@ -337,11 +336,19 @@
   static bool is_bad_option(const JavaVMOption* option, jboolean ignore) {
     return is_bad_option(option, ignore, NULL);
   }
+  static bool verify_interval(uintx val, uintx min,
+                              uintx max, const char* name);
   static bool verify_percentage(uintx value, const char* name);
   static void describe_range_error(ArgsRange errcode);
   static ArgsRange check_memory_size(julong size, julong min_size);
   static ArgsRange parse_memory_size(const char* s, julong* long_arg,
                                      julong min_size);
+  // Parse a string for a unsigned integer.  Returns true if value
+  // is an unsigned integer greater than or equal to the minimum
+  // parameter passed and returns the value in uintx_arg.  Returns
+  // false otherwise, with uintx_arg undefined.
+  static bool parse_uintx(const char* value, uintx* uintx_arg,
+                          uintx min_size);
 
   // methods to build strings from individual args
   static void build_jvm_args(const char* arg);
@@ -434,9 +441,7 @@
   static bool has_profile()                 { return _has_profile; }
   static bool has_alloc_profile()           { return _has_alloc_profile; }
 
-  // -Xms , -Xmx
-  static uintx initial_heap_size()          { return _initial_heap_size; }
-  static void  set_initial_heap_size(uintx v) { _initial_heap_size = v;  }
+  // -Xms, -Xmx
   static uintx min_heap_size()              { return _min_heap_size; }
   static void  set_min_heap_size(uintx v)   { _min_heap_size = v;  }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/atomic.hpp
--- a/src/share/vm/runtime/atomic.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/atomic.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/compilationPolicy.cpp
--- a/src/share/vm/runtime/compilationPolicy.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/compilationPolicy.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2010 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
@@ -66,7 +66,7 @@
   if (!canBeCompiled(m))      return false;
 
   return !UseInterpreter ||                                              // must compile all methods
-         (UseCompiler && AlwaysCompileLoopMethods && m->has_loops()); // eagerly compile loop methods
+         (UseCompiler && AlwaysCompileLoopMethods && m->has_loops() && CompileBroker::should_compile_new_jobs()); // eagerly compile loop methods
 }
 
 // Returns true if m is allowed to be compiled
@@ -74,6 +74,16 @@
   if (m->is_abstract()) return false;
   if (DontCompileHugeMethods && m->code_size() > HugeMethodLimit) return false;
 
+  // Math intrinsics should never be compiled as this can lead to
+  // monotonicity problems because the interpreter will prefer the
+  // compiled code to the intrinsic version.  This can't happen in
+  // production because the invocation counter can't be incremented
+  // but we shouldn't expose the system to this problem in testing
+  // modes.
+  if (!AbstractInterpreter::can_be_compiled(m)) {
+    return false;
+  }
+
   return !m->is_not_compilable();
 }
 
@@ -127,7 +137,7 @@
   reset_counter_for_invocation_event(m);
   const char* comment = "count";
 
-  if (!delayCompilationDuringStartup() && canBeCompiled(m) && UseCompiler) {
+  if (!delayCompilationDuringStartup() && canBeCompiled(m) && UseCompiler && CompileBroker::should_compile_new_jobs()) {
     nmethod* nm = m->code();
     if (nm == NULL ) {
       const char* comment = "count";
@@ -152,7 +162,7 @@
   int hot_count = m->backedge_count();
   const char* comment = "backedge_count";
 
-  if (!m->is_not_osr_compilable() && !delayCompilationDuringStartup() && canBeCompiled(m)) {
+  if (!m->is_not_osr_compilable() && !delayCompilationDuringStartup() && canBeCompiled(m) && CompileBroker::should_compile_new_jobs()) {
     CompileBroker::compile_method(m, loop_top_bci, m, hot_count, comment, CHECK);
 
     NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(loop_top_bci));)
@@ -194,7 +204,7 @@
   reset_counter_for_invocation_event(m);
   const char* comment = "count";
 
-  if (m->code() == NULL && !delayCompilationDuringStartup() && canBeCompiled(m) && UseCompiler) {
+  if (m->code() == NULL && !delayCompilationDuringStartup() && canBeCompiled(m) && UseCompiler && CompileBroker::should_compile_new_jobs()) {
     ResourceMark rm(THREAD);
     JavaThread *thread = (JavaThread*)THREAD;
     frame       fr     = thread->last_frame();
@@ -238,7 +248,7 @@
   int hot_count = m->backedge_count();
   const char* comment = "backedge_count";
 
-  if (!m->is_not_osr_compilable() && !delayCompilationDuringStartup() && canBeCompiled(m)) {
+  if (!m->is_not_osr_compilable() && !delayCompilationDuringStartup() && canBeCompiled(m) && CompileBroker::should_compile_new_jobs()) {
     CompileBroker::compile_method(m, loop_top_bci, m, hot_count, comment, CHECK);
 
     NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(loop_top_bci));)
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/deoptimization.cpp
--- a/src/share/vm/runtime/deoptimization.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/deoptimization.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -145,6 +145,27 @@
     if (EliminateAllocations) {
       assert (chunk->at(0)->scope() != NULL,"expect only compiled java frames");
       GrowableArray<ScopeValue*>* objects = chunk->at(0)->scope()->objects();
+
+      // The flag return_oop() indicates call sites which return oop
+      // in compiled code. Such sites include java method calls,
+      // runtime calls (for example, used to allocate new objects/arrays
+      // on slow code path) and any other calls generated in compiled code.
+      // It is not guaranteed that we can get such information here only
+      // by analyzing bytecode in deoptimized frames. This is why this flag
+      // is set during method compilation (see Compile::Process_OopMap_Node()).
+      bool save_oop_result = chunk->at(0)->scope()->return_oop();
+      Handle return_value;
+      if (save_oop_result) {
+        // Reallocation may trigger GC. If deoptimization happened on return from
+        // call which returns oop we need to save it since it is not in oopmap.
+        oop result = deoptee.saved_oop_result(&map);
+        assert(result == NULL || result->is_oop(), "must be oop");
+        return_value = Handle(thread, result);
+        assert(Universe::heap()->is_in_or_null(result), "must be heap pointer");
+        if (TraceDeoptimization) {
+          tty->print_cr("SAVED OOP RESULT " INTPTR_FORMAT " in thread " INTPTR_FORMAT, result, thread);
+        }
+      }
       bool reallocated = false;
       if (objects != NULL) {
         JRT_BLOCK
@@ -158,8 +179,12 @@
           ttyLocker ttyl;
           tty->print_cr("REALLOC OBJECTS in thread " INTPTR_FORMAT, thread);
           print_objects(objects);
+        }
+#endif
       }
-#endif
+      if (save_oop_result) {
+        // Restore result.
+        deoptee.set_saved_oop_result(&map, return_value());
       }
     }
     if (EliminateLocks) {
@@ -235,6 +260,12 @@
   assert(cb->frame_size() >= 0, "Unexpected frame size");
   intptr_t* unpack_sp = stub_frame.sp() + cb->frame_size();
 
+  // If the deopt call site is a MethodHandle invoke call site we have
+  // to adjust the unpack_sp.
+  nmethod* deoptee_nm = deoptee.cb()->as_nmethod_or_null();
+  if (deoptee_nm != NULL && deoptee_nm->is_method_handle_return(deoptee.pc()))
+    unpack_sp = deoptee.unextended_sp();
+
 #ifdef ASSERT
   assert(cb->is_deoptimization_stub() || cb->is_uncommon_trap_stub(), "just checking");
   Events::log("fetch unroll sp " INTPTR_FORMAT, unpack_sp);
@@ -907,21 +938,6 @@
   if (TraceDeoptimization) {
     ttyLocker ttyl;
     tty->print_cr("     Created vframeArray " INTPTR_FORMAT, array);
-    if (Verbose) {
-      int count = 0;
-      // this used to leak deoptimizedVFrame like it was going out of style!!!
-      for (int index = 0; index < array->frames(); index++ ) {
-        vframeArrayElement* e = array->element(index);
-        e->print(tty);
-
-        /*
-          No printing yet.
-        array->vframe_at(index)->print_activation(count++);
-        // better as...
-        array->print_activation_for(index, count++);
-        */
-      }
-    }
   }
 #endif // PRODUCT
 
@@ -1332,13 +1348,14 @@
     // Whether the interpreter is producing MDO data or not, we also need
     // to use the MDO to detect hot deoptimization points and control
     // aggressive optimization.
+    bool inc_recompile_count = false;
+    ProfileData* pdata = NULL;
     if (ProfileTraps && update_trap_state && trap_mdo.not_null()) {
       assert(trap_mdo() == get_method_data(thread, trap_method, false), "sanity");
       uint this_trap_count = 0;
       bool maybe_prior_trap = false;
       bool maybe_prior_recompile = false;
-      ProfileData* pdata
-        = query_update_method_data(trap_mdo, trap_bci, reason,
+      pdata = query_update_method_data(trap_mdo, trap_bci, reason,
                                    //outputs:
                                    this_trap_count,
                                    maybe_prior_trap,
@@ -1374,18 +1391,7 @@
         // Detect repeated recompilation at the same BCI, and enforce a limit.
         if (make_not_entrant && maybe_prior_recompile) {
           // More than one recompile at this point.
-          trap_mdo->inc_overflow_recompile_count();
-          if (maybe_prior_trap
-              && ((uint)trap_mdo->overflow_recompile_count()
-                  > (uint)PerBytecodeRecompilationCutoff)) {
-            // Give up on the method containing the bad BCI.
-            if (trap_method() == nm->method()) {
-              make_not_compilable = true;
-            } else {
-              trap_method->set_not_compilable();
-              // But give grace to the enclosing nm->method().
-            }
-          }
+          inc_recompile_count = maybe_prior_trap;
         }
       } else {
         // For reasons which are not recorded per-bytecode, we simply
@@ -1412,7 +1418,17 @@
         reset_counters = true;
       }
 
-      if (make_not_entrant && pdata != NULL) {
+    }
+
+    // Take requested actions on the method:
+
+    // Recompile
+    if (make_not_entrant) {
+      if (!nm->make_not_entrant()) {
+        return; // the call did not change nmethod's state
+      }
+
+      if (pdata != NULL) {
         // Record the recompilation event, if any.
         int tstate0 = pdata->trap_state();
         int tstate1 = trap_state_set_recompiled(tstate0, true);
@@ -1421,7 +1437,19 @@
       }
     }
 
-    // Take requested actions on the method:
+    if (inc_recompile_count) {
+      trap_mdo->inc_overflow_recompile_count();
+      if ((uint)trap_mdo->overflow_recompile_count() >
+          (uint)PerBytecodeRecompilationCutoff) {
+        // Give up on the method containing the bad BCI.
+        if (trap_method() == nm->method()) {
+          make_not_compilable = true;
+        } else {
+          trap_method->set_not_compilable();
+          // But give grace to the enclosing nm->method().
+        }
+      }
+    }
 
     // Reset invocation counters
     if (reset_counters) {
@@ -1431,13 +1459,8 @@
         reset_invocation_counter(trap_scope);
     }
 
-    // Recompile
-    if (make_not_entrant) {
-      nm->make_not_entrant();
-    }
-
     // Give up compiling
-    if (make_not_compilable) {
+    if (make_not_compilable && !nm->method()->is_not_compilable()) {
       assert(make_not_entrant, "consistent");
       nm->method()->set_not_compilable();
     }
@@ -1510,9 +1533,11 @@
       if (tstate1 != tstate0)
         pdata->set_trap_state(tstate1);
     } else {
-      if (LogCompilation && xtty != NULL)
+      if (LogCompilation && xtty != NULL) {
+        ttyLocker ttyl;
         // Missing MDP?  Leave a small complaint in the log.
         xtty->elem("missing_mdp bci='%d'", trap_bci);
+      }
     }
   }
 
@@ -1666,13 +1691,15 @@
   "class_check",
   "array_check",
   "intrinsic",
+  "bimorphic",
   "unloaded",
   "uninitialized",
   "unreached",
   "unhandled",
   "constraint",
   "div0_check",
-  "age"
+  "age",
+  "predicate"
 };
 const char* Deoptimization::_trap_action_name[Action_LIMIT] = {
   // Note:  Keep this in sync. with enum DeoptAction.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/deoptimization.hpp
--- a/src/share/vm/runtime/deoptimization.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/deoptimization.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -33,12 +33,15 @@
   enum DeoptReason {
     Reason_many = -1,             // indicates presence of several reasons
     Reason_none = 0,              // indicates absence of a relevant deopt.
+    // Next 7 reasons are recorded per bytecode in DataLayout::trap_bits
     Reason_null_check,            // saw unexpected null or zero divisor (@bci)
     Reason_null_assert,           // saw unexpected non-null or non-zero (@bci)
     Reason_range_check,           // saw unexpected array index (@bci)
     Reason_class_check,           // saw unexpected object class (@bci)
     Reason_array_check,           // saw unexpected array class (aastore @bci)
     Reason_intrinsic,             // saw unexpected operand to intrinsic (@bci)
+    Reason_bimorphic,             // saw unexpected object class in bimorphic inlining (@bci)
+
     Reason_unloaded,              // unloaded class or constant pool entry
     Reason_uninitialized,         // bad class state (uninitialized)
     Reason_unreached,             // code is not reached, compiler
@@ -46,9 +49,10 @@
     Reason_constraint,            // arbitrary runtime constraint violated
     Reason_div0_check,            // a null_check due to division by zero
     Reason_age,                   // nmethod too old; tier threshold reached
+    Reason_predicate,             // compiler generated predicate failed
     Reason_LIMIT,
     // Note:  Keep this enum in sync. with _trap_reason_name.
-    Reason_RECORDED_LIMIT = Reason_unloaded   // some are not recorded per bc
+    Reason_RECORDED_LIMIT = Reason_bimorphic  // some are not recorded per bc
     // Note:  Reason_RECORDED_LIMIT should be < 8 to fit into 3 bits of
     // DataLayout::trap_bits.  This dependency is enforced indirectly
     // via asserts, to avoid excessive direct header-to-header dependencies.
@@ -278,7 +282,7 @@
                                        int trap_state);
 
   static bool reason_is_recorded_per_bytecode(DeoptReason reason) {
-    return reason > Reason_none && reason < Reason_RECORDED_LIMIT;
+    return reason > Reason_none && reason <= Reason_RECORDED_LIMIT;
   }
 
   static DeoptReason reason_recorded_per_bytecode_if_any(DeoptReason reason) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/frame.cpp
--- a/src/share/vm/runtime/frame.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/frame.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -107,7 +107,11 @@
 
 address frame::raw_pc() const {
   if (is_deoptimized_frame()) {
-    return ((nmethod*) cb())->deopt_handler_begin() - pc_return_offset;
+    nmethod* nm = cb()->as_nmethod_or_null();
+    if (nm->is_method_handle_return(pc()))
+      return nm->deopt_mh_handler_begin() - pc_return_offset;
+    else
+      return nm->deopt_handler_begin() - pc_return_offset;
   } else {
     return (pc() - pc_return_offset);
   }
@@ -269,10 +273,16 @@
   } // NeedsDeoptSuspend
 
 
-  address deopt = nm->deopt_handler_begin();
+  // If the call site is a MethodHandle call site use the MH deopt
+  // handler.
+  address deopt = nm->is_method_handle_return(pc()) ?
+    nm->deopt_mh_handler_begin() :
+    nm->deopt_handler_begin();
+
   // Save the original pc before we patch in the new one
   nm->set_original_pc(this, pc());
   patch_pc(thread, deopt);
+
 #ifdef ASSERT
   {
     RegisterMap map(thread, false);
@@ -596,12 +606,12 @@
   for (BasicObjectLock* current = interpreter_frame_monitor_end();
        current < interpreter_frame_monitor_begin();
        current = next_monitor_in_interpreter_frame(current)) {
-    st->print_cr(" [ - obj ");
+    st->print(" - obj    [");
     current->obj()->print_value_on(st);
-    st->cr();
-    st->print_cr(" - lock ");
+    st->print_cr("]");
+    st->print(" - lock   [");
     current->lock()->print_on(st);
-    st->cr();
+    st->print_cr("]");
   }
   // monitor
   st->print_cr(" - monitor[" INTPTR_FORMAT "]", interpreter_frame_monitor_begin());
@@ -769,9 +779,9 @@
 
 class InterpretedArgumentOopFinder: public SignatureInfo {
  private:
-  OopClosure* _f;      // Closure to invoke
-  int    _offset;      // TOS-relative offset, decremented with each argument
-  bool   _is_static;   // true if the callee is a static method
+  OopClosure* _f;        // Closure to invoke
+  int    _offset;        // TOS-relative offset, decremented with each argument
+  bool   _has_receiver;  // true if the callee has a receiver
   frame* _fr;
 
   void set(int size, BasicType type) {
@@ -786,9 +796,9 @@
   }
 
  public:
-  InterpretedArgumentOopFinder(symbolHandle signature, bool is_static, frame* fr, OopClosure* f) : SignatureInfo(signature) {
+  InterpretedArgumentOopFinder(symbolHandle signature, bool has_receiver, frame* fr, OopClosure* f) : SignatureInfo(signature), _has_receiver(has_receiver) {
     // compute size of arguments
-    int args_size = ArgumentSizeComputer(signature).size() + (is_static ? 0 : 1);
+    int args_size = ArgumentSizeComputer(signature).size() + (has_receiver ? 1 : 0);
     assert(!fr->is_interpreted_frame() ||
            args_size <= fr->interpreter_frame_expression_stack_size(),
             "args cannot be on stack anymore");
@@ -796,11 +806,10 @@
     _f         = f;
     _fr        = fr;
     _offset    = args_size;
-    _is_static = is_static;
   }
 
   void oops_do() {
-    if (!_is_static) {
+    if (_has_receiver) {
       --_offset;
       oop_offset_do();
     }
@@ -912,7 +921,7 @@
   int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals();
 
   symbolHandle signature;
-  bool is_static = false;
+  bool has_receiver = false;
 
   // Process a callee's arguments if we are at a call site
   // (i.e., if we are at an invoke bytecode)
@@ -922,7 +931,7 @@
     Bytecode_invoke *call = Bytecode_invoke_at_check(m, bci);
     if (call != NULL) {
       signature = symbolHandle(thread, call->signature());
-      is_static = call->is_invokestatic();
+      has_receiver = call->has_receiver();
       if (map->include_argument_oops() &&
           interpreter_frame_expression_stack_size() > 0) {
         ResourceMark rm(thread);  // is this right ???
@@ -936,7 +945,7 @@
         //       code in the interpreter calls a blocking runtime
         //       routine which can cause this code to be executed).
         //       (was bug gri 7/27/98)
-        oops_interpreted_arguments_do(signature, is_static, f);
+        oops_interpreted_arguments_do(signature, has_receiver, f);
       }
     }
   }
@@ -950,7 +959,7 @@
     mask = &oopmap_mask;
 #endif // ASSERT
     oops_interpreted_locals_do(f, max_locals, mask);
-    oops_interpreted_expressions_do(f, signature, is_static,
+    oops_interpreted_expressions_do(f, signature, has_receiver,
                                     m->max_stack(),
                                     max_locals, mask);
   } else {
@@ -992,7 +1001,7 @@
 
 void frame::oops_interpreted_expressions_do(OopClosure *f,
                                       symbolHandle signature,
-                                      bool is_static,
+                                      bool has_receiver,
                                       int max_stack,
                                       int max_locals,
                                       InterpreterOopMap *mask) {
@@ -1005,7 +1014,7 @@
   // arguments in callee's locals.
   int args_size = 0;
   if (!signature.is_null()) {
-    args_size = ArgumentSizeComputer(signature).size() + (is_static ? 0 : 1);
+    args_size = ArgumentSizeComputer(signature).size() + (has_receiver ? 1 : 0);
   }
 
   intptr_t *tos_addr = interpreter_frame_tos_at(args_size);
@@ -1038,12 +1047,12 @@
   }
 }
 
-void frame::oops_interpreted_arguments_do(symbolHandle signature, bool is_static, OopClosure* f) {
-  InterpretedArgumentOopFinder finder(signature, is_static, this, f);
+void frame::oops_interpreted_arguments_do(symbolHandle signature, bool has_receiver, OopClosure* f) {
+  InterpretedArgumentOopFinder finder(signature, has_receiver, this, f);
   finder.oops_do();
 }
 
-void frame::oops_code_blob_do(OopClosure* f, const RegisterMap* reg_map) {
+void frame::oops_code_blob_do(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* reg_map) {
   assert(_cb != NULL, "sanity check");
   if (_cb->oop_maps() != NULL) {
     OopMapSet::oops_do(this, reg_map, f);
@@ -1058,28 +1067,16 @@
   // oops referenced from nmethods active on thread stacks so as to
   // prevent them from being collected. However, this visit should be
   // restricted to certain phases of the collection only. The
-  // closure answers whether it wants nmethods to be traced.
-  // (All CodeBlob subtypes other than NMethod currently have
-  // an empty oops_do() method.
-  if (f->do_nmethods()) {
-    _cb->oops_do(f);
-  }
-}
-
-void frame::nmethods_code_blob_do() {
-  assert(_cb != NULL, "sanity check");
-
-  // If we see an activation belonging to a non_entrant nmethod, we mark it.
-  if (_cb->is_nmethod() && ((nmethod *)_cb)->is_not_entrant()) {
-    ((nmethod*)_cb)->mark_as_seen_on_stack();
-  }
+  // closure decides how it wants nmethods to be traced.
+  if (cf != NULL)
+    cf->do_code_blob(_cb);
 }
 
 class CompiledArgumentOopFinder: public SignatureInfo {
  protected:
   OopClosure*     _f;
-  int             _offset;      // the current offset, incremented with each argument
-  bool            _is_static;   // true if the callee is a static method
+  int             _offset;        // the current offset, incremented with each argument
+  bool            _has_receiver;  // true if the callee has a receiver
   frame           _fr;
   RegisterMap*    _reg_map;
   int             _arg_size;
@@ -1099,24 +1096,24 @@
   }
 
  public:
-  CompiledArgumentOopFinder(symbolHandle signature, bool is_static, OopClosure* f, frame fr,  const RegisterMap* reg_map)
+  CompiledArgumentOopFinder(symbolHandle signature, bool has_receiver, OopClosure* f, frame fr,  const RegisterMap* reg_map)
     : SignatureInfo(signature) {
 
     // initialize CompiledArgumentOopFinder
     _f         = f;
     _offset    = 0;
-    _is_static = is_static;
+    _has_receiver = has_receiver;
     _fr        = fr;
     _reg_map   = (RegisterMap*)reg_map;
-    _arg_size  = ArgumentSizeComputer(signature).size() + (is_static ? 0 : 1);
+    _arg_size  = ArgumentSizeComputer(signature).size() + (has_receiver ? 1 : 0);
 
     int arg_size;
-    _regs = SharedRuntime::find_callee_arguments(signature(), is_static, &arg_size);
+    _regs = SharedRuntime::find_callee_arguments(signature(), has_receiver, &arg_size);
     assert(arg_size == _arg_size, "wrong arg size");
   }
 
   void oops_do() {
-    if (!_is_static) {
+    if (_has_receiver) {
       handle_oop_offset();
       _offset++;
     }
@@ -1124,9 +1121,9 @@
   }
 };
 
-void frame::oops_compiled_arguments_do(symbolHandle signature, bool is_static, const RegisterMap* reg_map, OopClosure* f) {
+void frame::oops_compiled_arguments_do(symbolHandle signature, bool has_receiver, const RegisterMap* reg_map, OopClosure* f) {
   ResourceMark rm;
-  CompiledArgumentOopFinder finder(signature, is_static, f, *this, reg_map);
+  CompiledArgumentOopFinder finder(signature, has_receiver, f, *this, reg_map);
   finder.oops_do();
 }
 
@@ -1201,18 +1198,28 @@
 }
 
 
-void frame::oops_do_internal(OopClosure* f, RegisterMap* map, bool use_interpreter_oop_map_cache) {
-         if (is_interpreted_frame())    { oops_interpreted_do(f, map, use_interpreter_oop_map_cache);
-  } else if (is_entry_frame())          { oops_entry_do      (f, map);
-  } else if (CodeCache::contains(pc())) { oops_code_blob_do  (f, map);
+void frame::oops_do_internal(OopClosure* f, CodeBlobClosure* cf, RegisterMap* map, bool use_interpreter_oop_map_cache) {
+#ifndef PRODUCT
+  // simulate GC crash here to dump java thread in error report
+  if (CrashGCForDumpingJavaThread) {
+    char *t = NULL;
+    *t = 'c';
+  }
+#endif
+  if (is_interpreted_frame()) {
+    oops_interpreted_do(f, map, use_interpreter_oop_map_cache);
+  } else if (is_entry_frame()) {
+    oops_entry_do(f, map);
+  } else if (CodeCache::contains(pc())) {
+    oops_code_blob_do(f, cf, map);
   } else {
     ShouldNotReachHere();
   }
 }
 
-void frame::nmethods_do() {
+void frame::nmethods_do(CodeBlobClosure* cf) {
   if (_cb != NULL && _cb->is_nmethod()) {
-    nmethods_code_blob_do();
+    cf->do_code_blob(_cb);
   }
 }
 
@@ -1358,7 +1365,7 @@
     }
   }
   COMPILER2_PRESENT(assert(DerivedPointerTable::is_empty(), "must be empty before verify");)
-  oops_do_internal(&VerifyOopClosure::verify_oop, (RegisterMap*)map, false);
+  oops_do_internal(&VerifyOopClosure::verify_oop, NULL, (RegisterMap*)map, false);
 }
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/frame.hpp
--- a/src/share/vm/runtime/frame.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/frame.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -371,7 +371,7 @@
   oop* oopmapreg_to_location(VMReg reg, const RegisterMap* regmap) const;
 
   // Oops-do's
-  void oops_compiled_arguments_do(symbolHandle signature, bool is_static, const RegisterMap* reg_map, OopClosure* f);
+  void oops_compiled_arguments_do(symbolHandle signature, bool has_receiver, const RegisterMap* reg_map, OopClosure* f);
   void oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool query_oop_map_cache = true);
 
  private:
@@ -379,21 +379,19 @@
                                  int max_locals,
                                  InterpreterOopMap *mask);
   void oops_interpreted_expressions_do(OopClosure *f, symbolHandle signature,
-                                 bool is_static, int max_stack, int max_locals,
+                                 bool has_receiver, int max_stack, int max_locals,
                                  InterpreterOopMap *mask);
-  void oops_interpreted_arguments_do(symbolHandle signature, bool is_static, OopClosure* f);
+  void oops_interpreted_arguments_do(symbolHandle signature, bool has_receiver, OopClosure* f);
 
   // Iteration of oops
-  void oops_do_internal(OopClosure* f, RegisterMap* map, bool use_interpreter_oop_map_cache);
+  void oops_do_internal(OopClosure* f, CodeBlobClosure* cf, RegisterMap* map, bool use_interpreter_oop_map_cache);
   void oops_entry_do(OopClosure* f, const RegisterMap* map);
-  void oops_code_blob_do(OopClosure* f, const RegisterMap* map);
+  void oops_code_blob_do(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* map);
   int adjust_offset(methodOop method, int index); // helper for above fn
-  // Iteration of nmethods
-  void nmethods_code_blob_do();
  public:
   // Memory management
-  void oops_do(OopClosure* f, RegisterMap* map) { oops_do_internal(f, map, true); }
-  void nmethods_do();
+  void oops_do(OopClosure* f, CodeBlobClosure* cf, RegisterMap* map) { oops_do_internal(f, cf, map, true); }
+  void nmethods_do(CodeBlobClosure* cf);
 
   void gc_prologue();
   void gc_epilogue();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/globals.cpp
--- a/src/share/vm/runtime/globals.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/globals.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -46,7 +46,8 @@
 bool Flag::is_unlocked() const {
   if (strcmp(kind, "{diagnostic}") == 0) {
     return UnlockDiagnosticVMOptions;
-  } else if (strcmp(kind, "{experimental}") == 0) {
+  } else if (strcmp(kind, "{experimental}") == 0 ||
+             strcmp(kind, "{C2 experimental}") == 0) {
     return UnlockExperimentalVMOptions;
   } else {
     return true;
@@ -69,9 +70,10 @@
 
 void Flag::print_on(outputStream* st) {
   st->print("%5s %-35s %c= ", type, name, (origin != DEFAULT ? ':' : ' '));
-  if (is_bool())  st->print("%-16s", get_bool() ? "true" : "false");
-  if (is_intx())  st->print("%-16ld", get_intx());
-  if (is_uintx()) st->print("%-16lu", get_uintx());
+  if (is_bool())     st->print("%-16s", get_bool() ? "true" : "false");
+  if (is_intx())     st->print("%-16ld", get_intx());
+  if (is_uintx())    st->print("%-16lu", get_uintx());
+  if (is_uint64_t()) st->print("%-16lu", get_uint64_t());
   if (is_ccstr()) {
     const char* cp = get_ccstr();
     if (cp != NULL) {
@@ -100,6 +102,8 @@
     st->print("-XX:%s=" INTX_FORMAT, name, get_intx());
   } else if (is_uintx()) {
     st->print("-XX:%s=" UINTX_FORMAT, name, get_uintx());
+  } else if (is_uint64_t()) {
+    st->print("-XX:%s=" UINT64_FORMAT, name, get_uint64_t());
   } else if (is_ccstr()) {
     st->print("-XX:%s=", name);
     const char* cp = get_ccstr();
@@ -166,6 +170,7 @@
 #define C2_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 product}", DEFAULT },
 #define C2_PD_PRODUCT_FLAG_STRUCT(type, name, doc)     { #type, XSTR(name), &name, "{C2 pd product}", DEFAULT },
 #define C2_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 diagnostic}", DEFAULT },
+#define C2_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 experimental}", DEFAULT },
 #ifdef PRODUCT
   #define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
   #define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc)     /* flag is constant */
@@ -187,7 +192,7 @@
  C1_FLAGS(C1_DEVELOP_FLAG_STRUCT, C1_PD_DEVELOP_FLAG_STRUCT, C1_PRODUCT_FLAG_STRUCT, C1_PD_PRODUCT_FLAG_STRUCT, C1_NOTPRODUCT_FLAG_STRUCT)
 #endif
 #ifdef COMPILER2
- C2_FLAGS(C2_DEVELOP_FLAG_STRUCT, C2_PD_DEVELOP_FLAG_STRUCT, C2_PRODUCT_FLAG_STRUCT, C2_PD_PRODUCT_FLAG_STRUCT, C2_DIAGNOSTIC_FLAG_STRUCT, C2_NOTPRODUCT_FLAG_STRUCT)
+ C2_FLAGS(C2_DEVELOP_FLAG_STRUCT, C2_PD_DEVELOP_FLAG_STRUCT, C2_PRODUCT_FLAG_STRUCT, C2_PD_PRODUCT_FLAG_STRUCT, C2_DIAGNOSTIC_FLAG_STRUCT, C2_EXPERIMENTAL_FLAG_STRUCT, C2_NOTPRODUCT_FLAG_STRUCT)
 #endif
  {0, NULL, NULL}
 };
@@ -324,6 +329,32 @@
   faddr->origin = origin;
 }
 
+bool CommandLineFlags::uint64_tAt(char* name, size_t len, uint64_t* value) {
+  Flag* result = Flag::find_flag(name, len);
+  if (result == NULL) return false;
+  if (!result->is_uint64_t()) return false;
+  *value = result->get_uint64_t();
+  return true;
+}
+
+bool CommandLineFlags::uint64_tAtPut(char* name, size_t len, uint64_t* value, FlagValueOrigin origin) {
+  Flag* result = Flag::find_flag(name, len);
+  if (result == NULL) return false;
+  if (!result->is_uint64_t()) return false;
+  uint64_t old_value = result->get_uint64_t();
+  result->set_uint64_t(*value);
+  *value = old_value;
+  result->origin = origin;
+  return true;
+}
+
+void CommandLineFlagsEx::uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, FlagValueOrigin origin) {
+  Flag* faddr = address_of_flag(flag);
+  guarantee(faddr != NULL && faddr->is_uint64_t(), "wrong flag type");
+  faddr->set_uint64_t(value);
+  faddr->origin = origin;
+}
+
 bool CommandLineFlags::doubleAt(char* name, size_t len, double* value) {
   Flag* result = Flag::find_flag(name, len);
   if (result == NULL) return false;
@@ -437,6 +468,8 @@
   assert(Arguments::check_vm_args_consistency(), "Some flag settings conflict");
 }
 
+#endif // PRODUCT
+
 void CommandLineFlags::printFlags() {
   // Print the flags sorted by name
   // note: this method is called before the thread structure is in place
@@ -462,5 +495,3 @@
   }
   FREE_C_HEAP_ARRAY(Flag*, array);
 }
-
-#endif
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/globals.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -49,7 +49,6 @@
 define_pd_global(intx, FreqInlineSize,               0);
 define_pd_global(intx, InlineSmallCode,              0);
 define_pd_global(intx, NewSizeThreadIncrease,        4*K);
-define_pd_global(intx, NewRatio,                     4);
 define_pd_global(intx, InlineClassNatives,           true);
 define_pd_global(intx, InlineUnsafeOps,              true);
 define_pd_global(intx, InitialCodeCacheSize,         160*K);
@@ -59,7 +58,7 @@
 define_pd_global(uintx,PermSize,    ScaleForWordSize(4*M));
 define_pd_global(uintx,MaxPermSize, ScaleForWordSize(64*M));
 define_pd_global(bool, NeverActAsServerClassMachine, true);
-define_pd_global(uintx, DefaultMaxRAM,               1*G);
+define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
 #define CI_COMPILER_COUNT 0
 #else
 
@@ -114,6 +113,10 @@
   uintx get_uintx() const     { return *((uintx*) addr); }
   void set_uintx(uintx value) { *((uintx*) addr) = value; }
 
+  bool is_uint64_t() const          { return strcmp(type, "uint64_t") == 0; }
+  uint64_t get_uint64_t() const     { return *((uint64_t*) addr); }
+  void set_uint64_t(uint64_t value) { *((uint64_t*) addr) = value; }
+
   bool is_double() const        { return strcmp(type, "double") == 0; }
   double get_double() const     { return *((double*) addr); }
   void set_double(double value) { *((double*) addr) = value; }
@@ -189,6 +192,11 @@
   static bool uintxAtPut(char* name, size_t len, uintx* value, FlagValueOrigin origin);
   static bool uintxAtPut(char* name, uintx* value, FlagValueOrigin origin) { return uintxAtPut(name, strlen(name), value, origin); }
 
+  static bool uint64_tAt(char* name, size_t len, uint64_t* value);
+  static bool uint64_tAt(char* name, uint64_t* value) { return uint64_tAt(name, strlen(name), value); }
+  static bool uint64_tAtPut(char* name, size_t len, uint64_t* value, FlagValueOrigin origin);
+  static bool uint64_tAtPut(char* name, uint64_t* value, FlagValueOrigin origin) { return uint64_tAtPut(name, strlen(name), value, origin); }
+
   static bool doubleAt(char* name, size_t len, double* value);
   static bool doubleAt(char* name, double* value)    { return doubleAt(name, strlen(name), value); }
   static bool doubleAtPut(char* name, size_t len, double* value, FlagValueOrigin origin);
@@ -203,7 +211,7 @@
   static bool wasSetOnCmdline(const char* name, bool* value);
   static void printSetFlags();
 
-  static void printFlags() PRODUCT_RETURN;
+  static void printFlags();
 
   static void verify() PRODUCT_RETURN;
 };
@@ -319,9 +327,6 @@
   product(bool, UseMembar, false,                                           \
           "(Unstable) Issues membars on thread state transitions")          \
                                                                             \
-  product(bool, PrintCommandLineFlags, false,                               \
-          "Prints flags that appeared on the command line")                 \
-                                                                            \
   diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug,                  \
           "Enable normal processing of flags relating to field diagnostics")\
                                                                             \
@@ -714,6 +719,11 @@
   diagnostic(bool, TraceNMethodInstalls, false,                             \
              "Trace nmethod intallation")                                   \
                                                                             \
+  diagnostic(intx, ScavengeRootsInCode, 0,                                  \
+             "0: do not allow scavengable oops in the code cache; "         \
+             "1: allow scavenging from the code cache; "                    \
+             "2: emit as many constants as the compiler can see")           \
+                                                                            \
   diagnostic(bool, TraceOSRBreakpoint, false,                               \
              "Trace OSR Breakpoint ")                                       \
                                                                             \
@@ -732,6 +742,9 @@
   diagnostic(bool, PrintAdapterHandlers, false,                             \
           "Print code generated for i2c/c2i adapters")                      \
                                                                             \
+  develop(bool, VerifyAdapterSharing, false,                                \
+          "Verify that the code for shared adapters is the equivalent")     \
+                                                                            \
   diagnostic(bool, PrintAssembly, false,                                    \
           "Print assembly code (using external disassembler.so)")           \
                                                                             \
@@ -781,7 +794,7 @@
   product(bool, ProfilerRecordPC, false,                                    \
           "Collects tick for each 16 byte interval of compiled code")       \
                                                                             \
-  product(bool, ProfileVM,  false,                                          \
+  product(bool, ProfileVM, false,                                           \
           "Profiles ticks that fall within VM (either in the VM Thread "    \
           "or VM code called through stubs)")                               \
                                                                             \
@@ -811,7 +824,7 @@
                                                                             \
   product(bool, RegisterFinalizersAtInit, true,                             \
           "Register finalizable objects at end of Object.<init> or "        \
-          "after allocation.")                                              \
+          "after allocation")                                               \
                                                                             \
   develop(bool, RegisterReferences, true,                                   \
           "Tells whether the VM should register soft/weak/final/phantom "   \
@@ -858,14 +871,14 @@
   product(bool, AlwaysLockClassLoader, false,                               \
           "Require the VM to acquire the class loader lock before calling " \
           "loadClass() even for class loaders registering "                 \
-          "as parallel capable. Default false. ")                           \
+          "as parallel capable")                                            \
                                                                             \
   product(bool, AllowParallelDefineClass, false,                            \
           "Allow parallel defineClass requests for class loaders "          \
-          "registering as parallel capable. Default false")                 \
+          "registering as parallel capable")                                \
                                                                             \
   product(bool, MustCallLoadClassInternal, false,                           \
-          "Call loadClassInternal() rather than loadClass().Default false") \
+          "Call loadClassInternal() rather than loadClass()")               \
                                                                             \
   product_pd(bool, DontYieldALot,                                           \
           "Throw away obvious excess yield calls (for SOLARIS only)")       \
@@ -917,9 +930,9 @@
          "(Unstable, Linux-specific)"                                       \
          " avoid NPTL-FUTEX hang pthread_cond_timedwait" )                  \
                                                                             \
-  product(bool, FilterSpuriousWakeups , true,                               \
-          "Prevent spurious or premature wakeups from object.wait"              \
-          "(Solaris only)")                                                     \
+  product(bool, FilterSpuriousWakeups, true,                                \
+          "Prevent spurious or premature wakeups from object.wait "         \
+          "(Solaris only)")                                                 \
                                                                             \
   product(intx, NativeMonitorTimeout, -1, "(Unstable)" )                    \
   product(intx, NativeMonitorFlags, 0, "(Unstable)" )                       \
@@ -969,7 +982,7 @@
                                                                             \
   product(bool, UseAltSigs, false,                                          \
           "Use alternate signals instead of SIGUSR1 & SIGUSR2 for VM "      \
-          "internal signals. (Solaris only)")                               \
+          "internal signals (Solaris only)")                                \
                                                                             \
   product(bool, UseSpinning, false,                                         \
           "Use spinning in monitor inflation and before entry")             \
@@ -1191,7 +1204,7 @@
   product(bool, UseSerialGC, false,                                         \
           "Use the serial garbage collector")                               \
                                                                             \
-  experimental(bool, UseG1GC, false,                                        \
+  product(bool, UseG1GC, false,                                             \
           "Use the Garbage-First garbage collector")                        \
                                                                             \
   product(bool, UseParallelGC, false,                                       \
@@ -1232,9 +1245,6 @@
   product(uintx, ParallelGCThreads, 0,                                      \
           "Number of parallel threads parallel gc will use")                \
                                                                             \
-  product(uintx, ParallelCMSThreads, 0,                                     \
-          "Max number of threads CMS will use for concurrent work")         \
-                                                                            \
   develop(bool, ParallelOldGCSplitALot, false,                              \
           "Provoke splitting (copying data from a young gen space to"       \
           "multiple destination spaces)")                                   \
@@ -1245,8 +1255,8 @@
   develop(bool, TraceRegionTasksQueuing, false,                             \
           "Trace the queuing of the region tasks")                          \
                                                                             \
-  product(uintx, ParallelMarkingThreads, 0,                                 \
-          "Number of marking threads concurrent gc will use")               \
+  product(uintx, ConcGCThreads, 0,                                          \
+          "Number of threads concurrent gc will use")                       \
                                                                             \
   product(uintx, YoungPLABSize, 4096,                                       \
           "Size of young gen promotion labs (in HeapWords)")                \
@@ -1261,12 +1271,12 @@
           "Always tenure objects in eden. (ParallelGC only)")               \
                                                                             \
   product(bool, NeverTenure, false,                                         \
-          "Never tenure objects in eden, May tenure on overflow"            \
-          " (ParallelGC only)")                                             \
+          "Never tenure objects in eden, May tenure on overflow "           \
+          "(ParallelGC only)")                                              \
                                                                             \
   product(bool, ScavengeBeforeFullGC, true,                                 \
-          "Scavenge youngest generation before each full GC,"               \
-          " used with UseParallelGC")                                       \
+          "Scavenge youngest generation before each full GC, "              \
+          "used with UseParallelGC")                                        \
                                                                             \
   develop(bool, ScavengeWithObjectsInToSpace, false,                        \
           "Allow scavenges to occur when to_space contains objects.")       \
@@ -1279,9 +1289,9 @@
           " (effective only when UseConcMarkSweepGC)")                      \
                                                                             \
   product(bool, ExplicitGCInvokesConcurrentAndUnloadsClasses, false,        \
-          "A System.gc() request invokes a concurrent collection and"       \
-          " also unloads classes during such a concurrent gc cycle  "       \
-          " (effective only when UseConcMarkSweepGC)")                      \
+          "A System.gc() request invokes a concurrent collection and "      \
+          "also unloads classes during such a concurrent gc cycle "         \
+          "(effective only when UseConcMarkSweepGC)")                       \
                                                                             \
   develop(bool, UseCMSAdaptiveFreeLists, true,                              \
           "Use Adaptive Free Lists in the CMS generation")                  \
@@ -1336,26 +1346,62 @@
           "Whether we should simulate work queue overflow in ParNew")       \
                                                                             \
   notproduct(uintx, ParGCWorkQueueOverflowInterval, 1000,                   \
-          "An `interval' counter that determines how frequently"            \
-          " we simulate overflow; a smaller number increases frequency")    \
+          "An `interval' counter that determines how frequently "           \
+          "we simulate overflow; a smaller number increases frequency")     \
                                                                             \
   product(uintx, ParGCDesiredObjsFromOverflowList, 20,                      \
           "The desired number of objects to claim from the overflow list")  \
                                                                             \
-  product(uintx, CMSParPromoteBlocksToClaim, 50,                            \
+  product(uintx, CMSParPromoteBlocksToClaim, 16,                             \
           "Number of blocks to attempt to claim when refilling CMS LAB for "\
           "parallel GC.")                                                   \
                                                                             \
+  product(uintx, OldPLABWeight, 50,                                         \
+          "Percentage (0-100) used to weight the current sample when"       \
+          "computing exponentially decaying average for resizing CMSParPromoteBlocksToClaim.") \
+                                                                            \
+  product(bool, ResizeOldPLAB, true,                                        \
+          "Dynamically resize (old gen) promotion labs")                    \
+                                                                            \
+  product(bool, PrintOldPLAB, false,                                        \
+          "Print (old gen) promotion labs sizing decisions")                \
+                                                                            \
+  product(uintx, CMSOldPLABMin, 16,                                         \
+          "Min size of CMS gen promotion lab caches per worker per blksize")\
+                                                                            \
+  product(uintx, CMSOldPLABMax, 1024,                                       \
+          "Max size of CMS gen promotion lab caches per worker per blksize")\
+                                                                            \
+  product(uintx, CMSOldPLABNumRefills, 4,                                   \
+          "Nominal number of refills of CMS gen promotion lab cache"        \
+          " per worker per block size")                                     \
+                                                                            \
+  product(bool, CMSOldPLABResizeQuicker, false,                             \
+          "Whether to react on-the-fly during a scavenge to a sudden"       \
+          " change in block demand rate")                                   \
+                                                                            \
+  product(uintx, CMSOldPLABToleranceFactor, 4,                              \
+          "The tolerance of the phase-change detector for on-the-fly"       \
+          " PLAB resizing during a scavenge")                               \
+                                                                            \
+  product(uintx, CMSOldPLABReactivityFactor, 2,                             \
+          "The gain in the feedback loop for on-the-fly PLAB resizing"      \
+          " during a scavenge")                                             \
+                                                                            \
+  product(uintx, CMSOldPLABReactivityCeiling, 10,                           \
+          "The clamping of the gain in the feedback loop for on-the-fly"    \
+          " PLAB resizing during a scavenge")                               \
+                                                                            \
   product(bool, AlwaysPreTouch, false,                                      \
           "It forces all freshly committed pages to be pre-touched.")       \
                                                                             \
   product(bool, CMSUseOldDefaults, false,                                   \
-          "A flag temporarily  introduced to allow reverting to some older" \
-          "default settings; older as of 6.0 ")                             \
+          "A flag temporarily introduced to allow reverting to some "       \
+          "older default settings; older as of 6.0")                        \
                                                                             \
   product(intx, CMSYoungGenPerWorker, 16*M,                                 \
           "The amount of young gen chosen by default per GC worker "        \
-          "thread available ")                                              \
+          "thread available")                                               \
                                                                             \
   product(bool, GCOverheadReporting, false,                                 \
          "Enables the GC overhead reporting facility")                      \
@@ -1376,43 +1422,71 @@
           "automatically adjusted")                                         \
                                                                             \
   product(uintx, CMSIncrementalDutyCycleMin, 0,                             \
-          "Lower bound on the duty cycle when CMSIncrementalPacing is"      \
-          "enabled (a percentage, 0-100).")                                 \
+          "Lower bound on the duty cycle when CMSIncrementalPacing is "     \
+          "enabled (a percentage, 0-100)")                                  \
                                                                             \
   product(uintx, CMSIncrementalSafetyFactor, 10,                            \
-          "Percentage (0-100) used to add conservatism when computing the"  \
-          "duty cycle.")                                                    \
+          "Percentage (0-100) used to add conservatism when computing the " \
+          "duty cycle")                                                     \
                                                                             \
   product(uintx, CMSIncrementalOffset, 0,                                   \
           "Percentage (0-100) by which the CMS incremental mode duty cycle" \
-          "is shifted to the right within the period between young GCs")    \
-                                                                            \
-  product(uintx, CMSExpAvgFactor, 25,                                       \
+          " is shifted to the right within the period between young GCs")   \
+                                                                            \
+  product(uintx, CMSExpAvgFactor, 50,                                       \
           "Percentage (0-100) used to weight the current sample when"       \
           "computing exponential averages for CMS statistics.")             \
                                                                             \
-  product(uintx, CMS_FLSWeight, 50,                                         \
+  product(uintx, CMS_FLSWeight, 75,                                         \
           "Percentage (0-100) used to weight the current sample when"       \
           "computing exponentially decating averages for CMS FLS statistics.") \
                                                                             \
-  product(uintx, CMS_FLSPadding, 2,                                         \
+  product(uintx, CMS_FLSPadding, 1,                                         \
           "The multiple of deviation from mean to use for buffering"        \
           "against volatility in free list demand.")                        \
                                                                             \
   product(uintx, FLSCoalescePolicy, 2,                                      \
           "CMS: Aggression level for coalescing, increasing from 0 to 4")   \
                                                                             \
-  product(uintx, CMS_SweepWeight, 50,                                       \
-          "Percentage (0-100) used to weight the current sample when"       \
-          "computing exponentially decaying average for inter-sweep duration.") \
-                                                                            \
-  product(uintx, CMS_SweepPadding, 2,                                       \
-          "The multiple of deviation from mean to use for buffering"        \
+  product(bool, FLSAlwaysCoalesceLarge, false,                              \
+          "CMS: Larger free blocks are always available for coalescing")    \
+                                                                            \
+  product(double, FLSLargestBlockCoalesceProximity, 0.99,                   \
+          "CMS: the smaller the percentage the greater the coalition force")\
+                                                                            \
+  product(double, CMSSmallCoalSurplusPercent, 1.05,                         \
+          "CMS: the factor by which to inflate estimated demand of small"   \
+          " block sizes to prevent coalescing with an adjoining block")     \
+                                                                            \
+  product(double, CMSLargeCoalSurplusPercent, 0.95,                         \
+          "CMS: the factor by which to inflate estimated demand of large"   \
+          " block sizes to prevent coalescing with an adjoining block")     \
+                                                                            \
+  product(double, CMSSmallSplitSurplusPercent, 1.10,                        \
+          "CMS: the factor by which to inflate estimated demand of small"   \
+          " block sizes to prevent splitting to supply demand for smaller"  \
+          " blocks")                                                        \
+                                                                            \
+  product(double, CMSLargeSplitSurplusPercent, 1.00,                        \
+          "CMS: the factor by which to inflate estimated demand of large"   \
+          " block sizes to prevent splitting to supply demand for smaller"  \
+          " blocks")                                                        \
+                                                                            \
+  product(bool, CMSExtrapolateSweep, false,                                 \
+          "CMS: cushion for block demand during sweep")                     \
+                                                                            \
+  product(uintx, CMS_SweepWeight, 75,                                       \
+          "Percentage (0-100) used to weight the current sample when "      \
+          "computing exponentially decaying average for inter-sweep "       \
+          "duration")                                                       \
+                                                                            \
+  product(uintx, CMS_SweepPadding, 1,                                       \
+          "The multiple of deviation from mean to use for buffering "       \
           "against volatility in inter-sweep duration.")                    \
                                                                             \
   product(uintx, CMS_SweepTimerThresholdMillis, 10,                         \
           "Skip block flux-rate sampling for an epoch unless inter-sweep "  \
-          " duration exceeds this threhold in milliseconds")                \
+          "duration exceeds this threhold in milliseconds")                 \
                                                                             \
   develop(bool, CMSTraceIncrementalMode, false,                             \
           "Trace CMS incremental mode")                                     \
@@ -1445,17 +1519,24 @@
   product(uintx, CMSIndexedFreeListReplenish, 4,                            \
           "Replenish and indexed free list with this number of chunks")     \
                                                                             \
+  product(bool, CMSReplenishIntermediate, true,                             \
+          "Replenish all intermediate free-list caches")                    \
+                                                                            \
+  product(bool, CMSSplitIndexedFreeListBlocks, true,                        \
+          "When satisfying batched demand, splot blocks from the "          \
+          "IndexedFreeList whose size is a multiple of requested size")     \
+                                                                            \
   product(bool, CMSLoopWarn, false,                                         \
           "Warn in case of excessive CMS looping")                          \
                                                                             \
   develop(bool, CMSOverflowEarlyRestoration, false,                         \
           "Whether preserved marks should be restored early")               \
                                                                             \
-  product(uintx, CMSMarkStackSize, NOT_LP64(32*K) LP64_ONLY(4*M),           \
-          "Size of CMS marking stack")                                      \
-                                                                            \
-  product(uintx, CMSMarkStackSizeMax, NOT_LP64(4*M) LP64_ONLY(512*M),       \
-          "Max size of CMS marking stack")                                  \
+  product(uintx, MarkStackSize, NOT_LP64(32*K) LP64_ONLY(4*M),              \
+          "Size of marking stack")                                          \
+                                                                            \
+  product(uintx, MarkStackSizeMax, NOT_LP64(4*M) LP64_ONLY(512*M),          \
+          "Max size of marking stack")                                      \
                                                                             \
   notproduct(bool, CMSMarkStackOverflowALot, false,                         \
           "Whether we should simulate frequent marking stack / work queue"  \
@@ -1579,6 +1660,18 @@
           "Bitmap operations should process at most this many bits"         \
           "between yields")                                                 \
                                                                             \
+  product(bool, CMSDumpAtPromotionFailure, false,                           \
+          "Dump useful information about the state of the CMS old "         \
+          " generation upon a promotion failure.")                          \
+                                                                            \
+  product(bool, CMSPrintChunksInDump, false,                                \
+          "In a dump enabled by CMSDumpAtPromotionFailure, include "        \
+          " more detailed information about the free chunks.")              \
+                                                                            \
+  product(bool, CMSPrintObjectsInDump, false,                               \
+          "In a dump enabled by CMSDumpAtPromotionFailure, include "        \
+          " more detailed information about the allocated objects.")        \
+                                                                            \
   diagnostic(bool, FLSVerifyAllHeapReferences, false,                       \
           "Verify that all refs across the FLS boundary "                   \
           " are to valid objects")                                          \
@@ -1613,35 +1706,43 @@
                                                                             \
   product(intx, CMSTriggerRatio, 80,                                        \
           "Percentage of MinHeapFreeRatio in CMS generation that is "       \
-          "  allocated before a CMS collection cycle commences")            \
+          "allocated before a CMS collection cycle commences")              \
                                                                             \
   product(intx, CMSTriggerPermRatio, 80,                                    \
-          "Percentage of MinHeapFreeRatio in the CMS perm generation that"  \
-          "  is allocated before a CMS collection cycle commences, that  "  \
-          "  also collects the perm generation")                            \
+          "Percentage of MinHeapFreeRatio in the CMS perm generation that " \
+          "is allocated before a CMS collection cycle commences, that "     \
+          "also collects the perm generation")                              \
                                                                             \
   product(uintx, CMSBootstrapOccupancy, 50,                                 \
           "Percentage CMS generation occupancy at which to "                \
-          " initiate CMS collection for bootstrapping collection stats")    \
+          "initiate CMS collection for bootstrapping collection stats")     \
                                                                             \
   product(intx, CMSInitiatingOccupancyFraction, -1,                         \
           "Percentage CMS generation occupancy to start a CMS collection "  \
-          " cycle (A negative value means that CMSTriggerRatio is used)")   \
+          "cycle. A negative value means that CMSTriggerRatio is used")     \
+                                                                            \
+  product(uintx, InitiatingHeapOccupancyPercent, 45,                        \
+          "Percentage of the (entire) heap occupancy to start a "           \
+          "concurrent GC cycle. It us used by GCs that trigger a "          \
+          "concurrent GC cycle based on the occupancy of the entire heap, " \
+          "not just one of the generations (e.g., G1). A value of 0 "       \
+          "denotes 'do constant GC cycles'.")                               \
                                                                             \
   product(intx, CMSInitiatingPermOccupancyFraction, -1,                     \
-          "Percentage CMS perm generation occupancy to start a CMScollection"\
-          " cycle (A negative value means that CMSTriggerPermRatio is used)")\
+          "Percentage CMS perm generation occupancy to start a "            \
+          "CMScollection cycle. A negative value means that "               \
+          "CMSTriggerPermRatio is used")                                    \
                                                                             \
   product(bool, UseCMSInitiatingOccupancyOnly, false,                       \
           "Only use occupancy as a crierion for starting a CMS collection") \
                                                                             \
   product(intx, CMSIsTooFullPercentage, 98,                                 \
-          "An absolute ceiling above which CMS will always consider the"    \
-          " perm gen ripe for collection")                                  \
+          "An absolute ceiling above which CMS will always consider the "   \
+          "perm gen ripe for collection")                                   \
                                                                             \
   develop(bool, CMSTestInFreeList, false,                                   \
           "Check if the coalesced range is already in the "                 \
-          "free lists as claimed.")                                         \
+          "free lists as claimed")                                          \
                                                                             \
   notproduct(bool, CMSVerifyReturnedBytes, false,                           \
           "Check that all the garbage collected was returned to the "       \
@@ -1659,8 +1760,12 @@
           "Enforce ScavengeALot/GCALot at all potential safepoints")        \
                                                                             \
   product(bool, HandlePromotionFailure, true,                               \
-          "The youngest generation collection does not require"             \
-          " a guarantee of full promotion of all live objects.")            \
+          "The youngest generation collection does not require "            \
+          "a guarantee of full promotion of all live objects.")             \
+                                                                            \
+  product(bool, PrintPromotionFailure, false,                               \
+          "Print additional diagnostic information following "              \
+          " promotion failure")                                             \
                                                                             \
   notproduct(bool, PromotionFailureALot, false,                             \
           "Use promotion failure handling on every youngest generation "    \
@@ -1688,7 +1793,7 @@
           "Ratio of hard spins to calls to yield")                          \
                                                                             \
   product(uintx, PreserveMarkStackSize, 1024,                               \
-           "Size for stack used in promotion failure handling")             \
+          "Size for stack used in promotion failure handling")              \
                                                                             \
   product_pd(bool, UseTLAB, "Use thread-local object allocation")           \
                                                                             \
@@ -1707,20 +1812,36 @@
   product(bool, TLABStats, true,                                            \
           "Print various TLAB related information")                         \
                                                                             \
+  product(bool, PrintRevisitStats, false,                                   \
+          "Print revisit (klass and MDO) stack related information")        \
+                                                                            \
   product_pd(bool, NeverActAsServerClassMachine,                            \
           "Never act like a server-class machine")                          \
                                                                             \
   product(bool, AlwaysActAsServerClassMachine, false,                       \
           "Always act like a server-class machine")                         \
                                                                             \
-  product_pd(uintx, DefaultMaxRAM,                                          \
-          "Maximum real memory size for setting server class heap size")    \
+  product_pd(uint64_t, MaxRAM,                                              \
+          "Real memory size (in bytes) used to set maximum heap size")      \
+                                                                            \
+  product(uintx, ErgoHeapSizeLimit, 0,                                      \
+          "Maximum ergonomically set heap size (in bytes); zero means use " \
+          "MaxRAM / MaxRAMFraction")                                        \
+                                                                            \
+  product(uintx, MaxRAMFraction, 4,                                         \
+          "Maximum fraction (1/n) of real memory used for maximum heap "    \
+          "size")                                                           \
                                                                             \
   product(uintx, DefaultMaxRAMFraction, 4,                                  \
-          "Fraction (1/n) of real memory used for server class max heap")   \
-                                                                            \
-  product(uintx, DefaultInitialRAMFraction, 64,                             \
-          "Fraction (1/n) of real memory used for server class initial heap")  \
+          "Maximum fraction (1/n) of real memory used for maximum heap "    \
+          "size; deprecated: to be renamed to MaxRAMFraction")              \
+                                                                            \
+  product(uintx, MinRAMFraction, 2,                                         \
+          "Minimum fraction (1/n) of real memory used for maxmimum heap "   \
+          "size on systems with small physical memory size")                \
+                                                                            \
+  product(uintx, InitialRAMFraction, 64,                                    \
+          "Fraction (1/n) of real memory used for initial heap size")       \
                                                                             \
   product(bool, UseAutoGCSelectPolicy, false,                               \
           "Use automatic collection selection policy")                      \
@@ -1771,7 +1892,7 @@
           "Number of collections before the adaptive sizing is started")    \
                                                                             \
   product(uintx, AdaptiveSizePolicyOutputInterval, 0,                       \
-          "Collecton interval for printing information, zero => never")     \
+          "Collecton interval for printing information; zero => never")     \
                                                                             \
   product(bool, UseAdaptiveSizePolicyFootprintGoal, true,                   \
           "Use adaptive minimum footprint as a goal")                       \
@@ -1801,7 +1922,8 @@
           "Allowed collection cost difference between generations")         \
                                                                             \
   product(uintx, AdaptiveSizePolicyCollectionCostMargin, 50,                \
-          "If collection costs are within margin, reduce both by full delta") \
+          "If collection costs are within margin, reduce both by full "     \
+          "delta")                                                          \
                                                                             \
   product(uintx, YoungGenerationSizeIncrement, 20,                          \
           "Adaptive size percentage change in young generation")            \
@@ -1897,6 +2019,10 @@
   diagnostic(bool, GCParallelVerificationEnabled, true,                     \
           "Enable parallel memory system verification")                     \
                                                                             \
+  diagnostic(bool, DeferInitialCardMark, false,                             \
+          "When +ReduceInitialCardMarks, explicitly defer any that "        \
+           "may arise from new_pre_store_barrier")                          \
+                                                                            \
   diagnostic(bool, VerifyRememberedSets, false,                             \
           "Verify GC remembered sets")                                      \
                                                                             \
@@ -1935,9 +2061,6 @@
           "number of times a GC thread (minus the coordinator) "            \
           "will sleep while yielding before giving up and resuming GC")     \
                                                                             \
-  notproduct(bool, PrintFlagsFinal, false,                                  \
-          "Print all command line flags after argument processing")         \
-                                                                            \
   /* gc tracing */                                                          \
   manageable(bool, PrintGC, false,                                          \
           "Print message at garbage collect")                               \
@@ -2166,6 +2289,10 @@
           "print safepoint statistics only when safepoint takes"            \
           " more than PrintSafepointSatisticsTimeout in millis")            \
                                                                             \
+  product(bool, TraceSafepointCleanupTime, false,                           \
+          "print the break down of clean up tasks performed during"         \
+          " safepoint")                                                     \
+                                                                            \
   develop(bool, InlineAccessors, true,                                      \
           "inline accessor methods (get/set)")                              \
                                                                             \
@@ -2237,11 +2364,20 @@
          "If false, restricts profiled locations to the root method only")  \
                                                                             \
   product(bool, PrintVMOptions, trueInDebug,                                \
-         "print VM flag settings")                                          \
+         "Print flags that appeared on the command line")                   \
                                                                             \
   product(bool, IgnoreUnrecognizedVMOptions, false,                         \
          "Ignore unrecognized VM options")                                  \
                                                                             \
+  product(bool, PrintCommandLineFlags, false,                               \
+         "Print flags specified on command line or set by ergonomics")      \
+                                                                            \
+  product(bool, PrintFlagsInitial, false,                                   \
+         "Print all VM flags before argument processing and exit VM")       \
+                                                                            \
+  product(bool, PrintFlagsFinal, false,                                     \
+         "Print all VM flags after argument and ergonomic processing")      \
+                                                                            \
   diagnostic(bool, SerializeVMOutput, true,                                 \
          "Use a mutex to serialize output to tty and hotspot.log")          \
                                                                             \
@@ -2322,6 +2458,9 @@
   notproduct(bool, CompileTheWorldIgnoreInitErrors, false,                  \
           "Compile all methods although class initializer failed")          \
                                                                             \
+  notproduct(intx, CompileTheWorldSafepointInterval, 100,                   \
+          "Force a safepoint every n compiles so sweeper can keep up")      \
+                                                                            \
   develop(bool, TraceIterativeGVN, false,                                   \
           "Print progress during Iterative Global Value Numbering")         \
                                                                             \
@@ -2520,8 +2659,11 @@
                                                                             \
   develop(bool, VerifyCompiledCode, false,                                  \
           "Include miscellaneous runtime verifications in nmethod code; "   \
-          "off by default because it disturbs nmethod size heuristics.")    \
-                                                                            \
+          "default off because it disturbs nmethod size heuristics")        \
+                                                                            \
+  notproduct(bool, CrashGCForDumpingJavaThread, false,                      \
+          "Manually make GC thread crash then dump java stack trace;  "     \
+          "Test only")                                                      \
                                                                             \
   /* compilation */                                                         \
   product(bool, UseCompiler, true,                                          \
@@ -2637,10 +2779,10 @@
   notproduct(intx, MaxSubklassPrintSize, 4,                                 \
           "maximum number of subklasses to print when printing klass")      \
                                                                             \
-  develop(intx, MaxInlineLevel, 9,                                          \
+  product(intx, MaxInlineLevel, 9,                                          \
           "maximum number of nested calls that are inlined")                \
                                                                             \
-  develop(intx, MaxRecursiveInlineLevel, 1,                                 \
+  product(intx, MaxRecursiveInlineLevel, 1,                                 \
           "maximum number of nested recursive calls that are inlined")      \
                                                                             \
   product_pd(intx, InlineSmallCode,                                         \
@@ -2653,10 +2795,10 @@
   product_pd(intx, FreqInlineSize,                                          \
           "maximum bytecode size of a frequent method to be inlined")       \
                                                                             \
-  develop(intx, MaxTrivialSize, 6,                                          \
+  product(intx, MaxTrivialSize, 6,                                          \
           "maximum bytecode size of a trivial method to be inlined")        \
                                                                             \
-  develop(intx, MinInliningThreshold, 250,                                  \
+  product(intx, MinInliningThreshold, 250,                                  \
           "min. invocation count a method needs to have to be inlined")     \
                                                                             \
   develop(intx, AlignEntryCode, 4,                                          \
@@ -2733,7 +2875,7 @@
   product(intx, PerMethodRecompilationCutoff, 400,                          \
           "After recompiling N times, stay in the interpreter (-1=>'Inf')") \
                                                                             \
-  product(intx, PerBytecodeRecompilationCutoff, 100,                        \
+  product(intx, PerBytecodeRecompilationCutoff, 200,                        \
           "Per-BCI limit on repeated recompilation (-1=>'Inf')")            \
                                                                             \
   product(intx, PerMethodTrapLimit,  100,                                   \
@@ -2782,20 +2924,28 @@
           "an OS lock")                                                     \
                                                                             \
   /* gc parameters */                                                       \
-  product(uintx, MaxHeapSize, ScaleForWordSize(64*M),                       \
-          "Default maximum size for object heap (in bytes)")                \
-                                                                            \
-  product_pd(uintx, NewSize,                                                \
-          "Default size of new generation (in bytes)")                      \
+  product(uintx, InitialHeapSize, 0,                                        \
+          "Initial heap size (in bytes); zero means OldSize + NewSize")     \
+                                                                            \
+  product(uintx, MaxHeapSize, ScaleForWordSize(96*M),                       \
+          "Maximum heap size (in bytes)")                                   \
+                                                                            \
+  product(uintx, OldSize, ScaleForWordSize(4*M),                            \
+          "Initial tenured generation size (in bytes)")                     \
+                                                                            \
+  product(uintx, NewSize, ScaleForWordSize(1*M),                            \
+          "Initial new generation size (in bytes)")                         \
                                                                             \
   product(uintx, MaxNewSize, max_uintx,                                     \
-          "Maximum size of new generation (in bytes)")                      \
+          "Maximum new generation size (in bytes), max_uintx means set "    \
+          "ergonomically")                                                  \
                                                                             \
   product(uintx, PretenureSizeThreshold, 0,                                 \
-          "Max size in bytes of objects allocated in DefNew generation")    \
-                                                                            \
-  product_pd(uintx, TLABSize,                                               \
-          "Default (or starting) size of TLAB (in bytes)")                  \
+          "Maximum size in bytes of objects allocated in DefNew "           \
+          "generation; zero means no maximum")                              \
+                                                                            \
+  product(uintx, TLABSize, 0,                                               \
+          "Starting TLAB size (in bytes); zero means set ergonomically")    \
                                                                             \
   product(uintx, MinTLABSize, 2*K,                                          \
           "Minimum allowed TLAB size (in bytes)")                           \
@@ -2812,10 +2962,10 @@
   product(uintx, TLABWasteIncrement,    4,                                  \
           "Increment allowed waste at slow allocation")                     \
                                                                             \
-  product_pd(intx, SurvivorRatio,                                           \
+  product(intx, SurvivorRatio, 8,                                           \
           "Ratio of eden/survivor space size")                              \
                                                                             \
-  product_pd(intx, NewRatio,                                                \
+  product(intx, NewRatio, 2,                                                \
           "Ratio of new/old generation sizes")                              \
                                                                             \
   product(uintx, MaxLiveObjectEvacuationRatio, 100,                         \
@@ -2825,11 +2975,8 @@
           "Additional size added to desired new generation size per "       \
           "non-daemon thread (in bytes)")                                   \
                                                                             \
-  product(uintx, OldSize, ScaleForWordSize(4096*K),                         \
-          "Default size of tenured generation (in bytes)")                  \
-                                                                            \
   product_pd(uintx, PermSize,                                               \
-          "Default size of permanent generation (in bytes)")                \
+          "Initial size of permanent generation (in bytes)")                \
                                                                             \
   product_pd(uintx, MaxPermSize,                                            \
           "Maximum size of permanent generation (in bytes)")                \
@@ -2981,6 +3128,15 @@
   notproduct(bool, ExitOnFullCodeCache, false,                              \
           "Exit the VM if we fill the code cache.")                         \
                                                                             \
+  product(bool, UseCodeCacheFlushing, false,                                \
+          "Attempt to clean the code cache before shutting off compiler")   \
+                                                                            \
+  product(intx,  MinCodeCacheFlushingInterval, 30,                          \
+          "Min number of seconds between code cache cleaning sessions")     \
+                                                                            \
+  product(uintx,  CodeCacheFlushingMinimumFreeSpace, 1500*K,                \
+          "When less than X space left, start code cache cleaning")         \
+                                                                            \
   /* interpreter debugging */                                               \
   develop(intx, BinarySwitchThreshold, 5,                                   \
           "Minimal number of lookupswitch entries for rewriting to binary " \
@@ -3327,6 +3483,9 @@
   diagnostic(bool, OptimizeMethodHandles, true,                             \
           "when constructing method handles, try to improve them")          \
                                                                             \
+  experimental(bool, TrustFinalNonStaticFields, false,                      \
+          "trust final non-static declarations for constant folding")       \
+                                                                            \
   experimental(bool, EnableInvokeDynamic, false,                            \
           "recognize the invokedynamic instruction")                        \
                                                                             \
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/globals_extension.hpp
--- a/src/share/vm/runtime/globals_extension.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/globals_extension.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -64,6 +64,7 @@
 #define C2_PRODUCT_FLAG_MEMBER(type, name, value, doc)         FLAG_MEMBER(name),
 #define C2_PD_PRODUCT_FLAG_MEMBER(type, name, doc)             FLAG_MEMBER(name),
 #define C2_DIAGNOSTIC_FLAG_MEMBER(type, name, value, doc)      FLAG_MEMBER(name),
+#define C2_EXPERIMENTAL_FLAG_MEMBER(type, name, value, doc)    FLAG_MEMBER(name),
 #ifdef PRODUCT
   #define C2_DEVELOP_FLAG_MEMBER(type, name, value, doc)       /* flag is constant */
   #define C2_PD_DEVELOP_FLAG_MEMBER(type, name, doc)           /* flag is constant */
@@ -84,7 +85,7 @@
  C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER)
 #endif
 #ifdef COMPILER2
- C2_FLAGS(C2_DEVELOP_FLAG_MEMBER, C2_PD_DEVELOP_FLAG_MEMBER, C2_PRODUCT_FLAG_MEMBER, C2_PD_PRODUCT_FLAG_MEMBER, C2_DIAGNOSTIC_FLAG_MEMBER, C2_NOTPRODUCT_FLAG_MEMBER)
+ C2_FLAGS(C2_DEVELOP_FLAG_MEMBER, C2_PD_DEVELOP_FLAG_MEMBER, C2_PRODUCT_FLAG_MEMBER, C2_PD_PRODUCT_FLAG_MEMBER, C2_DIAGNOSTIC_FLAG_MEMBER, C2_EXPERIMENTAL_FLAG_MEMBER, C2_NOTPRODUCT_FLAG_MEMBER)
 #endif
  NUM_CommandLineFlag
 } CommandLineFlag;
@@ -130,6 +131,7 @@
 #define C2_PRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, value, doc)         FLAG_MEMBER_WITH_TYPE(name,type),
 #define C2_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, doc)             FLAG_MEMBER_WITH_TYPE(name,type),
 #define C2_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE(type, name, value, doc)      FLAG_MEMBER_WITH_TYPE(name,type),
+#define C2_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE(type, name, value, doc)      FLAG_MEMBER_WITH_TYPE(name,type),
 #ifdef PRODUCT
   #define C2_DEVELOP_FLAG_MEMBER_WITH_TYPE(type, name, value, doc)       /* flag is constant */
   #define C2_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE(type, name, doc)           /* flag is constant */
@@ -181,6 +183,7 @@
           C2_PRODUCT_FLAG_MEMBER_WITH_TYPE,
           C2_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
           C2_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
+          C2_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE,
           C2_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE)
 #endif
  NUM_CommandLineFlagWithType
@@ -202,6 +205,7 @@
   static void boolAtPut(CommandLineFlagWithType flag, bool value, FlagValueOrigin origin);
   static void intxAtPut(CommandLineFlagWithType flag, intx value, FlagValueOrigin origin);
   static void uintxAtPut(CommandLineFlagWithType flag, uintx value, FlagValueOrigin origin);
+  static void uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, FlagValueOrigin origin);
   static void doubleAtPut(CommandLineFlagWithType flag, double value, FlagValueOrigin origin);
   static void ccstrAtPut(CommandLineFlagWithType flag, ccstr value, FlagValueOrigin origin);
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/jniHandles.cpp
--- a/src/share/vm/runtime/jniHandles.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/jniHandles.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -144,7 +144,7 @@
   EXCEPTION_MARK;
   // We will never reach the CATCH below since Exceptions::_throw will cause
   // the VM to exit if an exception is thrown during initialization
-  klassOop k      = SystemDictionary::object_klass();
+  klassOop k      = SystemDictionary::Object_klass();
   _deleted_handle = instanceKlass::cast(k)->allocate_permanent_instance(CATCH);
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/jniHandles.hpp
--- a/src/share/vm/runtime/jniHandles.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/jniHandles.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 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
@@ -99,6 +99,8 @@
 
 class JNIHandleBlock : public CHeapObj {
   friend class VMStructs;
+  friend class CppInterpreter;
+
  private:
   enum SomeConstants {
     block_size_in_oops  = 32                    // Number of handles per handle block
@@ -126,9 +128,11 @@
   // Fill block with bad_handle values
   void zap();
 
+ protected:
   // No more handles in the both the current and following blocks
   void clear() { _top = 0; }
 
+ private:
   // Free list computation
   void rebuild_free_list();
 
@@ -196,12 +200,16 @@
 };
 
 inline methodOop JNIHandles::checked_resolve_jmethod_id(jmethodID mid) {
-  jobject handle = (jobject)mid;
-  if (is_weak_global_handle(handle)) {
-    return (methodOop) resolve_non_null(handle);
-  } else {
+  if (mid == NULL) {
     return (methodOop) NULL;
   }
+
+  oop o = resolve_non_null((jobject) mid);
+  if (!o->is_method()) {
+    return (methodOop) NULL;
+  }
+
+  return (methodOop) o;
 };
 
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/mutex.hpp
--- a/src/share/vm/runtime/mutex.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/mutex.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -61,18 +61,10 @@
 } ;
 
 // Endian-ness ... index of least-significant byte in SplitWord.Bytes[]
-#ifdef AMD64        // little
- #define _LSBINDEX 0
-#else
-#if IA32            // little
+#ifdef VM_LITTLE_ENDIAN
  #define _LSBINDEX 0
 #else
-#ifdef SPARC        // big
  #define _LSBINDEX (sizeof(intptr_t)-1)
-#else
- #error "unknown architecture"
-#endif
-#endif
 #endif
 
 class ParkEvent ;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/os.cpp
--- a/src/share/vm/runtime/os.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/os.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -280,7 +280,7 @@
                            string,
                            CHECK);
 
-    KlassHandle group(THREAD, SystemDictionary::threadGroup_klass());
+    KlassHandle group(THREAD, SystemDictionary::ThreadGroup_klass());
     JavaCalls::call_special(&result,
                             thread_group,
                             group,
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/os.hpp
--- a/src/share/vm/runtime/os.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/os.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -60,24 +60,26 @@
 typedef void (*java_call_t)(JavaValue* value, methodHandle* method, JavaCallArguments* args, Thread* thread);
 
 class os: AllStatic {
- private:
+ public:
   enum { page_sizes_max = 9 }; // Size of _page_sizes array (8 plus a sentinel)
 
+ private:
   static OSThread*          _starting_thread;
   static address            _polling_page;
   static volatile int32_t * _mem_serialize_page;
   static uintptr_t          _serialize_page_mask;
+ public:
   static size_t             _page_sizes[page_sizes_max];
 
+ private:
   static void init_page_sizes(size_t default_page_size) {
     _page_sizes[0] = default_page_size;
     _page_sizes[1] = 0; // sentinel
   }
 
  public:
-
-  static void init(void);                       // Called before command line parsing
-  static jint init_2(void);                    // Called after command line parsing
+  static void init(void);   // Called before command line parsing
+  static jint init_2(void); // Called after command line parsing
 
   // File names are case-insensitive on windows only
   // Override me as needed
@@ -141,6 +143,7 @@
   static int processor_count() {
     return _processor_count;
   }
+  static void set_processor_count(int count) { _processor_count = count; }
 
   // Returns the number of CPUs this process is currently allowed to run on.
   // Note that on some OSes this can change dynamically.
@@ -215,6 +218,9 @@
 
   static bool   guard_memory(char* addr, size_t bytes);
   static bool   unguard_memory(char* addr, size_t bytes);
+  static bool   create_stack_guard_pages(char* addr, size_t bytes);
+  static bool   remove_stack_guard_pages(char* addr, size_t bytes);
+
   static char*  map_memory(int fd, const char* file_name, size_t file_offset,
                            char *addr, size_t bytes, bool read_only = false,
                            bool allow_exec = false);
@@ -294,19 +300,16 @@
   }
 
   static bool    is_memory_serialize_page(JavaThread *thread, address addr) {
-    address thr_addr;
     if (UseMembar) return false;
-    // Calculate thread specific address
+    // Previously this function calculated the exact address of this
+    // thread's serialize page, and checked if the faulting address
+    // was equal.  However, some platforms mask off faulting addresses
+    // to the page size, so now we just check that the address is
+    // within the page.  This makes the thread argument unnecessary,
+    // but we retain the NULL check to preserve existing behaviour.
     if (thread == NULL) return false;
-    // TODO-FIXME: some platforms mask off faulting addresses to the base pagesize.
-    // Instead of using a test for equality we should probably use something
-    // of the form:
-    // return ((_mem_serialize_page ^ addr) & -pagesize) == 0
-    //
-    thr_addr  = (address)(((uintptr_t)thread >>
-                get_serialize_page_shift_count()) &
-                get_serialize_page_mask()) + (uintptr_t)_mem_serialize_page;
-    return  (thr_addr == addr);
+    address page = (address) _mem_serialize_page;
+    return addr >= page && addr < (page + os::vm_page_size());
   }
 
   static void block_on_serialize_page_trap();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/perfData.hpp
--- a/src/share/vm/runtime/perfData.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/perfData.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/reflection.cpp
--- a/src/share/vm/runtime/reflection.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/reflection.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -449,7 +449,7 @@
   // sun/reflect/MagicAccessorImpl subclasses to succeed trivially.
   if (   JDK_Version::is_gte_jdk14x_version()
       && UseNewReflection
-      && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_magic_klass())) {
+      && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) {
     return true;
   }
 
@@ -482,6 +482,11 @@
       under_host_klass(accessee_ik, accessor))
     return true;
 
+  // Adapter frames can access anything.
+  if (MethodHandleCompiler::klass_is_method_handle_adapter_holder(accessor))
+    // This is an internal adapter frame from the MethodHandleCompiler.
+    return true;
+
   if (RelaxAccessControlCheck ||
       (accessor_ik->major_version() < JAVA_1_5_VERSION &&
        accessee_ik->major_version() < JAVA_1_5_VERSION)) {
@@ -541,7 +546,7 @@
   // sun/reflect/MagicAccessorImpl subclasses to succeed trivially.
   if (   JDK_Version::is_gte_jdk14x_version()
       && UseNewReflection
-      && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_magic_klass())) {
+      && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) {
     return true;
   }
 
@@ -631,7 +636,7 @@
 
 objArrayHandle Reflection::get_parameter_types(methodHandle method, int parameter_count, oop* return_type, TRAPS) {
   // Allocate array holding parameter types (java.lang.Class instances)
-  objArrayOop m = oopFactory::new_objArray(SystemDictionary::class_klass(), parameter_count, CHECK_(objArrayHandle()));
+  objArrayOop m = oopFactory::new_objArray(SystemDictionary::Class_klass(), parameter_count, CHECK_(objArrayHandle()));
   objArrayHandle mirrors (THREAD, m);
   int index = 0;
   // Collect parameter types
@@ -1308,7 +1313,7 @@
   if (Klass::cast(klass)->oop_is_array() && which == MEMBER_DECLARED)  return NULL;
 
   if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) {
-    klass = SystemDictionary::object_klass();
+    klass = SystemDictionary::Object_klass();
   }
   instanceKlassHandle h_k(THREAD, klass);
 
@@ -1375,13 +1380,13 @@
   // Exclude primitive types
   if (java_lang_Class::is_primitive(mirror) ||
      (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array() && (which == MEMBER_DECLARED))) {
-    klassOop klass = SystemDictionary::reflect_method_klass();
+    klassOop klass = SystemDictionary::reflect_Method_klass();
     return oopFactory::new_objArray(klass, 0, CHECK_NULL);  // Return empty array
   }
 
   klassOop klass = java_lang_Class::as_klassOop(mirror);
   if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) {
-    klass = SystemDictionary::object_klass();
+    klass = SystemDictionary::Object_klass();
   }
   instanceKlassHandle h_k(THREAD, klass);
 
@@ -1411,7 +1416,7 @@
         }
 
         // Allocate result
-        klassOop klass = SystemDictionary::reflect_method_klass();
+        klassOop klass = SystemDictionary::reflect_Method_klass();
         objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL);
         objArrayHandle h_result (THREAD, r);
 
@@ -1462,7 +1467,7 @@
           }
         }
         // Allocate result
-        klassOop klass = SystemDictionary::reflect_method_klass();
+        klassOop klass = SystemDictionary::reflect_Method_klass();
         objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL);
         objArrayHandle h_result (THREAD, r);
 
@@ -1523,7 +1528,7 @@
   bool prim  = java_lang_Class::is_primitive(mirror);
   Klass* k = prim ? NULL : Klass::cast(java_lang_Class::as_klassOop(mirror));
   if (prim || k->is_interface() || k->oop_is_array()) {
-    return oopFactory::new_objArray(SystemDictionary::reflect_constructor_klass(), 0, CHECK_NULL);  // Return empty array
+    return oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), 0, CHECK_NULL);  // Return empty array
   }
 
   // Must be instanceKlass at this point
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/reflectionUtils.cpp
--- a/src/share/vm/runtime/reflectionUtils.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/reflectionUtils.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -63,15 +63,15 @@
 void FilteredFieldsMap::initialize() {
   int offset;
   offset = java_lang_Throwable::get_backtrace_offset();
-  _filtered_fields->append(new FilteredField(SystemDictionary::throwable_klass(), offset));
+  _filtered_fields->append(new FilteredField(SystemDictionary::Throwable_klass(), offset));
   // The latest version of vm may be used with old jdk.
   if (JDK_Version::is_gte_jdk16x_version()) {
     // The following class fields do not exist in
     // previous version of jdk.
     offset = sun_reflect_ConstantPool::cp_oop_offset();
-    _filtered_fields->append(new FilteredField(SystemDictionary::reflect_constant_pool_klass(), offset));
+    _filtered_fields->append(new FilteredField(SystemDictionary::reflect_ConstantPool_klass(), offset));
     offset = sun_reflect_UnsafeStaticFieldAccessorImpl::base_offset();
-    _filtered_fields->append(new FilteredField(SystemDictionary::reflect_unsafe_static_field_accessor_impl_klass(), offset));
+    _filtered_fields->append(new FilteredField(SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass(), offset));
   }
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/safepoint.cpp
--- a/src/share/vm/runtime/safepoint.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/safepoint.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -30,8 +30,8 @@
 
 SafepointSynchronize::SynchronizeState volatile SafepointSynchronize::_state = SafepointSynchronize::_not_synchronized;
 volatile int  SafepointSynchronize::_waiting_to_block = 0;
-jlong SafepointSynchronize::_last_safepoint = 0;
 volatile int SafepointSynchronize::_safepoint_counter = 0;
+long  SafepointSynchronize::_end_of_last_safepoint = 0;
 static volatile int PageArmed = 0 ;        // safepoint polling page is RO|RW vs PROT_NONE
 static volatile int TryingToBlock = 0 ;    // proximate value -- for advisory use only
 static bool timeout_error_printed = false;
@@ -42,7 +42,10 @@
   Thread* myThread = Thread::current();
   assert(myThread->is_VM_thread(), "Only VM thread may execute a safepoint");
 
-  _last_safepoint = os::javaTimeNanos();
+  if (PrintSafepointStatistics || PrintSafepointStatisticsTimeout > 0) {
+    _safepoint_begin_time = os::javaTimeNanos();
+    _ts_of_current_safepoint = tty->time_stamp().seconds();
+  }
 
 #ifndef SERIALGC
   if (UseConcMarkSweepGC) {
@@ -81,6 +84,14 @@
   jlong safepoint_limit_time;
   timeout_error_printed = false;
 
+  // PrintSafepointStatisticsTimeout can be specified separately. When
+  // specified, PrintSafepointStatistics will be set to true in
+  // deferred_initialize_stat method. The initialization has to be done
+  // early enough to avoid any races. See bug 6880029 for details.
+  if (PrintSafepointStatistics || PrintSafepointStatisticsTimeout > 0) {
+    deferred_initialize_stat();
+  }
+
   // Begin the process of bringing the system to a safepoint.
   // Java threads can be in several different states and are
   // stopped by different mechanisms:
@@ -169,8 +180,7 @@
       }
     }
 
-    if ( (PrintSafepointStatistics || (PrintSafepointStatisticsTimeout > 0))
-         && iterations == 0) {
+    if (PrintSafepointStatistics && iterations == 0) {
       begin_statistics(nof_threads, still_running);
     }
 
@@ -313,6 +323,11 @@
 
   // Call stuff that needs to be run when a safepoint is just about to be completed
   do_cleanup_tasks();
+
+  if (PrintSafepointStatistics) {
+    // Record how much time spend on the above cleanup tasks
+    update_statistics_on_cleanup_end(os::javaTimeNanos());
+  }
   }
 }
 
@@ -404,6 +419,9 @@
     ConcurrentGCThread::safepoint_desynchronize();
   }
 #endif // SERIALGC
+  // record this time so VMThread can keep track how much time has elasped
+  // since last safepoint.
+  _end_of_last_safepoint = os::javaTimeMillis();
 }
 
 bool SafepointSynchronize::is_cleanup_needed() {
@@ -438,24 +456,23 @@
 
 // Various cleaning tasks that should be done periodically at safepoints
 void SafepointSynchronize::do_cleanup_tasks() {
-  jlong cleanup_time;
-
-  // Update fat-monitor pool, since this is a safepoint.
-  if (TraceSafepoint) {
-    cleanup_time = os::javaTimeNanos();
+  {
+    TraceTime t1("deflating idle monitors", TraceSafepointCleanupTime);
+    ObjectSynchronizer::deflate_idle_monitors();
   }
 
-  ObjectSynchronizer::deflate_idle_monitors();
-  InlineCacheBuffer::update_inline_caches();
+  {
+    TraceTime t2("updating inline caches", TraceSafepointCleanupTime);
+    InlineCacheBuffer::update_inline_caches();
+  }
+
   if(UseCounterDecay && CounterDecay::is_decay_needed()) {
+    TraceTime t3("decaying counter", TraceSafepointCleanupTime);
     CounterDecay::decay();
   }
+
+  TraceTime t4("sweeping nmethods", TraceSafepointCleanupTime);
   NMethodSweeper::sweep();
-
-  if (TraceSafepoint) {
-    tty->print_cr("do_cleanup_tasks takes "INT64_FORMAT_W(6) "ms",
-                  (os::javaTimeNanos() - cleanup_time) / MICROUNITS);
-  }
 }
 
 
@@ -769,9 +786,23 @@
   // to grab the Threads_lock which we own here, so a thread cannot be
   // resumed during safepoint synchronization.
 
-  // We check with locking because another thread that has not yet
-  // synchronized may be trying to suspend this one.
-  bool is_suspended = _thread->is_any_suspended_with_lock();
+  // We check to see if this thread is suspended without locking to
+  // avoid deadlocking with a third thread that is waiting for this
+  // thread to be suspended. The third thread can notice the safepoint
+  // that we're trying to start at the beginning of its SR_lock->wait()
+  // call. If that happens, then the third thread will block on the
+  // safepoint while still holding the underlying SR_lock. We won't be
+  // able to get the SR_lock and we'll deadlock.
+  //
+  // We don't need to grab the SR_lock here for two reasons:
+  // 1) The suspend flags are both volatile and are set with an
+  //    Atomic::cmpxchg() call so we should see the suspended
+  //    state right away.
+  // 2) We're being called from the safepoint polling loop; if
+  //    we don't see the suspended state on this iteration, then
+  //    we'll come around again.
+  //
+  bool is_suspended = _thread->is_ext_suspended();
   if (is_suspended) {
     roll_forward(_at_safepoint);
     return;
@@ -958,17 +989,32 @@
 //                     Statistics & Instrumentations
 //
 SafepointSynchronize::SafepointStats*  SafepointSynchronize::_safepoint_stats = NULL;
+jlong  SafepointSynchronize::_safepoint_begin_time = 0;
 int    SafepointSynchronize::_cur_stat_index = 0;
 julong SafepointSynchronize::_safepoint_reasons[VM_Operation::VMOp_Terminating];
 julong SafepointSynchronize::_coalesced_vmop_count = 0;
 jlong  SafepointSynchronize::_max_sync_time = 0;
+jlong  SafepointSynchronize::_max_vmop_time = 0;
+float  SafepointSynchronize::_ts_of_current_safepoint = 0.0f;
 
-// last_safepoint_start_time records the start time of last safepoint.
-static jlong  last_safepoint_start_time = 0;
-static jlong  sync_end_time = 0;
+static jlong  cleanup_end_time = 0;
 static bool   need_to_track_page_armed_status = false;
 static bool   init_done = false;
 
+// Helper method to print the header.
+static void print_header() {
+  tty->print("         vmop                    "
+             "[threads: total initially_running wait_to_block]    ");
+  tty->print("[time: spin block sync cleanup vmop] ");
+
+  // no page armed status printed out if it is always armed.
+  if (need_to_track_page_armed_status) {
+    tty->print("page_armed ");
+  }
+
+  tty->print_cr("page_trap_count");
+}
+
 void SafepointSynchronize::deferred_initialize_stat() {
   if (init_done) return;
 
@@ -995,26 +1041,14 @@
   if (UseCompilerSafepoints && DeferPollingPageLoopCount >= 0) {
     need_to_track_page_armed_status = true;
   }
-
-  tty->print("     vmop_name               "
-             "[threads: total initially_running wait_to_block] ");
-  tty->print("[time: spin block sync] "
-             "[vmop_time  time_elapsed] ");
-
-  // no page armed status printed out if it is always armed.
-  if (need_to_track_page_armed_status) {
-    tty->print("page_armed ");
-  }
-
-  tty->print_cr("page_trap_count");
-
   init_done = true;
 }
 
 void SafepointSynchronize::begin_statistics(int nof_threads, int nof_running) {
-  deferred_initialize_stat();
+  assert(init_done, "safepoint statistics array hasn't been initialized");
+  SafepointStats *spstat = &_safepoint_stats[_cur_stat_index];
 
-  SafepointStats *spstat = &_safepoint_stats[_cur_stat_index];
+  spstat->_time_stamp = _ts_of_current_safepoint;
 
   VM_Operation *op = VMThread::vm_operation();
   spstat->_vmop_type = (op != NULL ? op->type() : -1);
@@ -1034,14 +1068,6 @@
   }  else {
     spstat->_time_to_spin = 0;
   }
-
-  if (last_safepoint_start_time == 0) {
-    spstat->_time_elapsed_since_last_safepoint = 0;
-  } else {
-    spstat->_time_elapsed_since_last_safepoint = _last_safepoint -
-      last_safepoint_start_time;
-  }
-  last_safepoint_start_time = _last_safepoint;
 }
 
 void SafepointSynchronize::update_statistics_on_spin_end() {
@@ -1077,18 +1103,31 @@
   // Records the end time of sync which will be used to calculate the total
   // vm operation time. Again, the real time spending in syncing will be deducted
   // from the start of the sync time later when end_statistics is called.
-  spstat->_time_to_sync = end_time - _last_safepoint;
+  spstat->_time_to_sync = end_time - _safepoint_begin_time;
   if (spstat->_time_to_sync > _max_sync_time) {
     _max_sync_time = spstat->_time_to_sync;
   }
-  sync_end_time = end_time;
+
+  spstat->_time_to_do_cleanups = end_time;
+}
+
+void SafepointSynchronize::update_statistics_on_cleanup_end(jlong end_time) {
+  SafepointStats *spstat = &_safepoint_stats[_cur_stat_index];
+
+  // Record how long spent in cleanup tasks.
+  spstat->_time_to_do_cleanups = end_time - spstat->_time_to_do_cleanups;
+
+  cleanup_end_time = end_time;
 }
 
 void SafepointSynchronize::end_statistics(jlong vmop_end_time) {
   SafepointStats *spstat = &_safepoint_stats[_cur_stat_index];
 
   // Update the vm operation time.
-  spstat->_time_to_exec_vmop = vmop_end_time -  sync_end_time;
+  spstat->_time_to_exec_vmop = vmop_end_time -  cleanup_end_time;
+  if (spstat->_time_to_exec_vmop > _max_vmop_time) {
+    _max_vmop_time = spstat->_time_to_exec_vmop;
+  }
   // Only the sync time longer than the specified
   // PrintSafepointStatisticsTimeout will be printed out right away.
   // By default, it is -1 meaning all samples will be put into the list.
@@ -1099,40 +1138,42 @@
   } else {
     // The safepoint statistics will be printed out when the _safepoin_stats
     // array fills up.
-    if (_cur_stat_index != PrintSafepointStatisticsCount - 1) {
-      _cur_stat_index ++;
-    } else {
+    if (_cur_stat_index == PrintSafepointStatisticsCount - 1) {
       print_statistics();
       _cur_stat_index = 0;
-      tty->print_cr("");
+    } else {
+      _cur_stat_index++;
     }
   }
 }
 
 void SafepointSynchronize::print_statistics() {
-  int index;
   SafepointStats* sstats = _safepoint_stats;
 
-  for (index = 0; index <= _cur_stat_index; index++) {
+  for (int index = 0; index <= _cur_stat_index; index++) {
+    if (index % 30 == 0) {
+      print_header();
+    }
     sstats = &_safepoint_stats[index];
-    tty->print("%-28s       ["
+    tty->print("%.3f: ", sstats->_time_stamp);
+    tty->print("%-26s       ["
                INT32_FORMAT_W(8)INT32_FORMAT_W(11)INT32_FORMAT_W(15)
-               "]   ",
+               "    ]    ",
                sstats->_vmop_type == -1 ? "no vm operation" :
                VM_Operation::name(sstats->_vmop_type),
                sstats->_nof_total_threads,
                sstats->_nof_initial_running_threads,
                sstats->_nof_threads_wait_to_block);
     // "/ MICROUNITS " is to convert the unit from nanos to millis.
-    tty->print("       ["
-               INT64_FORMAT_W(6)INT64_FORMAT_W(6)INT64_FORMAT_W(6)
-               "]     "
-               "["INT64_FORMAT_W(6)INT64_FORMAT_W(9) "]          ",
+    tty->print("  ["
+               INT64_FORMAT_W(6)INT64_FORMAT_W(6)
+               INT64_FORMAT_W(6)INT64_FORMAT_W(6)
+               INT64_FORMAT_W(6)"    ]  ",
                sstats->_time_to_spin / MICROUNITS,
                sstats->_time_to_wait_to_block / MICROUNITS,
                sstats->_time_to_sync / MICROUNITS,
-               sstats->_time_to_exec_vmop / MICROUNITS,
-               sstats->_time_elapsed_since_last_safepoint / MICROUNITS);
+               sstats->_time_to_do_cleanups / MICROUNITS,
+               sstats->_time_to_exec_vmop / MICROUNITS);
 
     if (need_to_track_page_armed_status) {
       tty->print(INT32_FORMAT"         ", sstats->_page_armed);
@@ -1154,7 +1195,7 @@
   // don't print it out.
   // Approximate the vm op time.
   _safepoint_stats[_cur_stat_index]._time_to_exec_vmop =
-    os::javaTimeNanos() - sync_end_time;
+    os::javaTimeNanos() - cleanup_end_time;
 
   if ( PrintSafepointStatisticsTimeout < 0 ||
        spstat->_time_to_sync > PrintSafepointStatisticsTimeout * MICROUNITS) {
@@ -1183,6 +1224,9 @@
                 _coalesced_vmop_count);
   tty->print_cr("Maximum sync time  "INT64_FORMAT_W(5)" ms",
                 _max_sync_time / MICROUNITS);
+  tty->print_cr("Maximum vm operation time (except for Exit VM operation)  "
+                INT64_FORMAT_W(5)" ms",
+                _max_vmop_time / MICROUNITS);
 }
 
 // ------------------------------------------------------------------------------------------------
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/safepoint.hpp
--- a/src/share/vm/runtime/safepoint.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/safepoint.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -65,6 +65,7 @@
   };
 
   typedef struct {
+    float  _time_stamp;                        // record when the current safepoint occurs in seconds
     int    _vmop_type;                         // type of VM operation triggers the safepoint
     int    _nof_total_threads;                 // total number of Java threads
     int    _nof_initial_running_threads;       // total number of initially seen running threads
@@ -73,14 +74,14 @@
     int    _nof_threads_hit_page_trap;         // total number of threads hitting the page trap
     jlong  _time_to_spin;                      // total time in millis spent in spinning
     jlong  _time_to_wait_to_block;             // total time in millis spent in waiting for to block
+    jlong  _time_to_do_cleanups;               // total time in millis spent in performing cleanups
     jlong  _time_to_sync;                      // total time in millis spent in getting to _synchronized
     jlong  _time_to_exec_vmop;                 // total time in millis spent in vm operation itself
-    jlong  _time_elapsed_since_last_safepoint; // time elasped since last safepoint
   } SafepointStats;
 
  private:
   static volatile SynchronizeState _state;     // Threads might read this flag directly, without acquireing the Threads_lock
-  static volatile int _waiting_to_block;       // No. of threads we are waiting for to block.
+  static volatile int _waiting_to_block;       // number of threads we are waiting for to block
 
   // This counter is used for fast versions of jni_Get<Primitive>Field.
   // An even value means there is no ongoing safepoint operations.
@@ -91,19 +92,22 @@
 public:
   static volatile int _safepoint_counter;
 private:
-
-  static jlong   _last_safepoint;      // Time of last safepoint
+  static long       _end_of_last_safepoint;     // Time of last safepoint in milliseconds
 
   // statistics
-  static SafepointStats*  _safepoint_stats;     // array of SafepointStats struct
-  static int              _cur_stat_index;      // current index to the above array
-  static julong           _safepoint_reasons[]; // safepoint count for each VM op
-  static julong           _coalesced_vmop_count;// coalesced vmop count
-  static jlong            _max_sync_time;       // maximum sync time in nanos
+  static jlong            _safepoint_begin_time;     // time when safepoint begins
+  static SafepointStats*  _safepoint_stats;          // array of SafepointStats struct
+  static int              _cur_stat_index;           // current index to the above array
+  static julong           _safepoint_reasons[];      // safepoint count for each VM op
+  static julong           _coalesced_vmop_count;     // coalesced vmop count
+  static jlong            _max_sync_time;            // maximum sync time in nanos
+  static jlong            _max_vmop_time;            // maximum vm operation time in nanos
+  static float            _ts_of_current_safepoint;  // time stamp of current safepoint in seconds
 
   static void begin_statistics(int nof_threads, int nof_running);
   static void update_statistics_on_spin_end();
   static void update_statistics_on_sync_end(jlong end_time);
+  static void update_statistics_on_cleanup_end(jlong end_time);
   static void end_statistics(jlong end_time);
   static void print_statistics();
   inline static void inc_page_trap_count() {
@@ -140,7 +144,9 @@
   static void handle_polling_page_exception(JavaThread *thread);
 
   // VM Thread interface for determining safepoint rate
-  static long last_non_safepoint_interval()               { return os::javaTimeMillis() - _last_safepoint; }
+  static long last_non_safepoint_interval() {
+    return os::javaTimeMillis() - _end_of_last_safepoint;
+  }
   static bool is_cleanup_needed();
   static void do_cleanup_tasks();
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/sharedRuntime.cpp
--- a/src/share/vm/runtime/sharedRuntime.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/sharedRuntime.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -364,7 +364,7 @@
 
 
 void SharedRuntime::throw_and_post_jvmti_exception(JavaThread *thread, Handle h_exception) {
-  if (JvmtiExport::can_post_exceptions()) {
+  if (JvmtiExport::can_post_on_exceptions()) {
     vframeStream vfst(thread, true);
     methodHandle method = methodHandle(thread, vfst.method());
     address bcp = method()->bcp_from(vfst.bci());
@@ -607,7 +607,9 @@
           _implicit_null_throws++;
 #endif
           target_pc = nm->continuation_for_implicit_exception(pc);
-          guarantee(target_pc != 0, "must have a continuation point");
+          // If there's an unexpected fault, target_pc might be NULL,
+          // in which case we want to fall through into the normal
+          // error handling code.
         }
 
         break; // fall through
@@ -621,14 +623,15 @@
         _implicit_div0_throws++;
 #endif
         target_pc = nm->continuation_for_implicit_exception(pc);
-        guarantee(target_pc != 0, "must have a continuation point");
+        // If there's an unexpected fault, target_pc might be NULL,
+        // in which case we want to fall through into the normal
+        // error handling code.
         break; // fall through
       }
 
       default: ShouldNotReachHere();
     }
 
-    guarantee(target_pc != NULL, "must have computed destination PC for implicit exception");
     assert(exception_kind == IMPLICIT_NULL || exception_kind == IMPLICIT_DIVIDE_BY_ZERO, "wrong implicit exception kind");
 
     // for AbortVMOnException flag
@@ -802,7 +805,7 @@
 
 #ifdef ASSERT
   // Check that the receiver klass is of the right subtype and that it is initialized for virtual calls
-  if (bc != Bytecodes::_invokestatic) {
+  if (bc != Bytecodes::_invokestatic && bc != Bytecodes::_invokedynamic) {
     assert(receiver.not_null(), "should have thrown exception");
     KlassHandle receiver_klass (THREAD, receiver->klass());
     klassOop rk = constants->klass_ref_at(bytecode_index, CHECK_(nullHandle));
@@ -860,7 +863,7 @@
   if (JvmtiExport::can_hotswap_or_post_breakpoint()) {
     int retry_count = 0;
     while (!HAS_PENDING_EXCEPTION && callee_method->is_old() &&
-           callee_method->method_holder() != SystemDictionary::object_klass()) {
+           callee_method->method_holder() != SystemDictionary::Object_klass()) {
       // If has a pending exception then there is no need to re-try to
       // resolve this method.
       // If the method has been redefined, we need to try again.
@@ -1027,7 +1030,26 @@
   frame stub_frame = thread->last_frame();
   assert(stub_frame.is_runtime_frame(), "sanity check");
   frame caller_frame = stub_frame.sender(&reg_map);
-  if (caller_frame.is_interpreted_frame() || caller_frame.is_entry_frame() ) {
+
+  // MethodHandle invokes don't have a CompiledIC and should always
+  // simply redispatch to the callee_target.
+  address   sender_pc = caller_frame.pc();
+  CodeBlob* sender_cb = caller_frame.cb();
+  nmethod*  sender_nm = sender_cb->as_nmethod_or_null();
+  bool is_mh_invoke_via_adapter = false;  // Direct c2c call or via adapter?
+  if (sender_nm != NULL && sender_nm->is_method_handle_return(sender_pc)) {
+    // If the callee_target is set, then we have come here via an i2c
+    // adapter.
+    methodOop callee = thread->callee_target();
+    if (callee != NULL) {
+      assert(callee->is_method(), "sanity");
+      is_mh_invoke_via_adapter = true;
+    }
+  }
+
+  if (caller_frame.is_interpreted_frame() ||
+      caller_frame.is_entry_frame()       ||
+      is_mh_invoke_via_adapter) {
     methodOop callee = thread->callee_target();
     guarantee(callee != NULL && callee->is_method(), "bad handshake");
     thread->set_vm_result(callee);
@@ -1342,7 +1364,7 @@
 // We are calling the interpreter via a c2i. Normally this would mean that
 // we were called by a compiled method. However we could have lost a race
 // where we went int -> i2c -> c2i and so the caller could in fact be
-// interpreted. If the caller is compiled we attampt to patch the caller
+// interpreted. If the caller is compiled we attempt to patch the caller
 // so he no longer calls into the interpreter.
 IRT_LEAF(void, SharedRuntime::fixup_callers_callsite(methodOopDesc* method, address caller_pc))
   methodOop moop(method);
@@ -1358,10 +1380,19 @@
   // we did we'd leap into space because the callsite needs to use
   // "to interpreter" stub in order to load up the methodOop. Don't
   // ask me how I know this...
-  //
 
   CodeBlob* cb = CodeCache::find_blob(caller_pc);
-  if ( !cb->is_nmethod() || entry_point == moop->get_c2i_entry()) {
+  if (!cb->is_nmethod() || entry_point == moop->get_c2i_entry()) {
+    return;
+  }
+
+  // The check above makes sure this is a nmethod.
+  nmethod* nm = cb->as_nmethod_or_null();
+  assert(nm, "must be");
+
+  // Don't fixup MethodHandle call sites as c2i/i2c adapters are used
+  // to implement MethodHandle actions.
+  if (nm->is_method_handle_return(caller_pc)) {
     return;
   }
 
@@ -1376,7 +1407,7 @@
 
   if (moop->code() == NULL) return;
 
-  if (((nmethod*)cb)->is_in_use()) {
+  if (nm->is_in_use()) {
 
     // Expect to find a native call there (unless it was no-inline cache vtable dispatch)
     MutexLockerEx ml_patch(Patching_lock, Mutex::_no_safepoint_check_flag);
@@ -1408,7 +1439,7 @@
         if (callee == cb || callee->is_adapter_blob()) {
           // static call or optimized virtual
           if (TraceCallFixup) {
-            tty->print("fixup callsite at " INTPTR_FORMAT " to compiled code for", caller_pc);
+            tty->print("fixup callsite           at " INTPTR_FORMAT " to compiled code for", caller_pc);
             moop->print_short_name(tty);
             tty->print_cr(" to " INTPTR_FORMAT, entry_point);
           }
@@ -1424,7 +1455,7 @@
         }
       } else {
           if (TraceCallFixup) {
-            tty->print("already patched  callsite at " INTPTR_FORMAT " to compiled code for", caller_pc);
+            tty->print("already patched callsite at " INTPTR_FORMAT " to compiled code for", caller_pc);
             moop->print_short_name(tty);
             tty->print_cr(" to " INTPTR_FORMAT, entry_point);
           }
@@ -1529,7 +1560,7 @@
 oop SharedRuntime::wrong_method_type_is_for_single_argument(JavaThread* thr,
                                                             oopDesc* required) {
   if (required == NULL)  return NULL;
-  if (required->klass() == SystemDictionary::class_klass())
+  if (required->klass() == SystemDictionary::Class_klass())
     return required;
   if (required->is_klass())
     return Klass::cast(klassOop(required))->java_mirror();
@@ -1671,6 +1702,8 @@
   if( _find_handler_ctr ) tty->print_cr("%5d find exception handler", _find_handler_ctr );
   if( _rethrow_ctr ) tty->print_cr("%5d rethrow handler", _rethrow_ctr );
 
+  AdapterHandlerLibrary::print_statistics();
+
   if (xtty != NULL)  xtty->tail("statistics");
 }
 
@@ -1771,11 +1804,282 @@
 #endif
 
 
+// A simple wrapper class around the calling convention information
+// that allows sharing of adapters for the same calling convention.
+class AdapterFingerPrint : public CHeapObj {
+ private:
+  union {
+    int  _compact[3];
+    int* _fingerprint;
+  } _value;
+  int _length; // A negative length indicates the fingerprint is in the compact form,
+               // Otherwise _value._fingerprint is the array.
+
+  // Remap BasicTypes that are handled equivalently by the adapters.
+  // These are correct for the current system but someday it might be
+  // necessary to make this mapping platform dependent.
+  static BasicType adapter_encoding(BasicType in) {
+    assert((~0xf & in) == 0, "must fit in 4 bits");
+    switch(in) {
+      case T_BOOLEAN:
+      case T_BYTE:
+      case T_SHORT:
+      case T_CHAR:
+        // There are all promoted to T_INT in the calling convention
+        return T_INT;
+
+      case T_OBJECT:
+      case T_ARRAY:
+        if (!TaggedStackInterpreter) {
+#ifdef _LP64
+          return T_LONG;
+#else
+          return T_INT;
+#endif
+        }
+        return T_OBJECT;
+
+      case T_INT:
+      case T_LONG:
+      case T_FLOAT:
+      case T_DOUBLE:
+      case T_VOID:
+        return in;
+
+      default:
+        ShouldNotReachHere();
+        return T_CONFLICT;
+    }
+  }
+
+ public:
+  AdapterFingerPrint(int total_args_passed, BasicType* sig_bt) {
+    // The fingerprint is based on the BasicType signature encoded
+    // into an array of ints with four entries per int.
+    int* ptr;
+    int len = (total_args_passed + 3) >> 2;
+    if (len <= (int)(sizeof(_value._compact) / sizeof(int))) {
+      _value._compact[0] = _value._compact[1] = _value._compact[2] = 0;
+      // Storing the signature encoded as signed chars hits about 98%
+      // of the time.
+      _length = -len;
+      ptr = _value._compact;
+    } else {
+      _length = len;
+      _value._fingerprint = NEW_C_HEAP_ARRAY(int, _length);
+      ptr = _value._fingerprint;
+    }
+
+    // Now pack the BasicTypes with 4 per int
+    int sig_index = 0;
+    for (int index = 0; index < len; index++) {
+      int value = 0;
+      for (int byte = 0; byte < 4; byte++) {
+        if (sig_index < total_args_passed) {
+          value = (value << 4) | adapter_encoding(sig_bt[sig_index++]);
+        }
+      }
+      ptr[index] = value;
+    }
+  }
+
+  ~AdapterFingerPrint() {
+    if (_length > 0) {
+      FREE_C_HEAP_ARRAY(int, _value._fingerprint);
+    }
+  }
+
+  int value(int index) {
+    if (_length < 0) {
+      return _value._compact[index];
+    }
+    return _value._fingerprint[index];
+  }
+  int length() {
+    if (_length < 0) return -_length;
+    return _length;
+  }
+
+  bool is_compact() {
+    return _length <= 0;
+  }
+
+  unsigned int compute_hash() {
+    int hash = 0;
+    for (int i = 0; i < length(); i++) {
+      int v = value(i);
+      hash = (hash << 8) ^ v ^ (hash >> 5);
+    }
+    return (unsigned int)hash;
+  }
+
+  const char* as_string() {
+    stringStream st;
+    for (int i = 0; i < length(); i++) {
+      st.print(PTR_FORMAT, value(i));
+    }
+    return st.as_string();
+  }
+
+  bool equals(AdapterFingerPrint* other) {
+    if (other->_length != _length) {
+      return false;
+    }
+    if (_length < 0) {
+      return _value._compact[0] == other->_value._compact[0] &&
+             _value._compact[1] == other->_value._compact[1] &&
+             _value._compact[2] == other->_value._compact[2];
+    } else {
+      for (int i = 0; i < _length; i++) {
+        if (_value._fingerprint[i] != other->_value._fingerprint[i]) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+};
+
+
+// A hashtable mapping from AdapterFingerPrints to AdapterHandlerEntries
+class AdapterHandlerTable : public BasicHashtable {
+  friend class AdapterHandlerTableIterator;
+
+ private:
+
+#ifndef PRODUCT
+  static int _lookups; // number of calls to lookup
+  static int _buckets; // number of buckets checked
+  static int _equals;  // number of buckets checked with matching hash
+  static int _hits;    // number of successful lookups
+  static int _compact; // number of equals calls with compact signature
+#endif
+
+  AdapterHandlerEntry* bucket(int i) {
+    return (AdapterHandlerEntry*)BasicHashtable::bucket(i);
+  }
+
+ public:
+  AdapterHandlerTable()
+    : BasicHashtable(293, sizeof(AdapterHandlerEntry)) { }
+
+  // Create a new entry suitable for insertion in the table
+  AdapterHandlerEntry* new_entry(AdapterFingerPrint* fingerprint, address i2c_entry, address c2i_entry, address c2i_unverified_entry) {
+    AdapterHandlerEntry* entry = (AdapterHandlerEntry*)BasicHashtable::new_entry(fingerprint->compute_hash());
+    entry->init(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
+    return entry;
+  }
+
+  // Insert an entry into the table
+  void add(AdapterHandlerEntry* entry) {
+    int index = hash_to_index(entry->hash());
+    add_entry(index, entry);
+  }
+
+  void free_entry(AdapterHandlerEntry* entry) {
+    entry->deallocate();
+    BasicHashtable::free_entry(entry);
+  }
+
+  // Find a entry with the same fingerprint if it exists
+  AdapterHandlerEntry* lookup(int total_args_passed, BasicType* sig_bt) {
+    NOT_PRODUCT(_lookups++);
+    AdapterFingerPrint fp(total_args_passed, sig_bt);
+    unsigned int hash = fp.compute_hash();
+    int index = hash_to_index(hash);
+    for (AdapterHandlerEntry* e = bucket(index); e != NULL; e = e->next()) {
+      NOT_PRODUCT(_buckets++);
+      if (e->hash() == hash) {
+        NOT_PRODUCT(_equals++);
+        if (fp.equals(e->fingerprint())) {
+#ifndef PRODUCT
+          if (fp.is_compact()) _compact++;
+          _hits++;
+#endif
+          return e;
+        }
+      }
+    }
+    return NULL;
+  }
+
+#ifndef PRODUCT
+  void print_statistics() {
+    ResourceMark rm;
+    int longest = 0;
+    int empty = 0;
+    int total = 0;
+    int nonempty = 0;
+    for (int index = 0; index < table_size(); index++) {
+      int count = 0;
+      for (AdapterHandlerEntry* e = bucket(index); e != NULL; e = e->next()) {
+        count++;
+      }
+      if (count != 0) nonempty++;
+      if (count == 0) empty++;
+      if (count > longest) longest = count;
+      total += count;
+    }
+    tty->print_cr("AdapterHandlerTable: empty %d longest %d total %d average %f",
+                  empty, longest, total, total / (double)nonempty);
+    tty->print_cr("AdapterHandlerTable: lookups %d buckets %d equals %d hits %d compact %d",
+                  _lookups, _buckets, _equals, _hits, _compact);
+  }
+#endif
+};
+
+
+#ifndef PRODUCT
+
+int AdapterHandlerTable::_lookups;
+int AdapterHandlerTable::_buckets;
+int AdapterHandlerTable::_equals;
+int AdapterHandlerTable::_hits;
+int AdapterHandlerTable::_compact;
+
+class AdapterHandlerTableIterator : public StackObj {
+ private:
+  AdapterHandlerTable* _table;
+  int _index;
+  AdapterHandlerEntry* _current;
+
+  void scan() {
+    while (_index < _table->table_size()) {
+      AdapterHandlerEntry* a = _table->bucket(_index);
+      if (a != NULL) {
+        _current = a;
+        return;
+      }
+      _index++;
+    }
+  }
+
+ public:
+  AdapterHandlerTableIterator(AdapterHandlerTable* table): _table(table), _index(0), _current(NULL) {
+    scan();
+  }
+  bool has_next() {
+    return _current != NULL;
+  }
+  AdapterHandlerEntry* next() {
+    if (_current != NULL) {
+      AdapterHandlerEntry* result = _current;
+      _current = _current->next();
+      if (_current == NULL) scan();
+      return result;
+    } else {
+      return NULL;
+    }
+  }
+};
+#endif
+
+
 // ---------------------------------------------------------------------------
 // Implementation of AdapterHandlerLibrary
 const char* AdapterHandlerEntry::name = "I2C/C2I adapters";
-GrowableArray<uint64_t>* AdapterHandlerLibrary::_fingerprints = NULL;
-GrowableArray<AdapterHandlerEntry* >* AdapterHandlerLibrary::_handlers = NULL;
+AdapterHandlerTable* AdapterHandlerLibrary::_adapters = NULL;
+AdapterHandlerEntry* AdapterHandlerLibrary::_abstract_method_handler = NULL;
 const int AdapterHandlerLibrary_size = 16*K;
 BufferBlob* AdapterHandlerLibrary::_buffer = NULL;
 
@@ -1787,28 +2091,31 @@
 }
 
 void AdapterHandlerLibrary::initialize() {
-  if (_fingerprints != NULL) return;
-  _fingerprints = new(ResourceObj::C_HEAP)GrowableArray<uint64_t>(32, true);
-  _handlers = new(ResourceObj::C_HEAP)GrowableArray<AdapterHandlerEntry*>(32, true);
-  // Index 0 reserved for the slow path handler
-  _fingerprints->append(0/*the never-allowed 0 fingerprint*/);
-  _handlers->append(NULL);
+  if (_adapters != NULL) return;
+  _adapters = new AdapterHandlerTable();
 
   // Create a special handler for abstract methods.  Abstract methods
   // are never compiled so an i2c entry is somewhat meaningless, but
   // fill it in with something appropriate just in case.  Pass handle
   // wrong method for the c2i transitions.
   address wrong_method = SharedRuntime::get_handle_wrong_method_stub();
-  _fingerprints->append(0/*the never-allowed 0 fingerprint*/);
-  assert(_handlers->length() == AbstractMethodHandler, "in wrong slot");
-  _handlers->append(new AdapterHandlerEntry(StubRoutines::throw_AbstractMethodError_entry(),
-                                            wrong_method, wrong_method));
+  _abstract_method_handler = AdapterHandlerLibrary::new_entry(new AdapterFingerPrint(0, NULL),
+                                                              StubRoutines::throw_AbstractMethodError_entry(),
+                                                              wrong_method, wrong_method);
 }
 
-int AdapterHandlerLibrary::get_create_adapter_index(methodHandle method) {
-  // Use customized signature handler.  Need to lock around updates to the
-  // _fingerprints array (it is not safe for concurrent readers and a single
-  // writer: this can be fixed if it becomes a problem).
+AdapterHandlerEntry* AdapterHandlerLibrary::new_entry(AdapterFingerPrint* fingerprint,
+                                                      address i2c_entry,
+                                                      address c2i_entry,
+                                                      address c2i_unverified_entry) {
+  return _adapters->new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
+}
+
+AdapterHandlerEntry* AdapterHandlerLibrary::get_adapter(methodHandle method) {
+  // Use customized signature handler.  Need to lock around updates to
+  // the AdapterHandlerTable (it is not safe for concurrent readers
+  // and a single writer: this could be fixed if it becomes a
+  // problem).
 
   // Get the address of the ic_miss handlers before we grab the
   // AdapterHandlerLibrary_lock. This fixes bug 6236259 which
@@ -1819,47 +2126,58 @@
   address ic_miss = SharedRuntime::get_ic_miss_stub();
   assert(ic_miss != NULL, "must have handler");
 
-  int result;
+  ResourceMark rm;
+
   NOT_PRODUCT(int code_size);
   BufferBlob *B = NULL;
   AdapterHandlerEntry* entry = NULL;
-  uint64_t fingerprint;
+  AdapterFingerPrint* fingerprint = NULL;
   {
     MutexLocker mu(AdapterHandlerLibrary_lock);
     // make sure data structure is initialized
     initialize();
 
     if (method->is_abstract()) {
-      return AbstractMethodHandler;
+      return _abstract_method_handler;
     }
 
+    // Fill in the signature array, for the calling-convention call.
+    int total_args_passed = method->size_of_parameters(); // All args on stack
+
+    BasicType* sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_args_passed);
+    VMRegPair* regs   = NEW_RESOURCE_ARRAY(VMRegPair, total_args_passed);
+    int i = 0;
+    if (!method->is_static())  // Pass in receiver first
+      sig_bt[i++] = T_OBJECT;
+    for (SignatureStream ss(method->signature()); !ss.at_return_type(); ss.next()) {
+      sig_bt[i++] = ss.type();  // Collect remaining bits of signature
+      if (ss.type() == T_LONG || ss.type() == T_DOUBLE)
+        sig_bt[i++] = T_VOID;   // Longs & doubles take 2 Java slots
+    }
+    assert(i == total_args_passed, "");
+
     // Lookup method signature's fingerprint
-    fingerprint = Fingerprinter(method).fingerprint();
-    assert( fingerprint != CONST64( 0), "no zero fingerprints allowed" );
-    // Fingerprints are small fixed-size condensed representations of
-    // signatures.  If the signature is too large, it won't fit in a
-    // fingerprint.  Signatures which cannot support a fingerprint get a new i2c
-    // adapter gen'd each time, instead of searching the cache for one.  This -1
-    // game can be avoided if I compared signatures instead of using
-    // fingerprints.  However, -1 fingerprints are very rare.
-    if( fingerprint != UCONST64(-1) ) { // If this is a cache-able fingerprint
-      // Turns out i2c adapters do not care what the return value is.  Mask it
-      // out so signatures that only differ in return type will share the same
-      // adapter.
-      fingerprint &= ~(SignatureIterator::result_feature_mask << SignatureIterator::static_feature_size);
-      // Search for a prior existing i2c/c2i adapter
-      int index = _fingerprints->find(fingerprint);
-      if( index >= 0 ) return index; // Found existing handlers?
-    } else {
-      // Annoyingly, I end up adding -1 fingerprints to the array of handlers,
-      // because I need a unique handler index.  It cannot be scanned for
-      // because all -1's look alike.  Instead, the matching index is passed out
-      // and immediately used to collect the 2 return values (the c2i and i2c
-      // adapters).
+    entry = _adapters->lookup(total_args_passed, sig_bt);
+
+#ifdef ASSERT
+    AdapterHandlerEntry* shared_entry = NULL;
+    if (VerifyAdapterSharing && entry != NULL) {
+      shared_entry = entry;
+      entry = NULL;
+    }
+#endif
+
+    if (entry != NULL) {
+      return entry;
     }
 
+    // Get a description of the compiled java calling convention and the largest used (VMReg) stack slot usage
+    int comp_args_on_stack = SharedRuntime::java_calling_convention(sig_bt, regs, total_args_passed, false);
+
+    // Make a C heap allocated version of the fingerprint to store in the adapter
+    fingerprint = new AdapterFingerPrint(total_args_passed, sig_bt);
+
     // Create I2C & C2I handlers
-    ResourceMark rm;
 
     BufferBlob*  buf = buffer_blob(); // the temporary code buffer in CodeCache
     if (buf != NULL) {
@@ -1869,32 +2187,26 @@
                                              sizeof(buffer_locs)/sizeof(relocInfo));
       MacroAssembler _masm(&buffer);
 
-      // Fill in the signature array, for the calling-convention call.
-      int total_args_passed = method->size_of_parameters(); // All args on stack
-
-      BasicType* sig_bt = NEW_RESOURCE_ARRAY(BasicType,total_args_passed);
-      VMRegPair  * regs   = NEW_RESOURCE_ARRAY(VMRegPair  ,total_args_passed);
-      int i=0;
-      if( !method->is_static() )  // Pass in receiver first
-        sig_bt[i++] = T_OBJECT;
-      for( SignatureStream ss(method->signature()); !ss.at_return_type(); ss.next()) {
-        sig_bt[i++] = ss.type();  // Collect remaining bits of signature
-        if( ss.type() == T_LONG || ss.type() == T_DOUBLE )
-          sig_bt[i++] = T_VOID;   // Longs & doubles take 2 Java slots
-      }
-      assert( i==total_args_passed, "" );
-
-      // Now get the re-packed compiled-Java layout.
-      int comp_args_on_stack;
-
-      // Get a description of the compiled java calling convention and the largest used (VMReg) stack slot usage
-      comp_args_on_stack = SharedRuntime::java_calling_convention(sig_bt, regs, total_args_passed, false);
-
       entry = SharedRuntime::generate_i2c2i_adapters(&_masm,
                                                      total_args_passed,
                                                      comp_args_on_stack,
                                                      sig_bt,
-                                                     regs);
+                                                     regs,
+                                                     fingerprint);
+
+#ifdef ASSERT
+      if (VerifyAdapterSharing) {
+        if (shared_entry != NULL) {
+          assert(shared_entry->compare_code(buf->instructions_begin(), buffer.code_size(), total_args_passed, sig_bt),
+                 "code must match");
+          // Release the one just created and return the original
+          _adapters->free_entry(entry);
+          return shared_entry;
+        } else  {
+          entry->save_code(buf->instructions_begin(), buffer.code_size(), total_args_passed, sig_bt);
+        }
+      }
+#endif
 
       B = BufferBlob::create(AdapterHandlerEntry::name, &buffer);
       NOT_PRODUCT(code_size = buffer.code_size());
@@ -1903,49 +2215,33 @@
       // CodeCache is full, disable compilation
       // Ought to log this but compile log is only per compile thread
       // and we're some non descript Java thread.
-      UseInterpreter = true;
-      if (UseCompiler || AlwaysCompileLoopMethods ) {
-#ifndef PRODUCT
-        warning("CodeCache is full. Compiler has been disabled");
-        if (CompileTheWorld || ExitOnFullCodeCache) {
-          before_exit(JavaThread::current());
-          exit_globals(); // will delete tty
-          vm_direct_exit(CompileTheWorld ? 0 : 1);
-        }
-#endif
-        UseCompiler               = false;
-        AlwaysCompileLoopMethods  = false;
-      }
-      return 0; // Out of CodeCache space (_handlers[0] == NULL)
+      MutexUnlocker mu(AdapterHandlerLibrary_lock);
+      CompileBroker::handle_full_code_cache();
+      return NULL; // Out of CodeCache space
     }
     entry->relocate(B->instructions_begin());
 #ifndef PRODUCT
     // debugging suppport
     if (PrintAdapterHandlers) {
       tty->cr();
-      tty->print_cr("i2c argument handler #%d for: %s %s (fingerprint = 0x%llx, %d bytes generated)",
-                    _handlers->length(), (method->is_static() ? "static" : "receiver"),
-                    method->signature()->as_C_string(), fingerprint, code_size );
+      tty->print_cr("i2c argument handler #%d for: %s %s (fingerprint = %s, %d bytes generated)",
+                    _adapters->number_of_entries(), (method->is_static() ? "static" : "receiver"),
+                    method->signature()->as_C_string(), fingerprint->as_string(), code_size );
       tty->print_cr("c2i argument handler starts at %p",entry->get_c2i_entry());
       Disassembler::decode(entry->get_i2c_entry(), entry->get_i2c_entry() + code_size);
     }
 #endif
 
-    // add handlers to library
-    _fingerprints->append(fingerprint);
-    _handlers->append(entry);
-    // set handler index
-    assert(_fingerprints->length() == _handlers->length(), "sanity check");
-    result = _fingerprints->length() - 1;
+    _adapters->add(entry);
   }
   // Outside of the lock
   if (B != NULL) {
     char blob_id[256];
     jio_snprintf(blob_id,
                  sizeof(blob_id),
-                 "%s(" PTR64_FORMAT ")@" PTR_FORMAT,
+                 "%s(%s)@" PTR_FORMAT,
                  AdapterHandlerEntry::name,
-                 fingerprint,
+                 fingerprint->as_string(),
                  B->instructions_begin());
     VTune::register_stub(blob_id, B->instructions_begin(), B->instructions_end());
     Forte::register_stub(blob_id, B->instructions_begin(), B->instructions_end());
@@ -1956,7 +2252,7 @@
                                                B->instructions_end());
     }
   }
-  return result;
+  return entry;
 }
 
 void AdapterHandlerEntry::relocate(address new_base) {
@@ -1966,6 +2262,44 @@
     _c2i_unverified_entry += delta;
 }
 
+
+void AdapterHandlerEntry::deallocate() {
+  delete _fingerprint;
+#ifdef ASSERT
+  if (_saved_code) FREE_C_HEAP_ARRAY(unsigned char, _saved_code);
+  if (_saved_sig)  FREE_C_HEAP_ARRAY(Basictype, _saved_sig);
+#endif
+}
+
+
+#ifdef ASSERT
+// Capture the code before relocation so that it can be compared
+// against other versions.  If the code is captured after relocation
+// then relative instructions won't be equivalent.
+void AdapterHandlerEntry::save_code(unsigned char* buffer, int length, int total_args_passed, BasicType* sig_bt) {
+  _saved_code = NEW_C_HEAP_ARRAY(unsigned char, length);
+  _code_length = length;
+  memcpy(_saved_code, buffer, length);
+  _total_args_passed = total_args_passed;
+  _saved_sig = NEW_C_HEAP_ARRAY(BasicType, _total_args_passed);
+  memcpy(_saved_sig, sig_bt, _total_args_passed * sizeof(BasicType));
+}
+
+
+bool AdapterHandlerEntry::compare_code(unsigned char* buffer, int length, int total_args_passed, BasicType* sig_bt) {
+  if (length != _code_length) {
+    return false;
+  }
+  for (int i = 0; i < length; i++) {
+    if (buffer[i] != _saved_code[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+#endif
+
+
 // Create a native wrapper for this native method.  The wrapper converts the
 // java compiled calling convention to the native convention, handlizes
 // arguments, and transitions to native.  On return from the native we transition
@@ -2044,19 +2378,8 @@
     // CodeCache is full, disable compilation
     // Ought to log this but compile log is only per compile thread
     // and we're some non descript Java thread.
-    UseInterpreter = true;
-    if (UseCompiler || AlwaysCompileLoopMethods ) {
-#ifndef PRODUCT
-      warning("CodeCache is full. Compiler has been disabled");
-      if (CompileTheWorld || ExitOnFullCodeCache) {
-        before_exit(JavaThread::current());
-        exit_globals(); // will delete tty
-        vm_direct_exit(CompileTheWorld ? 0 : 1);
-      }
-#endif
-      UseCompiler               = false;
-      AlwaysCompileLoopMethods  = false;
-    }
+    MutexUnlocker mu(AdapterHandlerLibrary_lock);
+    CompileBroker::handle_full_code_cache();
   }
   return nm;
 }
@@ -2136,7 +2459,7 @@
   return regs.first();
 }
 
-VMRegPair *SharedRuntime::find_callee_arguments(symbolOop sig, bool is_static, int* arg_size) {
+VMRegPair *SharedRuntime::find_callee_arguments(symbolOop sig, bool has_receiver, int* arg_size) {
   // This method is returning a data structure allocating as a
   // ResourceObject, so do not put any ResourceMarks in here.
   char *s = sig->as_C_string();
@@ -2148,7 +2471,7 @@
   BasicType *sig_bt = NEW_RESOURCE_ARRAY( BasicType, 256 );
   VMRegPair *regs = NEW_RESOURCE_ARRAY( VMRegPair, 256 );
   int cnt = 0;
-  if (!is_static) {
+  if (has_receiver) {
     sig_bt[cnt++] = T_OBJECT; // Receiver is argument 0; not in signature
   }
 
@@ -2299,30 +2622,31 @@
 
 #ifndef PRODUCT
 bool AdapterHandlerLibrary::contains(CodeBlob* b) {
-
-  if (_handlers == NULL) return false;
-
-  for (int i = 0 ; i < _handlers->length() ; i++) {
-    AdapterHandlerEntry* a = get_entry(i);
-    if ( a != NULL && b == CodeCache::find_blob(a->get_i2c_entry()) ) return true;
+  AdapterHandlerTableIterator iter(_adapters);
+  while (iter.has_next()) {
+    AdapterHandlerEntry* a = iter.next();
+    if ( b == CodeCache::find_blob(a->get_i2c_entry()) ) return true;
   }
   return false;
 }
 
 void AdapterHandlerLibrary::print_handler(CodeBlob* b) {
-
-  for (int i = 0 ; i < _handlers->length() ; i++) {
-    AdapterHandlerEntry* a = get_entry(i);
-    if ( a != NULL && b == CodeCache::find_blob(a->get_i2c_entry()) ) {
+  AdapterHandlerTableIterator iter(_adapters);
+  while (iter.has_next()) {
+    AdapterHandlerEntry* a = iter.next();
+    if ( b == CodeCache::find_blob(a->get_i2c_entry()) ) {
       tty->print("Adapter for signature: ");
-      // Fingerprinter::print(_fingerprints->at(i));
-      tty->print("0x%" FORMAT64_MODIFIER "x", _fingerprints->at(i));
-      tty->print_cr(" i2c: " INTPTR_FORMAT " c2i: " INTPTR_FORMAT " c2iUV: " INTPTR_FORMAT,
+      tty->print_cr("%s i2c: " INTPTR_FORMAT " c2i: " INTPTR_FORMAT " c2iUV: " INTPTR_FORMAT,
+                    a->fingerprint()->as_string(),
                     a->get_i2c_entry(), a->get_c2i_entry(), a->get_c2i_unverified_entry());
-
       return;
     }
   }
   assert(false, "Should have found handler");
 }
+
+void AdapterHandlerLibrary::print_statistics() {
+  _adapters->print_statistics();
+}
+
 #endif /* PRODUCT */
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/sharedRuntime.hpp
--- a/src/share/vm/runtime/sharedRuntime.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/sharedRuntime.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -23,6 +23,8 @@
  */
 
 class AdapterHandlerEntry;
+class AdapterHandlerTable;
+class AdapterFingerPrint;
 class vframeStream;
 
 // Runtime is the base class for various runtime interfaces
@@ -337,7 +339,8 @@
                                                       int total_args_passed,
                                                       int max_arg,
                                                       const BasicType *sig_bt,
-                                                      const VMRegPair *regs);
+                                                      const VMRegPair *regs,
+                                                      AdapterFingerPrint* fingerprint);
 
   // OSR support
 
@@ -357,7 +360,7 @@
 
   // Convert a sig into a calling convention register layout
   // and find interesting things about it.
-  static VMRegPair* find_callee_arguments(symbolOop sig, bool is_static, int *arg_size);
+  static VMRegPair* find_callee_arguments(symbolOop sig, bool has_receiver, int *arg_size);
   static VMReg     name_for_receiver();
 
   // "Top of Stack" slots that may be unused by the calling convention but must
@@ -528,28 +531,64 @@
 // used by the adapters.  The code generation happens here because it's very
 // similar to what the adapters have to do.
 
-class AdapterHandlerEntry : public CHeapObj {
+class AdapterHandlerEntry : public BasicHashtableEntry {
+  friend class AdapterHandlerTable;
+
  private:
+  AdapterFingerPrint* _fingerprint;
   address _i2c_entry;
   address _c2i_entry;
   address _c2i_unverified_entry;
 
+#ifdef ASSERT
+  // Captures code and signature used to generate this adapter when
+  // verifing adapter equivalence.
+  unsigned char* _saved_code;
+  int            _code_length;
+  BasicType*     _saved_sig;
+  int            _total_args_passed;
+#endif
+
+  void init(AdapterFingerPrint* fingerprint, address i2c_entry, address c2i_entry, address c2i_unverified_entry) {
+    _fingerprint = fingerprint;
+    _i2c_entry = i2c_entry;
+    _c2i_entry = c2i_entry;
+    _c2i_unverified_entry = c2i_unverified_entry;
+#ifdef ASSERT
+    _saved_code = NULL;
+    _code_length = 0;
+    _saved_sig = NULL;
+    _total_args_passed = 0;
+#endif
+  }
+
+  void deallocate();
+
+  // should never be used
+  AdapterHandlerEntry();
+
  public:
-
   // The name we give all buffer blobs
   static const char* name;
 
-  AdapterHandlerEntry(address i2c_entry, address c2i_entry, address c2i_unverified_entry):
-    _i2c_entry(i2c_entry),
-    _c2i_entry(c2i_entry),
-    _c2i_unverified_entry(c2i_unverified_entry) {
-  }
-
   address get_i2c_entry()            { return _i2c_entry; }
   address get_c2i_entry()            { return _c2i_entry; }
   address get_c2i_unverified_entry() { return _c2i_unverified_entry; }
 
   void relocate(address new_base);
+
+  AdapterFingerPrint* fingerprint()  { return _fingerprint; }
+
+  AdapterHandlerEntry* next() {
+    return (AdapterHandlerEntry*)BasicHashtableEntry::next();
+  }
+
+#ifdef ASSERT
+  // Used to verify that code generated for shared adapters is equivalent
+  void save_code(unsigned char* code, int length, int total_args_passed, BasicType* sig_bt);
+  bool compare_code(unsigned char* code, int length, int total_args_passed, BasicType* sig_bt);
+#endif
+
 #ifndef PRODUCT
   void print();
 #endif /* PRODUCT */
@@ -558,30 +597,18 @@
 class AdapterHandlerLibrary: public AllStatic {
  private:
   static BufferBlob* _buffer; // the temporary code buffer in CodeCache
-  static GrowableArray<uint64_t>* _fingerprints; // the fingerprint collection
-  static GrowableArray<AdapterHandlerEntry*> * _handlers; // the corresponding handlers
-  enum {
-    AbstractMethodHandler = 1 // special handler for abstract methods
-  };
+  static AdapterHandlerTable* _adapters;
+  static AdapterHandlerEntry* _abstract_method_handler;
   static BufferBlob* buffer_blob();
   static void initialize();
-  static int get_create_adapter_index(methodHandle method);
-  static address get_i2c_entry( int index ) {
-    return get_entry(index)->get_i2c_entry();
-  }
-  static address get_c2i_entry( int index ) {
-    return get_entry(index)->get_c2i_entry();
-  }
-  static address get_c2i_unverified_entry( int index ) {
-    return get_entry(index)->get_c2i_unverified_entry();
-  }
 
  public:
-  static AdapterHandlerEntry* get_entry( int index ) { return _handlers->at(index); }
+
+  static AdapterHandlerEntry* new_entry(AdapterFingerPrint* fingerprint,
+                                        address i2c_entry, address c2i_entry, address c2i_unverified_entry);
   static nmethod* create_native_wrapper(methodHandle method);
-  static AdapterHandlerEntry* get_adapter(methodHandle method)  {
-    return get_entry(get_create_adapter_index(method));
-  }
+  static AdapterHandlerEntry* get_adapter(methodHandle method);
+
 #ifdef HAVE_DTRACE_H
   static nmethod* create_dtrace_nmethod (methodHandle method);
 #endif // HAVE_DTRACE_H
@@ -589,6 +616,7 @@
 #ifndef PRODUCT
   static void print_handler(CodeBlob* b);
   static bool contains(CodeBlob* b);
+  static void print_statistics();
 #endif /* PRODUCT */
 
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/signature.hpp
--- a/src/share/vm/runtime/signature.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/signature.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -275,11 +275,14 @@
 
   void do_bool  ()                     { pass_int();    _jni_offset++; _offset++;       }
   void do_char  ()                     { pass_int();    _jni_offset++; _offset++;       }
+#if defined(_LP64) || defined(ZERO)
+  void do_float ()                     { pass_float();  _jni_offset++; _offset++;       }
+#else
+  void do_float ()                     { pass_int();    _jni_offset++; _offset++;       }
+#endif
 #ifdef _LP64
-  void do_float ()                     { pass_float();  _jni_offset++; _offset++;       }
   void do_double()                     { pass_double(); _jni_offset++; _offset += 2;    }
 #else
-  void do_float ()                     { pass_int();    _jni_offset++; _offset++;       }
   void do_double()                     { pass_double(); _jni_offset += 2; _offset += 2; }
 #endif
   void do_byte  ()                     { pass_int();    _jni_offset++; _offset++;       }
@@ -303,8 +306,10 @@
   virtual void pass_int()              = 0;
   virtual void pass_long()             = 0;
   virtual void pass_object()           = 0;
+#if defined(_LP64) || defined(ZERO)
+  virtual void pass_float()            = 0;
+#endif
 #ifdef _LP64
-  virtual void pass_float()            = 0;
   virtual void pass_double()           = 0;
 #else
   virtual void pass_double()           { pass_long(); }  // may be same as long
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/statSampler.cpp
--- a/src/share/vm/runtime/statSampler.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/statSampler.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -177,7 +177,7 @@
 
   // public static String getProperty(String key, String def);
   JavaCalls::call_static(&result,
-                         KlassHandle(THREAD, SystemDictionary::system_klass()),
+                         KlassHandle(THREAD, SystemDictionary::System_klass()),
                          vmSymbolHandles::getProperty_name(),
                          vmSymbolHandles::string_string_signature(),
                          key_str,
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/stubRoutines.cpp
--- a/src/share/vm/runtime/stubRoutines.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/stubRoutines.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -97,6 +97,14 @@
 address StubRoutines::_unsafe_arraycopy                  = NULL;
 address StubRoutines::_generic_arraycopy                 = NULL;
 
+double (* StubRoutines::_intrinsic_log   )(double) = NULL;
+double (* StubRoutines::_intrinsic_log10 )(double) = NULL;
+double (* StubRoutines::_intrinsic_exp   )(double) = NULL;
+double (* StubRoutines::_intrinsic_pow   )(double, double) = NULL;
+double (* StubRoutines::_intrinsic_sin   )(double) = NULL;
+double (* StubRoutines::_intrinsic_cos   )(double) = NULL;
+double (* StubRoutines::_intrinsic_tan   )(double) = NULL;
+
 // Initialization
 //
 // Note: to break cycle with universe initialization, stubs are generated in two phases.
@@ -188,11 +196,19 @@
 // Default versions of arraycopy functions
 //
 
+static void gen_arraycopy_barrier_pre(oop* dest, size_t count) {
+    assert(count != 0, "count should be non-zero");
+    assert(count <= (size_t)max_intx, "count too large");
+    BarrierSet* bs = Universe::heap()->barrier_set();
+    assert(bs->has_write_ref_array_pre_opt(), "Must have pre-barrier opt");
+    bs->write_ref_array_pre(dest, (int)count);
+}
+
 static void gen_arraycopy_barrier(oop* dest, size_t count) {
     assert(count != 0, "count should be non-zero");
     BarrierSet* bs = Universe::heap()->barrier_set();
     assert(bs->has_write_ref_array_opt(), "Barrier set must have ref array opt");
-    bs->write_ref_array(MemRegion((HeapWord*)dest, (HeapWord*)(dest + count)));
+    bs->write_ref_array((HeapWord*)dest, count);
 }
 
 JRT_LEAF(void, StubRoutines::jbyte_copy(jbyte* src, jbyte* dest, size_t count))
@@ -232,6 +248,7 @@
   SharedRuntime::_oop_array_copy_ctr++;        // Slow-path oop array copy
 #endif // !PRODUCT
   assert(count != 0, "count should be non-zero");
+  gen_arraycopy_barrier_pre(dest, count);
   Copy::conjoint_oops_atomic(src, dest, count);
   gen_arraycopy_barrier(dest, count);
 JRT_END
@@ -273,6 +290,7 @@
   SharedRuntime::_oop_array_copy_ctr++;        // Slow-path oop array copy
 #endif // !PRODUCT
   assert(count != 0, "count should be non-zero");
+  gen_arraycopy_barrier_pre((oop *) dest, count);
   Copy::arrayof_conjoint_oops(src, dest, count);
   gen_arraycopy_barrier((oop *) dest, count);
 JRT_END
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/stubRoutines.hpp
--- a/src/share/vm/runtime/stubRoutines.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/stubRoutines.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -148,6 +148,20 @@
   static address _unsafe_arraycopy;
   static address _generic_arraycopy;
 
+  // These are versions of the java.lang.Math methods which perform
+  // the same operations as the intrinsic version.  They are used for
+  // constant folding in the compiler to ensure equivalence.  If the
+  // intrinsic version returns the same result as the strict version
+  // then they can be set to the appropriate function from
+  // SharedRuntime.
+  static double (*_intrinsic_log)(double);
+  static double (*_intrinsic_log10)(double);
+  static double (*_intrinsic_exp)(double);
+  static double (*_intrinsic_pow)(double, double);
+  static double (*_intrinsic_sin)(double);
+  static double (*_intrinsic_cos)(double);
+  static double (*_intrinsic_tan)(double);
+
  public:
   // Initialization/Testing
   static void    initialize1();                            // must happen before universe::genesis
@@ -245,6 +259,35 @@
   static address unsafe_arraycopy()        { return _unsafe_arraycopy; }
   static address generic_arraycopy()       { return _generic_arraycopy; }
 
+  static double  intrinsic_log(double d) {
+    assert(_intrinsic_log != NULL, "must be defined");
+    return _intrinsic_log(d);
+  }
+  static double  intrinsic_log10(double d) {
+    assert(_intrinsic_log != NULL, "must be defined");
+    return _intrinsic_log10(d);
+  }
+  static double  intrinsic_exp(double d) {
+    assert(_intrinsic_exp != NULL, "must be defined");
+    return _intrinsic_exp(d);
+  }
+  static double  intrinsic_pow(double d, double d2) {
+    assert(_intrinsic_pow != NULL, "must be defined");
+    return _intrinsic_pow(d, d2);
+  }
+  static double  intrinsic_sin(double d) {
+    assert(_intrinsic_sin != NULL, "must be defined");
+    return _intrinsic_sin(d);
+  }
+  static double  intrinsic_cos(double d) {
+    assert(_intrinsic_cos != NULL, "must be defined");
+    return _intrinsic_cos(d);
+  }
+  static double  intrinsic_tan(double d) {
+    assert(_intrinsic_tan != NULL, "must be defined");
+    return _intrinsic_tan(d);
+  }
+
   //
   // Default versions of the above arraycopy functions for platforms which do
   // not have specialized versions
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/sweeper.cpp
--- a/src/share/vm/runtime/sweeper.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/sweeper.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
@@ -33,6 +33,22 @@
 jint      NMethodSweeper::_locked_seen = 0;
 jint      NMethodSweeper::_not_entrant_seen_on_stack = 0;
 bool      NMethodSweeper::_rescan = false;
+bool      NMethodSweeper::_was_full = false;
+jint      NMethodSweeper::_advise_to_sweep = 0;
+jlong     NMethodSweeper::_last_was_full = 0;
+uint      NMethodSweeper::_highest_marked = 0;
+long      NMethodSweeper::_was_full_traversal = 0;
+
+class MarkActivationClosure: public CodeBlobClosure {
+public:
+  virtual void do_code_blob(CodeBlob* cb) {
+    // If we see an activation belonging to a non_entrant nmethod, we mark it.
+    if (cb->is_nmethod() && ((nmethod*)cb)->is_not_entrant()) {
+      ((nmethod*)cb)->mark_as_seen_on_stack();
+    }
+  }
+};
+static MarkActivationClosure mark_activation_closure;
 
 void NMethodSweeper::sweep() {
   assert(SafepointSynchronize::is_at_safepoint(), "must be executed at a safepoint");
@@ -57,7 +73,7 @@
     if (PrintMethodFlushing) {
       tty->print_cr("### Sweep: stack traversal %d", _traversals);
     }
-    Threads::nmethods_do();
+    Threads::nmethods_do(&mark_activation_closure);
 
     // reset the flags since we started a scan from the beginning.
     _rescan = false;
@@ -103,6 +119,40 @@
       tty->print_cr("### Couldn't make progress on some nmethods so stopping sweep");
     }
   }
+
+  if (UseCodeCacheFlushing) {
+    if (!CodeCache::needs_flushing()) {
+      // In a safepoint, no race with setters
+      _advise_to_sweep = 0;
+    }
+
+    if (was_full()) {
+      // There was some progress so attempt to restart the compiler
+      jlong now           = os::javaTimeMillis();
+      jlong max_interval  = (jlong)MinCodeCacheFlushingInterval * (jlong)1000;
+      jlong curr_interval = now - _last_was_full;
+      if ((!CodeCache::needs_flushing()) && (curr_interval > max_interval)) {
+        CompileBroker::set_should_compile_new_jobs(CompileBroker::run_compilation);
+        set_was_full(false);
+
+        // Update the _last_was_full time so we can tell how fast the
+        // code cache is filling up
+        _last_was_full = os::javaTimeMillis();
+
+        if (PrintMethodFlushing) {
+          tty->print_cr("### sweeper: Live blobs:" UINT32_FORMAT "/Free code cache:" SIZE_FORMAT " bytes, restarting compiler",
+            CodeCache::nof_blobs(), CodeCache::unallocated_capacity());
+        }
+        if (LogCompilation && (xtty != NULL)) {
+          ttyLocker ttyl;
+          xtty->begin_elem("restart_compiler live_blobs='" UINT32_FORMAT "' free_code_cache='" SIZE_FORMAT "'",
+                           CodeCache::nof_blobs(), CodeCache::unallocated_capacity());
+          xtty->stamp();
+          xtty->end_elem();
+        }
+      }
+    }
+  }
 }
 
 
@@ -125,8 +175,14 @@
     // there are no inline caches that referes to it.
     if (nm->is_marked_for_reclamation()) {
       assert(!nm->is_locked_by_vm(), "must not flush locked nmethods");
+      if (PrintMethodFlushing && Verbose) {
+        tty->print_cr("### Nmethod %3d/" PTR_FORMAT " (marked for reclamation) being flushed", nm->compile_id(), nm);
+      }
       nm->flush();
     } else {
+      if (PrintMethodFlushing && Verbose) {
+        tty->print_cr("### Nmethod %3d/" PTR_FORMAT " (zombie) being marked for reclamation", nm->compile_id(), nm);
+      }
       nm->mark_for_reclamation();
       _rescan = true;
     }
@@ -134,6 +190,9 @@
     // If there is no current activations of this method on the
     // stack we can safely convert it to a zombie method
     if (nm->can_not_entrant_be_converted()) {
+      if (PrintMethodFlushing && Verbose) {
+        tty->print_cr("### Nmethod %3d/" PTR_FORMAT " (not entrant) being made zombie", nm->compile_id(), nm);
+      }
       nm->make_zombie();
       _rescan = true;
     } else {
@@ -146,7 +205,9 @@
     }
   } else if (nm->is_unloaded()) {
     // Unloaded code, just make it a zombie
-    if (nm->is_osr_only_method()) {
+    if (PrintMethodFlushing && Verbose)
+      tty->print_cr("### Nmethod %3d/" PTR_FORMAT " (unloaded) being made zombie", nm->compile_id(), nm);
+    if (nm->is_osr_method()) {
       // No inline caches will ever point to osr methods, so we can just remove it
       nm->flush();
     } else {
@@ -155,7 +216,167 @@
     }
   } else {
     assert(nm->is_alive(), "should be alive");
+
+    if (UseCodeCacheFlushing) {
+      if ((nm->method()->code() != nm) && !(nm->is_locked_by_vm()) && !(nm->is_osr_method()) &&
+          (_traversals > _was_full_traversal+2) && (((uint)nm->compile_id()) < _highest_marked) &&
+          CodeCache::needs_flushing()) {
+        // This method has not been called since the forced cleanup happened
+        nm->make_not_entrant();
+      }
+    }
+
     // Clean-up all inline caches that points to zombie/non-reentrant methods
     nm->cleanup_inline_caches();
   }
 }
+
+// Code cache unloading: when compilers notice the code cache is getting full,
+// they will call a vm op that comes here. This code attempts to speculatively
+// unload the oldest half of the nmethods (based on the compile job id) by
+// saving the old code in a list in the CodeCache. Then
+// execution resumes. If a method so marked is not called by the second
+// safepoint from the current one, the nmethod will be marked non-entrant and
+// got rid of by normal sweeping. If the method is called, the methodOop's
+// _code field is restored and the methodOop/nmethod
+// go back to their normal state.
+void NMethodSweeper::handle_full_code_cache(bool is_full) {
+  // Only the first one to notice can advise us to start early cleaning
+  if (!is_full){
+    jint old = Atomic::cmpxchg( 1, &_advise_to_sweep, 0 );
+    if (old != 0) {
+      return;
+    }
+  }
+
+  if (is_full) {
+    // Since code cache is full, immediately stop new compiles
+    bool did_set = CompileBroker::set_should_compile_new_jobs(CompileBroker::stop_compilation);
+    if (!did_set) {
+      // only the first to notice can start the cleaning,
+      // others will go back and block
+      return;
+    }
+    set_was_full(true);
+
+    // If we run out within MinCodeCacheFlushingInterval of the last unload time, give up
+    jlong now = os::javaTimeMillis();
+    jlong max_interval = (jlong)MinCodeCacheFlushingInterval * (jlong)1000;
+    jlong curr_interval = now - _last_was_full;
+    if (curr_interval < max_interval) {
+      _rescan = true;
+      if (PrintMethodFlushing) {
+        tty->print_cr("### handle full too often, turning off compiler");
+      }
+      if (LogCompilation && (xtty != NULL)) {
+        ttyLocker ttyl;
+        xtty->begin_elem("disable_compiler flushing_interval='" UINT64_FORMAT "' live_blobs='" UINT32_FORMAT "' free_code_cache='" SIZE_FORMAT "'",
+                         curr_interval/1000, CodeCache::nof_blobs(), CodeCache::unallocated_capacity());
+        xtty->stamp();
+        xtty->end_elem();
+      }
+      return;
+    }
+  }
+
+  VM_HandleFullCodeCache op(is_full);
+  VMThread::execute(&op);
+
+  // rescan again as soon as possible
+  _rescan = true;
+}
+
+void NMethodSweeper::speculative_disconnect_nmethods(bool is_full) {
+  // If there was a race in detecting full code cache, only run
+  // one vm op for it or keep the compiler shut off
+
+  debug_only(jlong start = os::javaTimeMillis();)
+
+  if ((!was_full()) && (is_full)) {
+    if (!CodeCache::needs_flushing()) {
+      if (PrintMethodFlushing) {
+        tty->print_cr("### sweeper: Live blobs:" UINT32_FORMAT "/Free code cache:" SIZE_FORMAT " bytes, restarting compiler",
+          CodeCache::nof_blobs(), CodeCache::unallocated_capacity());
+      }
+      if (LogCompilation && (xtty != NULL)) {
+        ttyLocker ttyl;
+        xtty->begin_elem("restart_compiler live_blobs='" UINT32_FORMAT "' free_code_cache='" SIZE_FORMAT "'",
+                         CodeCache::nof_blobs(), CodeCache::unallocated_capacity());
+        xtty->stamp();
+        xtty->end_elem();
+      }
+      CompileBroker::set_should_compile_new_jobs(CompileBroker::run_compilation);
+      return;
+    }
+  }
+
+  // Traverse the code cache trying to dump the oldest nmethods
+  uint curr_max_comp_id = CompileBroker::get_compilation_id();
+  uint flush_target = ((curr_max_comp_id - _highest_marked) >> 1) + _highest_marked;
+  if (PrintMethodFlushing && Verbose) {
+    tty->print_cr("### Cleaning code cache: Live blobs:" UINT32_FORMAT "/Free code cache:" SIZE_FORMAT " bytes",
+        CodeCache::nof_blobs(), CodeCache::unallocated_capacity());
+  }
+  if (LogCompilation && (xtty != NULL)) {
+    ttyLocker ttyl;
+    xtty->begin_elem("start_cleaning_code_cache live_blobs='" UINT32_FORMAT "' free_code_cache='" SIZE_FORMAT "'",
+                      CodeCache::nof_blobs(), CodeCache::unallocated_capacity());
+    xtty->stamp();
+    xtty->end_elem();
+  }
+
+  nmethod* nm = CodeCache::alive_nmethod(CodeCache::first());
+  jint disconnected = 0;
+  jint made_not_entrant  = 0;
+  while ((nm != NULL)){
+    uint curr_comp_id = nm->compile_id();
+
+    // OSR methods cannot be flushed like this. Also, don't flush native methods
+    // since they are part of the JDK in most cases
+    if (nm->is_in_use() && (!nm->is_osr_method()) && (!nm->is_locked_by_vm()) &&
+        (!nm->is_native_method()) && ((curr_comp_id < flush_target))) {
+
+      if ((nm->method()->code() == nm)) {
+        // This method has not been previously considered for
+        // unloading or it was restored already
+        CodeCache::speculatively_disconnect(nm);
+        disconnected++;
+      } else if (nm->is_speculatively_disconnected()) {
+        // This method was previously considered for preemptive unloading and was not called since then
+        nm->method()->invocation_counter()->decay();
+        nm->method()->backedge_counter()->decay();
+        nm->make_not_entrant();
+        made_not_entrant++;
+      }
+
+      if (curr_comp_id > _highest_marked) {
+        _highest_marked = curr_comp_id;
+      }
+    }
+    nm = CodeCache::alive_nmethod(CodeCache::next(nm));
+  }
+
+  if (LogCompilation && (xtty != NULL)) {
+    ttyLocker ttyl;
+    xtty->begin_elem("stop_cleaning_code_cache disconnected='" UINT32_FORMAT "' made_not_entrant='" UINT32_FORMAT "' live_blobs='" UINT32_FORMAT "' free_code_cache='" SIZE_FORMAT "'",
+                      disconnected, made_not_entrant, CodeCache::nof_blobs(), CodeCache::unallocated_capacity());
+    xtty->stamp();
+    xtty->end_elem();
+  }
+
+  // Shut off compiler. Sweeper will run exiting from this safepoint
+  // and turn it back on if it clears enough space
+  if (was_full()) {
+    _last_was_full = os::javaTimeMillis();
+    CompileBroker::set_should_compile_new_jobs(CompileBroker::stop_compilation);
+  }
+
+  // After two more traversals the sweeper will get rid of unrestored nmethods
+  _was_full_traversal = _traversals;
+#ifdef ASSERT
+  jlong end = os::javaTimeMillis();
+  if(PrintMethodFlushing && Verbose) {
+    tty->print_cr("### sweeper: unload time: " INT64_FORMAT, end-start);
+  }
+#endif
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/sweeper.hpp
--- a/src/share/vm/runtime/sweeper.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/sweeper.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -38,6 +38,11 @@
   static int       _locked_seen;     // Number of locked nmethods encountered during the scan
   static int       _not_entrant_seen_on_stack; // Number of not entrant nmethod were are still on stack
 
+  static bool      _was_full;        // remember if we did emergency unloading
+  static jint      _advise_to_sweep; // flag to indicate code cache getting full
+  static jlong     _last_was_full;   // timestamp of last emergency unloading
+  static uint      _highest_marked;   // highest compile id dumped at last emergency unloading
+  static long      _was_full_traversal;   // trav number at last emergency unloading
 
   static void process_nmethod(nmethod *nm);
  public:
@@ -51,4 +56,10 @@
     // changes to false at safepoint so we can never overwrite it with false.
      _rescan = true;
   }
+
+  static void handle_full_code_cache(bool is_full); // Called by compilers who fail to allocate
+  static void speculative_disconnect_nmethods(bool was_full);   // Called by vm op to deal with alloc failure
+
+  static void set_was_full(bool state) { _was_full = state; }
+  static bool was_full() { return _was_full; }
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/thread.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -683,14 +683,15 @@
   return false;
 }
 
-void Thread::oops_do(OopClosure* f) {
+void Thread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
   active_handles()->oops_do(f);
   // Do oop for ThreadShadow
   f->do_oop((oop*)&_pending_exception);
   handle_area()->oops_do(f);
 }
 
-void Thread::nmethods_do() {
+void Thread::nmethods_do(CodeBlobClosure* cf) {
+  // no nmethods in a generic thread...
 }
 
 void Thread::print_on(outputStream* st) const {
@@ -883,6 +884,22 @@
                                          vmSymbolHandles::void_method_signature(), CHECK);
 }
 
+#ifdef KERNEL
+static void set_jkernel_boot_classloader_hook(TRAPS) {
+  klassOop k = SystemDictionary::sun_jkernel_DownloadManager_klass();
+  instanceKlassHandle klass (THREAD, k);
+
+  if (k == NULL) {
+    // sun.jkernel.DownloadManager may not present in the JDK; just return
+    return;
+  }
+
+  JavaValue result(T_VOID);
+  JavaCalls::call_static(&result, klass, vmSymbolHandles::setBootClassLoaderHook_name(),
+                                         vmSymbolHandles::void_method_signature(), CHECK);
+}
+#endif // KERNEL
+
 static void reset_vm_info_property(TRAPS) {
   // the vm info string
   ResourceMark rm(THREAD);
@@ -956,7 +973,7 @@
     return;
   }
 
-  KlassHandle group(this, SystemDictionary::threadGroup_klass());
+  KlassHandle group(this, SystemDictionary::ThreadGroup_klass());
   Handle threadObj(this, this->threadObj());
 
   JavaCalls::call_special(&result,
@@ -974,6 +991,7 @@
 // uniquely named instances should derive from this.
 NamedThread::NamedThread() : Thread() {
   _name = NULL;
+  _processed_thread = NULL;
 }
 
 NamedThread::~NamedThread() {
@@ -1155,6 +1173,7 @@
   _exception_handler_pc = 0;
   _exception_stack_size = 0;
   _jvmti_thread_state= NULL;
+  _should_post_on_exceptions_flag = JNI_FALSE;
   _jvmti_get_loaded_classes_closure = NULL;
   _interp_only_mode    = 0;
   _special_runtime_exit_condition = _no_async_condition;
@@ -1212,6 +1231,7 @@
 {
   initialize();
   _is_attaching = is_attaching;
+  assert(_deferred_card_mark.is_empty(), "Default MemRegion ctor");
 }
 
 bool JavaThread::reguard_stack(address cur_sp) {
@@ -1449,7 +1469,7 @@
         // so call ThreadGroup.uncaughtException()
         KlassHandle recvrKlass(THREAD, threadObj->klass());
         CallInfo callinfo;
-        KlassHandle thread_klass(THREAD, SystemDictionary::thread_klass());
+        KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass());
         LinkResolver::resolve_virtual_call(callinfo, threadObj, recvrKlass, thread_klass,
                                            vmSymbolHandles::dispatchUncaughtException_name(),
                                            vmSymbolHandles::throwable_void_signature(),
@@ -1465,7 +1485,7 @@
                                   uncaught_exception,
                                   THREAD);
         } else {
-          KlassHandle thread_group(THREAD, SystemDictionary::threadGroup_klass());
+          KlassHandle thread_group(THREAD, SystemDictionary::ThreadGroup_klass());
           JavaValue result(T_VOID);
           JavaCalls::call_virtual(&result,
                                   group, thread_group,
@@ -1486,7 +1506,7 @@
       while (java_lang_Thread::threadGroup(threadObj()) != NULL && (count-- > 0)) {
         EXCEPTION_MARK;
         JavaValue result(T_VOID);
-        KlassHandle thread_klass(THREAD, SystemDictionary::thread_klass());
+        KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass());
         JavaCalls::call_virtual(&result,
                               threadObj, thread_klass,
                               vmSymbolHandles::exit_method_name(),
@@ -1617,6 +1637,9 @@
     JNIHandleBlock::release_block(block);
   }
 
+  // These have to be removed while this is still a valid thread.
+  remove_stack_guard_pages();
+
   if (UseTLAB) {
     tlab().make_parsable(true);  // retire TLAB, if any
   }
@@ -1724,7 +1747,7 @@
   // Check for pending async. exception
   if (_pending_async_exception != NULL) {
     // Only overwrite an already pending exception, if it is not a threadDeath.
-    if (!has_pending_exception() || !pending_exception()->is_a(SystemDictionary::threaddeath_klass())) {
+    if (!has_pending_exception() || !pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())) {
 
       // We cannot call Exceptions::_throw(...) here because we cannot block
       set_pending_exception(_pending_async_exception, __FILE__, __LINE__);
@@ -1833,14 +1856,14 @@
   if (is_Compiler_thread()) return;
 
   // This is a change from JDK 1.1, but JDK 1.2 will also do it:
-  if (java_throwable->is_a(SystemDictionary::threaddeath_klass())) {
+  if (java_throwable->is_a(SystemDictionary::ThreadDeath_klass())) {
     java_lang_Thread::set_stillborn(threadObj());
   }
 
   {
     // Actually throw the Throwable against the target Thread - however
     // only if there is no thread death exception installed already.
-    if (_pending_async_exception == NULL || !_pending_async_exception->is_a(SystemDictionary::threaddeath_klass())) {
+    if (_pending_async_exception == NULL || !_pending_async_exception->is_a(SystemDictionary::ThreadDeath_klass())) {
       // If the topmost frame is a runtime stub, then we are calling into
       // OptoRuntime from compiled code. Some runtime stubs (new, monitor_exit..)
       // must deoptimize the caller before continuing, as the compiled  exception handler table
@@ -1942,7 +1965,7 @@
 
   MutexLockerEx ml(SR_lock(), Mutex::_no_safepoint_check_flag);
 
-  assert(!this->is_any_suspended(),
+  assert(!this->is_ext_suspended(),
     "a thread trying to self-suspend should not already be suspended");
 
   if (this->is_suspend_equivalent()) {
@@ -2114,7 +2137,7 @@
   int allocate = os::allocate_stack_guard_pages();
   // warning("Guarding at " PTR_FORMAT " for len " SIZE_FORMAT "\n", low_addr, len);
 
-  if (allocate && !os::commit_memory((char *) low_addr, len)) {
+  if (allocate && !os::create_stack_guard_pages((char *) low_addr, len)) {
     warning("Attempt to allocate stack guard pages failed.");
     return;
   }
@@ -2135,7 +2158,7 @@
   size_t len = (StackYellowPages + StackRedPages) * os::vm_page_size();
 
   if (os::allocate_stack_guard_pages()) {
-    if (os::uncommit_memory((char *) low_addr, len)) {
+    if (os::remove_stack_guard_pages((char *) low_addr, len)) {
       _stack_guard_state = stack_guard_unused;
     } else {
       warning("Attempt to deallocate stack guard pages failed.");
@@ -2315,18 +2338,44 @@
   frames_do(frame_gc_prologue);
 }
 
-
-void JavaThread::oops_do(OopClosure* f) {
+// If the caller is a NamedThread, then remember, in the current scope,
+// the given JavaThread in its _processed_thread field.
+class RememberProcessedThread: public StackObj {
+  NamedThread* _cur_thr;
+public:
+  RememberProcessedThread(JavaThread* jthr) {
+    Thread* thread = Thread::current();
+    if (thread->is_Named_thread()) {
+      _cur_thr = (NamedThread *)thread;
+      _cur_thr->set_processed_thread(jthr);
+    } else {
+      _cur_thr = NULL;
+    }
+  }
+
+  ~RememberProcessedThread() {
+    if (_cur_thr) {
+      _cur_thr->set_processed_thread(NULL);
+    }
+  }
+};
+
+void JavaThread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
+  // Verify that the deferred card marks have been flushed.
+  assert(deferred_card_mark().is_empty(), "Should be empty during GC");
+
   // The ThreadProfiler oops_do is done from FlatProfiler::oops_do
   // since there may be more than one thread using each ThreadProfiler.
 
   // Traverse the GCHandles
-  Thread::oops_do(f);
+  Thread::oops_do(f, cf);
 
   assert( (!has_last_Java_frame() && java_call_counter() == 0) ||
           (has_last_Java_frame() && java_call_counter() > 0), "wrong java_sp info!");
 
   if (has_last_Java_frame()) {
+    // Record JavaThread to GC thread
+    RememberProcessedThread rpt(this);
 
     // Traverse the privileged stack
     if (_privileged_stack_top != NULL) {
@@ -2347,7 +2396,7 @@
 
     // Traverse the execution stack
     for(StackFrameStream fst(this); !fst.is_done(); fst.next()) {
-      fst.current()->oops_do(f, fst.register_map());
+      fst.current()->oops_do(f, cf, fst.register_map());
     }
   }
 
@@ -2379,9 +2428,8 @@
   }
 }
 
-void JavaThread::nmethods_do() {
-  // Traverse the GCHandles
-  Thread::nmethods_do();
+void JavaThread::nmethods_do(CodeBlobClosure* cf) {
+  Thread::nmethods_do(cf);  // (super method is a no-op)
 
   assert( (!has_last_Java_frame() && java_call_counter() == 0) ||
           (has_last_Java_frame() && java_call_counter() > 0), "wrong java_sp info!");
@@ -2389,7 +2437,7 @@
   if (has_last_Java_frame()) {
     // Traverse the execution stack
     for(StackFrameStream fst(this); !fst.is_done(); fst.next()) {
-      fst.current()->nmethods_do();
+      fst.current()->nmethods_do(cf);
     }
   }
 }
@@ -2463,7 +2511,7 @@
 
 void JavaThread::verify() {
   // Verify oops in the thread.
-  oops_do(&VerifyOopClosure::verify_oop);
+  oops_do(&VerifyOopClosure::verify_oop, NULL);
 
   // Verify the stack frames.
   frames_do(frame_verify);
@@ -3050,6 +3098,12 @@
       warning("java.lang.ArithmeticException has not been initialized");
       warning("java.lang.StackOverflowError has not been initialized");
     }
+
+    if (EnableInvokeDynamic) {
+      // JSR 292: An intialized java.dyn.InvokeDynamic is required in
+      // the compiler.
+      initialize_class(vmSymbolHandles::java_dyn_InvokeDynamic(), CHECK_0);
+    }
   }
 
   // See        : bugid 4211085.
@@ -3097,6 +3151,12 @@
     vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
   }
 
+#ifdef KERNEL
+  if (JDK_Version::is_gte_jdk17x_version()) {
+    set_jkernel_boot_classloader_hook(THREAD);
+  }
+#endif // KERNEL
+
 #ifndef SERIALGC
   // Support for ConcurrentMarkSweep. This should be cleaned up
   // and better encapsulated. The ugly nested if test would go away
@@ -3602,14 +3662,14 @@
 // uses the Threads_lock to gurantee this property. It also makes sure that
 // all threads gets blocked when exiting or starting).
 
-void Threads::oops_do(OopClosure* f) {
+void Threads::oops_do(OopClosure* f, CodeBlobClosure* cf) {
   ALL_JAVA_THREADS(p) {
-    p->oops_do(f);
+    p->oops_do(f, cf);
   }
-  VMThread::vm_thread()->oops_do(f);
+  VMThread::vm_thread()->oops_do(f, cf);
 }
 
-void Threads::possibly_parallel_oops_do(OopClosure* f) {
+void Threads::possibly_parallel_oops_do(OopClosure* f, CodeBlobClosure* cf) {
   // Introduce a mechanism allowing parallel threads to claim threads as
   // root groups.  Overhead should be small enough to use all the time,
   // even in sequential code.
@@ -3618,12 +3678,12 @@
   int cp = SharedHeap::heap()->strong_roots_parity();
   ALL_JAVA_THREADS(p) {
     if (p->claim_oops_do(is_par, cp)) {
-      p->oops_do(f);
+      p->oops_do(f, cf);
     }
   }
   VMThread* vmt = VMThread::vm_thread();
   if (vmt->claim_oops_do(is_par, cp))
-    vmt->oops_do(f);
+    vmt->oops_do(f, cf);
 }
 
 #ifndef SERIALGC
@@ -3644,11 +3704,11 @@
 }
 #endif // SERIALGC
 
-void Threads::nmethods_do() {
+void Threads::nmethods_do(CodeBlobClosure* cf) {
   ALL_JAVA_THREADS(p) {
-    p->nmethods_do();
+    p->nmethods_do(cf);
   }
-  VMThread::vm_thread()->nmethods_do();
+  VMThread::vm_thread()->nmethods_do(cf);
 }
 
 void Threads::gc_epilogue() {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/thread.hpp
--- a/src/share/vm/runtime/thread.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/thread.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -48,7 +48,12 @@
 
 // Class hierarchy
 // - Thread
-//   - VMThread
+//   - NamedThread
+//     - VMThread
+//     - ConcurrentGCThread
+//     - WorkerThread
+//       - GangWorker
+//       - GCTaskThread
 //   - JavaThread
 //   - WatcherThread
 
@@ -249,6 +254,7 @@
   virtual bool is_GC_task_thread() const             { return false; }
   virtual bool is_Watcher_thread() const             { return false; }
   virtual bool is_ConcurrentGC_thread() const        { return false; }
+  virtual bool is_Named_thread() const               { return false; }
 
   virtual char* name() const { return (char*)"Unknown thread"; }
 
@@ -374,7 +380,8 @@
 
   // GC support
   // Apply "f->do_oop" to all root oops in "this".
-  void oops_do(OopClosure* f);
+  // Apply "cf->do_code_blob" (if !NULL) to all code blobs active in frames
+  void oops_do(OopClosure* f, CodeBlobClosure* cf);
 
   // Handles the parallel case for the method below.
 private:
@@ -398,7 +405,7 @@
   }
 
   // Sweeper support
-  void nmethods_do();
+  void nmethods_do(CodeBlobClosure* cf);
 
   // Tells if adr belong to this thread. This is used
   // for checking if a lock is owned by the running thread.
@@ -567,12 +574,18 @@
   };
  private:
   char* _name;
+  // log JavaThread being processed by oops_do
+  JavaThread* _processed_thread;
+
  public:
   NamedThread();
   ~NamedThread();
   // May only be called once per thread.
   void set_name(const char* format, ...);
+  virtual bool is_Named_thread() const { return true; }
   virtual char* name() const { return _name == NULL ? (char*)"Unknown Thread" : _name; }
+  JavaThread *processed_thread() { return _processed_thread; }
+  void set_processed_thread(JavaThread *thread) { _processed_thread = thread; }
 };
 
 // Worker threads are named and have an id of an assigned work.
@@ -683,8 +696,13 @@
   methodOop     _callee_target;
 
   // Oop results of VM runtime calls
-  oop           _vm_result;                      // Used to pass back an oop result into Java code, GC-preserved
-  oop           _vm_result_2;                    // Used to pass back an oop result into Java code, GC-preserved
+  oop           _vm_result;    // Used to pass back an oop result into Java code, GC-preserved
+  oop           _vm_result_2;  // Used to pass back an oop result into Java code, GC-preserved
+
+  // See ReduceInitialCardMarks: this holds the precise space interval of
+  // the most recent slow path allocation for which compiled code has
+  // elided card-marks for performance along the fast-path.
+  MemRegion     _deferred_card_mark;
 
   MonitorChunk* _monitor_chunks;                 // Contains the off stack monitors
                                                  // allocated during deoptimization
@@ -754,6 +772,7 @@
   volatile address _exception_pc;                // PC where exception happened
   volatile address _exception_handler_pc;        // PC for handler of exception
   volatile int     _exception_stack_size;        // Size of frame where exception happened
+  volatile int     _is_method_handle_exception;  // True if the current exception PC is at a MethodHandle call.
 
   // support for compilation
   bool    _is_compiling;                         // is true if a compilation is active inthis thread (one compilation per thread possible)
@@ -967,11 +986,6 @@
     return (_suspend_flags & _ext_suspended) != 0;
   }
 
-  // legacy method that checked for either external suspension or vm suspension
-  bool is_any_suspended() const {
-    return is_ext_suspended();
-  }
-
   bool is_external_suspend_with_lock() const {
     MutexLockerEx ml(SR_lock(), Mutex::_no_safepoint_check_flag);
     return is_external_suspend();
@@ -997,10 +1011,6 @@
     return ret;
   }
 
-  bool is_any_suspended_with_lock() const {
-    MutexLockerEx ml(SR_lock(), Mutex::_no_safepoint_check_flag);
-    return is_any_suspended();
-  }
   // utility methods to see if we are doing some kind of suspension
   bool is_being_ext_suspended() const            {
     MutexLockerEx ml(SR_lock(), Mutex::_no_safepoint_check_flag);
@@ -1090,16 +1100,21 @@
   oop  vm_result_2() const                       { return _vm_result_2; }
   void set_vm_result_2  (oop x)                  { _vm_result_2   = x; }
 
+  MemRegion deferred_card_mark() const           { return _deferred_card_mark; }
+  void set_deferred_card_mark(MemRegion mr)      { _deferred_card_mark = mr;   }
+
   // Exception handling for compiled methods
   oop      exception_oop() const                 { return _exception_oop; }
   int      exception_stack_size() const          { return _exception_stack_size; }
   address  exception_pc() const                  { return _exception_pc; }
   address  exception_handler_pc() const          { return _exception_handler_pc; }
+  int      is_method_handle_exception() const    { return _is_method_handle_exception; }
 
   void set_exception_oop(oop o)                  { _exception_oop = o; }
   void set_exception_pc(address a)               { _exception_pc = a; }
   void set_exception_handler_pc(address a)       { _exception_handler_pc = a; }
   void set_exception_stack_size(int size)        { _exception_stack_size = size; }
+  void set_is_method_handle_exception(int value) { _is_method_handle_exception = value; }
 
   // Stack overflow support
   inline size_t stack_available(address cur_sp);
@@ -1173,10 +1188,14 @@
   static ByteSize exception_pc_offset()          { return byte_offset_of(JavaThread, _exception_pc        ); }
   static ByteSize exception_handler_pc_offset()  { return byte_offset_of(JavaThread, _exception_handler_pc); }
   static ByteSize exception_stack_size_offset()  { return byte_offset_of(JavaThread, _exception_stack_size); }
+  static ByteSize is_method_handle_exception_offset() { return byte_offset_of(JavaThread, _is_method_handle_exception); }
   static ByteSize stack_guard_state_offset()     { return byte_offset_of(JavaThread, _stack_guard_state   ); }
   static ByteSize suspend_flags_offset()         { return byte_offset_of(JavaThread, _suspend_flags       ); }
 
   static ByteSize do_not_unlock_if_synchronized_offset() { return byte_offset_of(JavaThread, _do_not_unlock_if_synchronized); }
+  static ByteSize should_post_on_exceptions_flag_offset() {
+    return byte_offset_of(JavaThread, _should_post_on_exceptions_flag);
+  }
 
 #ifndef SERIALGC
   static ByteSize satb_mark_queue_offset()       { return byte_offset_of(JavaThread, _satb_mark_queue); }
@@ -1238,10 +1257,10 @@
   void frames_do(void f(frame*, const RegisterMap*));
 
   // Memory operations
-  void oops_do(OopClosure* f);
+  void oops_do(OopClosure* f, CodeBlobClosure* cf);
 
   // Sweeper operations
-  void nmethods_do();
+  void nmethods_do(CodeBlobClosure* cf);
 
   // Memory management operations
   void gc_epilogue();
@@ -1416,6 +1435,16 @@
   void increment_interp_only_mode()         { ++_interp_only_mode; }
   void decrement_interp_only_mode()         { --_interp_only_mode; }
 
+  // support for cached flag that indicates whether exceptions need to be posted for this thread
+  // if this is false, we can avoid deoptimizing when events are thrown
+  // this gets set to reflect whether jvmtiExport::post_exception_throw would actually do anything
+ private:
+  int    _should_post_on_exceptions_flag;
+
+ public:
+  int   should_post_on_exceptions_flag()  { return _should_post_on_exceptions_flag; }
+  void  set_should_post_on_exceptions_flag(int val)  { _should_post_on_exceptions_flag = val; }
+
  private:
   ThreadStatistics *_thread_stat;
 
@@ -1629,9 +1658,9 @@
 
   // Apply "f->do_oop" to all root oops in all threads.
   // This version may only be called by sequential code.
-  static void oops_do(OopClosure* f);
+  static void oops_do(OopClosure* f, CodeBlobClosure* cf);
   // This version may be called by sequential or parallel code.
-  static void possibly_parallel_oops_do(OopClosure* f);
+  static void possibly_parallel_oops_do(OopClosure* f, CodeBlobClosure* cf);
   // This creates a list of GCTasks, one per thread.
   static void create_thread_roots_tasks(GCTaskQueue* q);
   // This creates a list of GCTasks, one per thread, for marking objects.
@@ -1639,13 +1668,13 @@
 
   // Apply "f->do_oop" to roots in all threads that
   // are part of compiled frames
-  static void compiled_frame_oops_do(OopClosure* f);
+  static void compiled_frame_oops_do(OopClosure* f, CodeBlobClosure* cf);
 
   static void convert_hcode_pointers();
   static void restore_hcode_pointers();
 
   // Sweeper
-  static void nmethods_do();
+  static void nmethods_do(CodeBlobClosure* cf);
 
   static void gc_epilogue();
   static void gc_prologue();
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vframe.cpp
--- a/src/share/vm/runtime/vframe.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vframe.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -124,7 +124,7 @@
 static void print_locked_object_class_name(outputStream* st, Handle obj, const char* lock_state) {
   if (obj.not_null()) {
     st->print("\t- %s <" INTPTR_FORMAT "> ", lock_state, (address)obj());
-    if (obj->klass() == SystemDictionary::class_klass()) {
+    if (obj->klass() == SystemDictionary::Class_klass()) {
       klassOop target_klass = java_lang_Class::as_klassOop(obj());
       st->print_cr("(a java.lang.Class for %s)", instanceKlass::cast(target_klass)->external_name());
     } else {
@@ -430,8 +430,10 @@
       // This is Method.invoke() -- skip it
     } else if (use_new_reflection &&
               Klass::cast(method()->method_holder())
-                 ->is_subclass_of(SystemDictionary::reflect_method_accessor_klass())) {
+                 ->is_subclass_of(SystemDictionary::reflect_MethodAccessorImpl_klass())) {
       // This is an auxilary frame -- skip it
+    } else if (method()->is_method_handle_adapter()) {
+      // This is an internal adapter frame from the MethodHandleCompiler -- skip it
     } else {
       // This is non-excluded frame, we need to count it against the depth
       if (depth-- <= 0) {
@@ -490,8 +492,8 @@
 void vframeStreamCommon::skip_reflection_related_frames() {
   while (!at_end() &&
          (JDK_Version::is_gte_jdk14x_version() && UseNewReflection &&
-          (Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_method_accessor_klass()) ||
-           Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_constructor_accessor_klass())))) {
+          (Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_MethodAccessorImpl_klass()) ||
+           Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_ConstructorAccessorImpl_klass())))) {
     next();
   }
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vframe.hpp
--- a/src/share/vm/runtime/vframe.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vframe.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -402,12 +402,7 @@
   DebugInfoReadStream buffer(nm(), decode_offset);
   _sender_decode_offset = buffer.read_int();
   _method               = methodOop(buffer.read_oop());
-  // Deoptimization needs reexecute bit to determine whether to reexecute the bytecode
-  // only at the time when it "unpack_frames", and the reexecute bit info could always
-  // be obtained from the scopeDesc in the compiledVFrame. As a result, we don't keep
-  // the reexecute bit here.
-  bool dummy_reexecute;
-  _bci                  = buffer.read_bci_and_reexecute(dummy_reexecute);
+  _bci                  = buffer.read_bci();
 
   assert(_method->is_method(), "checking type of decoded method");
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vframeArray.cpp
--- a/src/share/vm/runtime/vframeArray.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vframeArray.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 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
@@ -186,7 +186,7 @@
   int popframe_preserved_args_size_in_bytes = 0;
   int popframe_preserved_args_size_in_words = 0;
   if (is_top_frame) {
-  JvmtiThreadState *state = thread->jvmti_thread_state();
+    JvmtiThreadState *state = thread->jvmti_thread_state();
     if (JvmtiExport::can_pop_frame() &&
         (thread->has_pending_popframe() || thread->popframe_forcing_deopt_reexecution())) {
       if (thread->has_pending_popframe()) {
@@ -381,7 +381,6 @@
     RegisterMap map(thread);
     vframe* f = vframe::new_vframe(iframe(), &map, thread);
     f->print();
-    iframe()->interpreter_frame_print_on(tty);
 
     tty->print_cr("locals size     %d", locals()->size());
     tty->print_cr("expression size %d", expressions()->size());
@@ -582,7 +581,7 @@
 }
 
 void vframeArrayElement::print(outputStream* st) {
-  st->print_cr(" - interpreter_frame -> sp: ", INTPTR_FORMAT, iframe()->sp());
+  st->print_cr(" - interpreter_frame -> sp: " INTPTR_FORMAT, iframe()->sp());
 }
 
 void vframeArray::print_value_on(outputStream* st) const {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vframeArray.hpp
--- a/src/share/vm/runtime/vframeArray.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vframeArray.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vframe_hp.hpp
--- a/src/share/vm/runtime/vframe_hp.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vframe_hp.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vmStructs.cpp
--- a/src/share/vm/runtime/vmStructs.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vmStructs.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -309,6 +309,7 @@
   nonstatic_field(CollectedHeap,               _reserved,                                     MemRegion)                             \
   nonstatic_field(SharedHeap,                  _perm_gen,                                     PermGen*)                              \
   nonstatic_field(CollectedHeap,               _barrier_set,                                  BarrierSet*)                           \
+  nonstatic_field(CollectedHeap,               _defer_initial_card_mark,                      bool)                                  \
   nonstatic_field(CollectedHeap,               _is_gc_active,                                 bool)                                  \
   nonstatic_field(CompactibleSpace,            _compaction_top,                               HeapWord*)                             \
   nonstatic_field(CompactibleSpace,            _first_dead,                                   HeapWord*)                             \
@@ -455,40 +456,38 @@
       static_field(SystemDictionary,            _shared_dictionary,                            Dictionary*)                          \
       static_field(SystemDictionary,            _system_loader_lock_obj,                       oop)                                  \
       static_field(SystemDictionary,            _loader_constraints,                           LoaderConstraintTable*)               \
-      static_field(SystemDictionary,            WK_KLASS(object_klass),                        klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(string_klass),                        klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(class_klass),                         klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(cloneable_klass),                     klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(classloader_klass),                   klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(serializable_klass),                  klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(system_klass),                        klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(throwable_klass),                     klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(threaddeath_klass),                   klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(error_klass),                         klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(exception_klass),                     klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(runtime_exception_klass),             klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(classNotFoundException_klass),        klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(noClassDefFoundError_klass),          klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(linkageError_klass),                  klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Object_klass),                        klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(String_klass),                        klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Class_klass),                         klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Cloneable_klass),                     klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(ClassLoader_klass),                   klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Serializable_klass),                  klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(System_klass),                        klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Throwable_klass),                     klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(ThreadDeath_klass),                   klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Error_klass),                         klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Exception_klass),                     klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(RuntimeException_klass),              klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(ClassNotFoundException_klass),        klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(NoClassDefFoundError_klass),          klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(LinkageError_klass),                  klassOop)                             \
       static_field(SystemDictionary,            WK_KLASS(ClassCastException_klass),            klassOop)                             \
       static_field(SystemDictionary,            WK_KLASS(ArrayStoreException_klass),           klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(virtualMachineError_klass),           klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(VirtualMachineError_klass),           klassOop)                             \
       static_field(SystemDictionary,            WK_KLASS(OutOfMemoryError_klass),              klassOop)                             \
       static_field(SystemDictionary,            WK_KLASS(StackOverflowError_klass),            klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(protectionDomain_klass),              klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(ProtectionDomain_klass),              klassOop)                             \
       static_field(SystemDictionary,            WK_KLASS(AccessControlContext_klass),          klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(reference_klass),                     klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(soft_reference_klass),                klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(weak_reference_klass),                klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(final_reference_klass),               klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(phantom_reference_klass),             klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(finalizer_klass),                     klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(thread_klass),                        klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(threadGroup_klass),                   klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(properties_klass),                    klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(stringBuffer_klass),                  klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(vector_klass),                        klassOop)                             \
-      static_field(SystemDictionary,            WK_KLASS(hashtable_klass),                     klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Reference_klass),                     klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(SoftReference_klass),                 klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(WeakReference_klass),                 klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(FinalReference_klass),                klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(PhantomReference_klass),              klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Finalizer_klass),                     klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Thread_klass),                        klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(ThreadGroup_klass),                   klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(Properties_klass),                    klassOop)                             \
+      static_field(SystemDictionary,            WK_KLASS(StringBuffer_klass),                  klassOop)                             \
       static_field(SystemDictionary,            _box_klasses[0],                               klassOop)                             \
       static_field(SystemDictionary,            _java_system_loader,                           oop)                                  \
                                                                                                                                      \
@@ -549,6 +548,7 @@
   /********************************/                                                                                                 \
                                                                                                                                      \
      static_field(CodeCache,                   _heap,                                         CodeHeap*)                             \
+     static_field(CodeCache,                   _scavenge_root_nmethods,                       nmethod*)                              \
                                                                                                                                      \
   /*******************************/                                                                                                  \
   /* CodeHeap (NOTE: incomplete) */                                                                                                  \
@@ -593,6 +593,8 @@
                                                                                                                                      \
   nonstatic_field(PcDesc,                      _pc_offset,                                    int)                                   \
   nonstatic_field(PcDesc,                      _scope_decode_offset,                          int)                                   \
+  nonstatic_field(PcDesc,                      _obj_decode_offset,                            int)                                   \
+  nonstatic_field(PcDesc,                      _flags,                        PcDesc::PcDescFlags)                                   \
                                                                                                                                      \
   /***************************************************/                                                                              \
   /* CodeBlobs (NOTE: incomplete, but only a little) */                                                                              \
@@ -617,7 +619,9 @@
      static_field(nmethod,             _zombie_instruction_size,                      int)                                   \
   nonstatic_field(nmethod,             _method,                                       methodOop)                             \
   nonstatic_field(nmethod,             _entry_bci,                                    int)                                   \
-  nonstatic_field(nmethod,             _link,                                         nmethod*)                              \
+  nonstatic_field(nmethod,             _osr_link,                                     nmethod*)                              \
+  nonstatic_field(nmethod,             _scavenge_root_link,                           nmethod*)                              \
+  nonstatic_field(nmethod,             _scavenge_root_state,                          jbyte)                                 \
   nonstatic_field(nmethod,             _exception_offset,                             int)                                   \
   nonstatic_field(nmethod,             _deoptimize_offset,                            int)                                   \
   nonstatic_field(nmethod,             _orig_pc_offset,                               int)                                   \
@@ -661,6 +665,7 @@
   nonstatic_field(Thread,                      _current_pending_monitor_is_from_java,         bool)                                  \
   nonstatic_field(Thread,                      _current_waiting_monitor,                      ObjectMonitor*)                        \
   nonstatic_field(NamedThread,                 _name,                                         char*)                                 \
+  nonstatic_field(NamedThread,                 _processed_thread,                             JavaThread*)                           \
   nonstatic_field(JavaThread,                  _next,                                         JavaThread*)                           \
   nonstatic_field(JavaThread,                  _threadObj,                                    oop)                                   \
   nonstatic_field(JavaThread,                  _anchor,                                       JavaFrameAnchor)                       \
@@ -1158,6 +1163,7 @@
   /***************************************/                               \
                                                                           \
   declare_toplevel_type(PcDesc)                                           \
+  declare_integer_type(PcDesc::PcDescFlags)                               \
                                                                           \
   /************************/                                              \
   /* OopMap and OopMapSet */                                              \
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vmThread.cpp
--- a/src/share/vm/runtime/vmThread.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vmThread.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2010 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
@@ -25,6 +25,10 @@
 # include "incls/_precompiled.incl"
 # include "incls/_vmThread.cpp.incl"
 
+HS_DTRACE_PROBE_DECL3(hotspot, vmops__request, char *, uintptr_t, int);
+HS_DTRACE_PROBE_DECL3(hotspot, vmops__begin, char *, uintptr_t, int);
+HS_DTRACE_PROBE_DECL3(hotspot, vmops__end, char *, uintptr_t, int);
+
 // Dummy VM operation to act as first element in our circular double-linked list
 class VM_Dummy: public VM_Operation {
   VMOp_Type type() const { return VMOp_Dummy; }
@@ -132,6 +136,10 @@
 //-----------------------------------------------------------------
 // High-level interface
 bool VMOperationQueue::add(VM_Operation *op) {
+
+  HS_DTRACE_PROBE3(hotspot, vmops__request, op->name(), strlen(op->name()),
+                   op->evaluation_mode());
+
   // Encapsulates VM queue policy. Currently, that
   // only involves putting them on the right list
   if (op->evaluate_at_safepoint()) {
@@ -204,8 +212,8 @@
 }
 
 
-VMThread::VMThread() : Thread() {
-  // nothing to do
+VMThread::VMThread() : NamedThread() {
+  set_name("VM Thread");
 }
 
 void VMThread::destroy() {
@@ -325,7 +333,11 @@
 
   {
     PerfTraceTime vm_op_timer(perf_accumulated_vm_operation_time());
+    HS_DTRACE_PROBE3(hotspot, vmops__begin, op->name(), strlen(op->name()),
+                     op->evaluation_mode());
     op->evaluate();
+    HS_DTRACE_PROBE3(hotspot, vmops__end, op->name(), strlen(op->name()),
+                     op->evaluation_mode());
   }
 
   // Last access of info in _cur_vm_operation!
@@ -426,11 +438,6 @@
       // follow that also require a safepoint
       if (_cur_vm_operation->evaluate_at_safepoint()) {
 
-        if (PrintGCApplicationConcurrentTime) {
-           gclog_or_tty->print_cr("Application time: %3.7f seconds",
-                                  RuntimeService::last_application_time_sec());
-        }
-
         _vm_queue->set_drain_list(safepoint_ops); // ensure ops can be scanned
 
         SafepointSynchronize::begin();
@@ -477,12 +484,6 @@
         // Complete safepoint synchronization
         SafepointSynchronize::end();
 
-        if (PrintGCApplicationStoppedTime) {
-          gclog_or_tty->print_cr("Total time for which application threads "
-                                 "were stopped: %3.7f seconds",
-                                 RuntimeService::last_safepoint_time_sec());
-        }
-
       } else {  // not a safepoint operation
         if (TraceLongCompiles) {
           elapsedTimer t;
@@ -619,8 +620,8 @@
 }
 
 
-void VMThread::oops_do(OopClosure* f) {
-  Thread::oops_do(f);
+void VMThread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
+  Thread::oops_do(f, cf);
   _vm_queue->oops_do(f);
 }
 
@@ -652,5 +653,5 @@
 #endif
 
 void VMThread::verify() {
-  oops_do(&VerifyOopClosure::verify_oop);
+  oops_do(&VerifyOopClosure::verify_oop, NULL);
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vmThread.hpp
--- a/src/share/vm/runtime/vmThread.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vmThread.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -83,7 +83,7 @@
 // like scavenge, garbage_collect etc.
 //
 
-class VMThread: public Thread {
+class VMThread: public NamedThread {
  private:
   static ThreadPriority _current_priority;
 
@@ -101,8 +101,6 @@
   bool is_VM_thread() const                      { return true; }
   bool is_GC_thread() const                      { return true; }
 
-  char* name() const { return (char*)"VM Thread"; }
-
   // The ever running loop for the VMThread
   void loop();
 
@@ -121,7 +119,7 @@
   static VMThread* vm_thread()                    { return _vm_thread; }
 
   // GC support
-  void oops_do(OopClosure* f);
+  void oops_do(OopClosure* f, CodeBlobClosure* cf);
 
   // Debugging
   void print_on(outputStream* st) const;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vm_operations.cpp
--- a/src/share/vm/runtime/vm_operations.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vm_operations.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -151,6 +151,10 @@
 
 #endif // !PRODUCT
 
+void VM_HandleFullCodeCache::doit() {
+  NMethodSweeper::speculative_disconnect_nmethods(_is_full);
+}
+
 void VM_Verify::doit() {
   Universe::verify();
 }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vm_operations.hpp
--- a/src/share/vm/runtime/vm_operations.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vm_operations.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -41,6 +41,7 @@
   template(DeoptimizeFrame)                       \
   template(DeoptimizeAll)                         \
   template(ZombieAll)                             \
+  template(HandleFullCodeCache)                   \
   template(Verify)                                \
   template(PrintJNI)                              \
   template(HeapDumper)                            \
@@ -241,6 +242,16 @@
   bool allow_nested_vm_operations() const        { return true;  }
 };
 
+class VM_HandleFullCodeCache: public VM_Operation {
+ private:
+  bool  _is_full;
+ public:
+  VM_HandleFullCodeCache(bool is_full)           { _is_full = is_full; }
+  VMOp_Type type() const                         { return VMOp_HandleFullCodeCache; }
+  void doit();
+  bool allow_nested_vm_operations() const        { return true; }
+};
+
 #ifndef PRODUCT
 class VM_DeoptimizeAll: public VM_Operation {
  private:
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/runtime/vm_version.cpp
--- a/src/share/vm/runtime/vm_version.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/runtime/vm_version.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -93,9 +93,13 @@
 #else // KERNEL
 #ifdef TIERED
   #define VMTYPE "Server"
-#else
-  #define VMTYPE COMPILER1_PRESENT("Client")   \
-                 COMPILER2_PRESENT("Server")
+#else // TIERED
+#ifdef ZERO
+  #define VMTYPE "Zero"
+#else // ZERO
+   #define VMTYPE COMPILER1_PRESENT("Client")   \
+                  COMPILER2_PRESENT("Server")
+#endif // ZERO
 #endif // TIERED
 #endif // KERNEL
 
@@ -142,10 +146,14 @@
                  WINDOWS_ONLY("windows")         \
                  SOLARIS_ONLY("solaris")
 
+#ifdef ZERO
+#define CPU      ZERO_LIBARCH
+#else
 #define CPU      IA32_ONLY("x86")                \
                  IA64_ONLY("ia64")               \
                  AMD64_ONLY("amd64")             \
                  SPARC_ONLY("sparc")
+#endif // ZERO
 
 const char *Abstract_VM_Version::vm_platform_string() {
   return OS "-" CPU;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/attachListener.cpp
--- a/src/share/vm/services/attachListener.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/attachListener.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -207,7 +207,7 @@
     int tmp;
     int n = sscanf(arg1, "%d", &tmp);
     if (n != 1) {
-      out->print_cr("flag value has to be boolean (1 or 0)");
+      out->print_cr("flag value must be a boolean (1 or 0)");
       return JNI_ERR;
     }
     value = (tmp != 0);
@@ -226,11 +226,11 @@
   if ((arg1 = op->arg(1)) != NULL) {
     int n = sscanf(arg1, INTX_FORMAT, &value);
     if (n != 1) {
-      out->print_cr("flag value has to be integer");
+      out->print_cr("flag value must be an integer");
       return JNI_ERR;
     }
   }
-  bool res = CommandLineFlags::intxAtPut((char*)name,  &value, ATTACH_ON_DEMAND);
+  bool res = CommandLineFlags::intxAtPut((char*)name, &value, ATTACH_ON_DEMAND);
   if (! res) {
     out->print_cr("setting flag %s failed", name);
   }
@@ -245,11 +245,30 @@
   if ((arg1 = op->arg(1)) != NULL) {
     int n = sscanf(arg1, UINTX_FORMAT, &value);
     if (n != 1) {
-      out->print_cr("flag value has to be integer");
+      out->print_cr("flag value must be an unsigned integer");
       return JNI_ERR;
     }
   }
-  bool res = CommandLineFlags::uintxAtPut((char*)name,  &value, ATTACH_ON_DEMAND);
+  bool res = CommandLineFlags::uintxAtPut((char*)name, &value, ATTACH_ON_DEMAND);
+  if (! res) {
+    out->print_cr("setting flag %s failed", name);
+  }
+
+  return res? JNI_OK : JNI_ERR;
+}
+
+// set a uint64_t global flag using value from AttachOperation
+static jint set_uint64_t_flag(const char* name, AttachOperation* op, outputStream* out) {
+  uint64_t value;
+  const char* arg1;
+  if ((arg1 = op->arg(1)) != NULL) {
+    int n = sscanf(arg1, UINT64_FORMAT, &value);
+    if (n != 1) {
+      out->print_cr("flag value must be an unsigned 64-bit integer");
+      return JNI_ERR;
+    }
+  }
+  bool res = CommandLineFlags::uint64_tAtPut((char*)name, &value, ATTACH_ON_DEMAND);
   if (! res) {
     out->print_cr("setting flag %s failed", name);
   }
@@ -261,10 +280,10 @@
 static jint set_ccstr_flag(const char* name, AttachOperation* op, outputStream* out) {
   const char* value;
   if ((value = op->arg(1)) == NULL) {
-    out->print_cr("flag value has to be a string");
+    out->print_cr("flag value must be a string");
     return JNI_ERR;
   }
-  bool res = CommandLineFlags::ccstrAtPut((char*)name,  &value, ATTACH_ON_DEMAND);
+  bool res = CommandLineFlags::ccstrAtPut((char*)name, &value, ATTACH_ON_DEMAND);
   if (res) {
     FREE_C_HEAP_ARRAY(char, value);
   } else {
@@ -291,6 +310,8 @@
       return set_intx_flag(name, op, out);
     } else if (f->is_uintx()) {
       return set_uintx_flag(name, op, out);
+    } else if (f->is_uint64_t()) {
+      return set_uint64_t_flag(name, op, out);
     } else if (f->is_ccstr()) {
       return set_ccstr_flag(name, op, out);
     } else {
@@ -416,7 +437,7 @@
                        string,
                        CHECK);
 
-  KlassHandle group(THREAD, SystemDictionary::threadGroup_klass());
+  KlassHandle group(THREAD, SystemDictionary::ThreadGroup_klass());
   JavaCalls::call_special(&result,
                         thread_group,
                         group,
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/classLoadingService.cpp
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/dtraceAttacher.cpp
--- a/src/share/vm/services/dtraceAttacher.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/dtraceAttacher.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -135,4 +135,9 @@
   }
 }
 
+void DTrace::set_monitor_dprobes(bool flag) {
+  // explicit setting of DTraceMonitorProbes flag
+  set_bool_flag("DTraceMonitorProbes", flag);
+}
+
 #endif /* SOLARIS */
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/dtraceAttacher.hpp
--- a/src/share/vm/services/dtraceAttacher.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/dtraceAttacher.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -41,4 +41,6 @@
   static void detach_all_clients();
   // set ExtendedDTraceProbes flag
   static void set_extended_dprobes(bool value);
+  // set DTraceMonitorProbes flag
+  static void set_monitor_dprobes(bool value);
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/g1MemoryPool.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/services/g1MemoryPool.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+# include "incls/_precompiled.incl"
+# include "incls/_g1MemoryPool.cpp.incl"
+
+G1MemoryPoolSuper::G1MemoryPoolSuper(G1CollectedHeap* g1h,
+                                     const char* name,
+                                     size_t init_size,
+                                     size_t max_size,
+                                     bool support_usage_threshold) :
+  _g1h(g1h), CollectedMemoryPool(name,
+                                 MemoryPool::Heap,
+                                 init_size,
+                                 max_size,
+                                 support_usage_threshold) {
+  assert(UseG1GC, "sanity");
+}
+
+// See the comment at the top of g1MemoryPool.hpp
+size_t G1MemoryPoolSuper::eden_space_committed(G1CollectedHeap* g1h) {
+  return MAX2(eden_space_used(g1h), (size_t) HeapRegion::GrainBytes);
+}
+
+// See the comment at the top of g1MemoryPool.hpp
+size_t G1MemoryPoolSuper::eden_space_used(G1CollectedHeap* g1h) {
+  size_t young_list_length = g1h->young_list_length();
+  size_t eden_used = young_list_length * HeapRegion::GrainBytes;
+  size_t survivor_used = survivor_space_used(g1h);
+  eden_used = subtract_up_to_zero(eden_used, survivor_used);
+  return eden_used;
+}
+
+// See the comment at the top of g1MemoryPool.hpp
+size_t G1MemoryPoolSuper::eden_space_max(G1CollectedHeap* g1h) {
+  // This should ensure that it returns a value no smaller than the
+  // region size. Currently, eden_space_committed() guarantees that.
+  return eden_space_committed(g1h);
+}
+
+// See the comment at the top of g1MemoryPool.hpp
+size_t G1MemoryPoolSuper::survivor_space_committed(G1CollectedHeap* g1h) {
+  return MAX2(survivor_space_used(g1h), (size_t) HeapRegion::GrainBytes);
+}
+
+// See the comment at the top of g1MemoryPool.hpp
+size_t G1MemoryPoolSuper::survivor_space_used(G1CollectedHeap* g1h) {
+  size_t survivor_num = g1h->g1_policy()->recorded_survivor_regions();
+  size_t survivor_used = survivor_num * HeapRegion::GrainBytes;
+  return survivor_used;
+}
+
+// See the comment at the top of g1MemoryPool.hpp
+size_t G1MemoryPoolSuper::survivor_space_max(G1CollectedHeap* g1h) {
+  // This should ensure that it returns a value no smaller than the
+  // region size. Currently, survivor_space_committed() guarantees that.
+  return survivor_space_committed(g1h);
+}
+
+// See the comment at the top of g1MemoryPool.hpp
+size_t G1MemoryPoolSuper::old_space_committed(G1CollectedHeap* g1h) {
+  size_t committed = overall_committed(g1h);
+  size_t eden_committed = eden_space_committed(g1h);
+  size_t survivor_committed = survivor_space_committed(g1h);
+  committed = subtract_up_to_zero(committed, eden_committed);
+  committed = subtract_up_to_zero(committed, survivor_committed);
+  committed = MAX2(committed, (size_t) HeapRegion::GrainBytes);
+  return committed;
+}
+
+// See the comment at the top of g1MemoryPool.hpp
+size_t G1MemoryPoolSuper::old_space_used(G1CollectedHeap* g1h) {
+  size_t used = overall_used(g1h);
+  size_t eden_used = eden_space_used(g1h);
+  size_t survivor_used = survivor_space_used(g1h);
+  used = subtract_up_to_zero(used, eden_used);
+  used = subtract_up_to_zero(used, survivor_used);
+  return used;
+}
+
+// See the comment at the top of g1MemoryPool.hpp
+size_t G1MemoryPoolSuper::old_space_max(G1CollectedHeap* g1h) {
+  size_t max = overall_max(g1h);
+  size_t eden_max = eden_space_max(g1h);
+  size_t survivor_max = survivor_space_max(g1h);
+  max = subtract_up_to_zero(max, eden_max);
+  max = subtract_up_to_zero(max, survivor_max);
+  max = MAX2(max, (size_t) HeapRegion::GrainBytes);
+  return max;
+}
+
+G1EdenPool::G1EdenPool(G1CollectedHeap* g1h) :
+  G1MemoryPoolSuper(g1h,
+                    "G1 Eden",
+                    eden_space_committed(g1h), /* init_size */
+                    eden_space_max(g1h), /* max_size */
+                    false /* support_usage_threshold */) {
+}
+
+MemoryUsage G1EdenPool::get_memory_usage() {
+  size_t initial_sz = initial_size();
+  size_t max_sz     = max_size();
+  size_t used       = used_in_bytes();
+  size_t committed  = eden_space_committed(_g1h);
+
+  return MemoryUsage(initial_sz, used, committed, max_sz);
+}
+
+G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h) :
+  G1MemoryPoolSuper(g1h,
+                    "G1 Survivor",
+                    survivor_space_committed(g1h), /* init_size */
+                    survivor_space_max(g1h), /* max_size */
+                    false /* support_usage_threshold */) {
+}
+
+MemoryUsage G1SurvivorPool::get_memory_usage() {
+  size_t initial_sz = initial_size();
+  size_t max_sz     = max_size();
+  size_t used       = used_in_bytes();
+  size_t committed  = survivor_space_committed(_g1h);
+
+  return MemoryUsage(initial_sz, used, committed, max_sz);
+}
+
+G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h) :
+  G1MemoryPoolSuper(g1h,
+                    "G1 Old Gen",
+                    old_space_committed(g1h), /* init_size */
+                    old_space_max(g1h), /* max_size */
+                    true /* support_usage_threshold */) {
+}
+
+MemoryUsage G1OldGenPool::get_memory_usage() {
+  size_t initial_sz = initial_size();
+  size_t max_sz     = max_size();
+  size_t used       = used_in_bytes();
+  size_t committed  = old_space_committed(_g1h);
+
+  return MemoryUsage(initial_sz, used, committed, max_sz);
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/g1MemoryPool.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/services/g1MemoryPool.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+class G1CollectedHeap;
+
+// This file contains the three classes that represent the memory
+// pools of the G1 spaces: G1EdenPool, G1SurvivorPool, and
+// G1OldGenPool. In G1, unlike our other GCs, we do not have a
+// physical space for each of those spaces. Instead, we allocate
+// regions for all three spaces out of a single pool of regions (that
+// pool basically covers the entire heap). As a result, the eden,
+// survivor, and old gen are considered logical spaces in G1, as each
+// is a set of non-contiguous regions. This is also reflected in the
+// way we map them to memory pools here. The easiest way to have done
+// this would have been to map the entire G1 heap to a single memory
+// pool. However, it's helpful to show how large the eden and survivor
+// get, as this does affect the performance and behavior of G1. Which
+// is why we introduce the three memory pools implemented here.
+//
+// The above approach inroduces a couple of challenging issues in the
+// implementation of the three memory pools:
+//
+// 1) The used space calculation for a pool is not necessarily
+// independent of the others. We can easily get from G1 the overall
+// used space in the entire heap, the number of regions in the young
+// generation (includes both eden and survivors), and the number of
+// survivor regions. So, from that we calculate:
+//
+//  survivor_used = survivor_num * region_size
+//  eden_used     = young_region_num * region_size - survivor_used
+//  old_gen_used  = overall_used - eden_used - survivor_used
+//
+// Note that survivor_used and eden_used are upper bounds. To get the
+// actual value we would have to iterate over the regions and add up
+// ->used(). But that'd be expensive. So, we'll accept some lack of
+// accuracy for those two. But, we have to be careful when calculating
+// old_gen_used, in case we subtract from overall_used more then the
+// actual number and our result goes negative.
+//
+// 2) Calculating the used space is straightforward, as described
+// above. However, how do we calculate the committed space, given that
+// we allocate space for the eden, survivor, and old gen out of the
+// same pool of regions? One way to do this is to use the used value
+// as also the committed value for the eden and survivor spaces and
+// then calculate the old gen committed space as follows:
+//
+//  old_gen_committed = overall_committed - eden_committed - survivor_committed
+//
+// Maybe a better way to do that would be to calculate used for eden
+// and survivor as a sum of ->used() over their regions and then
+// calculate committed as region_num * region_size (i.e., what we use
+// to calculate the used space now). This is something to consider
+// in the future.
+//
+// 3) Another decision that is again not straightforward is what is
+// the max size that each memory pool can grow to. Right now, we set
+// that the committed size for the eden and the survivors and
+// calculate the old gen max as follows (basically, it's a similar
+// pattern to what we use for the committed space, as described
+// above):
+//
+//  old_gen_max = overall_max - eden_max - survivor_max
+//
+// 4) Now, there is a very subtle issue with all the above. The
+// framework will call get_memory_usage() on the three pools
+// asynchronously. As a result, each call might get a different value
+// for, say, survivor_num which will yield inconsistent values for
+// eden_used, survivor_used, and old_gen_used (as survivor_num is used
+// in the calculation of all three). This would normally be
+// ok. However, it's possible that this might cause the sum of
+// eden_used, survivor_used, and old_gen_used to go over the max heap
+// size and this seems to sometimes cause JConsole (and maybe other
+// clients) to get confused. There's not a really an easy / clean
+// solution to this problem, due to the asynchrounous nature of the
+// framework.
+
+
+// This class is shared by the three G1 memory pool classes
+// (G1EdenPool, G1SurvivorPool, G1OldGenPool). Given that the way we
+// calculate used / committed bytes for these three pools is related
+// (see comment above), we put the calculations in this class so that
+// we can easily share them among the subclasses.
+class G1MemoryPoolSuper : public CollectedMemoryPool {
+private:
+  // It returns x - y if x > y, 0 otherwise.
+  // As described in the comment above, some of the inputs to the
+  // calculations we have to do are obtained concurrently and hence
+  // may be inconsistent with each other. So, this provides a
+  // defensive way of performing the subtraction and avoids the value
+  // going negative (which would mean a very large result, given that
+  // the parameter are size_t).
+  static size_t subtract_up_to_zero(size_t x, size_t y) {
+    if (x > y) {
+      return x - y;
+    } else {
+      return 0;
+    }
+  }
+
+protected:
+  G1CollectedHeap* _g1h;
+
+  // Would only be called from subclasses.
+  G1MemoryPoolSuper(G1CollectedHeap* g1h,
+                    const char* name,
+                    size_t init_size,
+                    size_t max_size,
+                    bool support_usage_threshold);
+
+  // The reason why all the code is in static methods is so that it
+  // can be safely called from the constructors of the subclasses.
+
+  static size_t overall_committed(G1CollectedHeap* g1h) {
+    return g1h->capacity();
+  }
+  static size_t overall_used(G1CollectedHeap* g1h) {
+    return g1h->used_unlocked();
+  }
+  static size_t overall_max(G1CollectedHeap* g1h) {
+    return g1h->g1_reserved_obj_bytes();
+  }
+
+  static size_t eden_space_committed(G1CollectedHeap* g1h);
+  static size_t eden_space_used(G1CollectedHeap* g1h);
+  static size_t eden_space_max(G1CollectedHeap* g1h);
+
+  static size_t survivor_space_committed(G1CollectedHeap* g1h);
+  static size_t survivor_space_used(G1CollectedHeap* g1h);
+  static size_t survivor_space_max(G1CollectedHeap* g1h);
+
+  static size_t old_space_committed(G1CollectedHeap* g1h);
+  static size_t old_space_used(G1CollectedHeap* g1h);
+  static size_t old_space_max(G1CollectedHeap* g1h);
+};
+
+// Memory pool that represents the G1 eden.
+class G1EdenPool : public G1MemoryPoolSuper {
+public:
+  G1EdenPool(G1CollectedHeap* g1h);
+
+  size_t used_in_bytes() {
+    return eden_space_used(_g1h);
+  }
+  size_t max_size() const {
+    return eden_space_max(_g1h);
+  }
+  MemoryUsage get_memory_usage();
+};
+
+// Memory pool that represents the G1 survivor.
+class G1SurvivorPool : public G1MemoryPoolSuper {
+public:
+  G1SurvivorPool(G1CollectedHeap* g1h);
+
+  size_t used_in_bytes() {
+    return survivor_space_used(_g1h);
+  }
+  size_t max_size() const {
+    return survivor_space_max(_g1h);
+  }
+  MemoryUsage get_memory_usage();
+};
+
+// Memory pool that represents the G1 old gen.
+class G1OldGenPool : public G1MemoryPoolSuper {
+public:
+  G1OldGenPool(G1CollectedHeap* g1h);
+
+  size_t used_in_bytes() {
+    return old_space_used(_g1h);
+  }
+  size_t max_size() const {
+    return old_space_max(_g1h);
+  }
+  MemoryUsage get_memory_usage();
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/heapDumper.cpp
--- a/src/share/vm/services/heapDumper.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/heapDumper.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1274,7 +1274,7 @@
   if (o->is_klass()) return;
 
   // skip classes as these emitted as HPROF_GC_CLASS_DUMP records
-  if (o->klass() == SystemDictionary::class_klass()) {
+  if (o->klass() == SystemDictionary::Class_klass()) {
     if (!java_lang_Class::is_primitive(o)) {
       return;
     }
@@ -1913,8 +1913,9 @@
     if (use_default_filename) {
       char fn[32];
       sprintf(fn, "java_pid%d", os::current_process_id());
-      assert(strlen(base_path) + strlen(fn) < sizeof(base_path), "HeapDumpPath too long");
+      assert(strlen(base_path) + strlen(fn) + strlen(".hprof") < sizeof(base_path), "HeapDumpPath too long");
       strcat(base_path, fn);
+      strcat(base_path, ".hprof");
     }
     assert(strlen(base_path) < sizeof(my_path), "Buffer too small");
     strcpy(my_path, base_path);
@@ -1927,8 +1928,6 @@
     strcat(my_path, fn);
   }
   dump_file_seq++;   // increment seq number for next time we dump
-  assert(strlen(".hprof") + strlen(my_path) < sizeof(my_path), "HeapDumpPath too long");
-  strcat(my_path, ".hprof");
 
   HeapDumper dumper(false /* no GC before heap dump */,
                     true  /* send to tty */);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/lowMemoryDetector.cpp
--- a/src/share/vm/services/lowMemoryDetector.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/lowMemoryDetector.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -32,7 +32,7 @@
 void LowMemoryDetector::initialize() {
   EXCEPTION_MARK;
 
-  instanceKlassHandle klass (THREAD,  SystemDictionary::thread_klass());
+  instanceKlassHandle klass (THREAD,  SystemDictionary::Thread_klass());
   instanceHandle thread_oop = klass->allocate_instance_handle(CHECK);
 
   const char thread_name[] = "Low Memory Detector";
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/management.cpp
--- a/src/share/vm/services/management.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/management.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -491,7 +491,7 @@
   int num_flags = Arguments::num_jvm_flags();
   int num_args = Arguments::num_jvm_args();
 
-  instanceKlassHandle ik (THREAD, SystemDictionary::string_klass());
+  instanceKlassHandle ik (THREAD, SystemDictionary::String_klass());
   objArrayOop r = oopFactory::new_objArray(ik(), num_args + num_flags, CHECK_NULL);
   objArrayHandle result_h(THREAD, r);
 
@@ -790,7 +790,7 @@
   assert(!has_undefined_init_size, "Undefined init size");
   assert(!has_undefined_max_size, "Undefined max size");
 
-  MemoryUsage usage((heap ? Arguments::initial_heap_size() : total_init),
+  MemoryUsage usage((heap ? InitialHeapSize : total_init),
                     total_used,
                     total_committed,
                     (heap ? Universe::heap()->max_capacity() : total_max));
@@ -1321,7 +1321,7 @@
   LoadedClassesEnumerator lce(THREAD);  // Pass current Thread as parameter
 
   int num_classes = lce.num_loaded_classes();
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::class_klass(), num_classes, CHECK_0);
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), num_classes, CHECK_0);
   objArrayHandle classes_ah(THREAD, r);
 
   for (int i = 0; i < num_classes; i++) {
@@ -1481,7 +1481,7 @@
   // last flag entry is always NULL, so subtract 1
   int nFlags = (int) Flag::numFlags - 1;
   // allocate a temp array
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::string_klass(),
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(),
                                            nFlags, CHECK_0);
   objArrayHandle flags_ah(THREAD, r);
   int num_entries = 0;
@@ -1497,7 +1497,7 @@
 
   if (num_entries < nFlags) {
     // Return array of right length
-    objArrayOop res = oopFactory::new_objArray(SystemDictionary::string_klass(), num_entries, CHECK_0);
+    objArrayOop res = oopFactory::new_objArray(SystemDictionary::String_klass(), num_entries, CHECK_0);
     for(int i = 0; i < num_entries; i++) {
       res->obj_at_put(i, flags_ah->obj_at(i));
     }
@@ -1507,16 +1507,17 @@
   return (jobjectArray)JNIHandles::make_local(env, flags_ah());
 JVM_END
 
-// utility function used by jmm_GetVMGlobals
-void add_global_entry(JNIEnv* env, Handle name, jmmVMGlobal *global, Flag *flag, TRAPS) {
+// Utility function used by jmm_GetVMGlobals.  Returns false if flag type
+// can't be determined, true otherwise.  If false is returned, then *global
+// will be incomplete and invalid.
+bool add_global_entry(JNIEnv* env, Handle name, jmmVMGlobal *global, Flag *flag, TRAPS) {
   Handle flag_name;
   if (name() == NULL) {
-    flag_name = java_lang_String::create_from_str(flag->name, CHECK);
+    flag_name = java_lang_String::create_from_str(flag->name, CHECK_false);
   } else {
     flag_name = name;
   }
   global->name = (jstring)JNIHandles::make_local(env, flag_name());
-  global->type = JMM_VMGLOBAL_TYPE_UNKNOWN;
 
   if (flag->is_bool()) {
     global->value.z = flag->get_bool() ? JNI_TRUE : JNI_FALSE;
@@ -1527,10 +1528,16 @@
   } else if (flag->is_uintx()) {
     global->value.j = (jlong)flag->get_uintx();
     global->type = JMM_VMGLOBAL_TYPE_JLONG;
+  } else if (flag->is_uint64_t()) {
+    global->value.j = (jlong)flag->get_uint64_t();
+    global->type = JMM_VMGLOBAL_TYPE_JLONG;
   } else if (flag->is_ccstr()) {
-    Handle str = java_lang_String::create_from_str(flag->get_ccstr(), CHECK);
+    Handle str = java_lang_String::create_from_str(flag->get_ccstr(), CHECK_false);
     global->value.l = (jobject)JNIHandles::make_local(env, str());
     global->type = JMM_VMGLOBAL_TYPE_JSTRING;
+  } else {
+    global->type = JMM_VMGLOBAL_TYPE_UNKNOWN;
+    return false;
   }
 
   global->writeable = flag->is_writeable();
@@ -1557,6 +1564,8 @@
     default:
       global->origin = JMM_VMGLOBAL_ORIGIN_OTHER;
   }
+
+  return true;
 }
 
 // Fill globals array of count length with jmmVMGlobal entries
@@ -1583,7 +1592,7 @@
     objArrayHandle names_ah(THREAD, ta);
     // Make sure we have a String array
     klassOop element_klass = objArrayKlass::cast(names_ah->klass())->element_klass();
-    if (element_klass != SystemDictionary::string_klass()) {
+    if (element_klass != SystemDictionary::String_klass()) {
       THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
                  "Array element type is not String class", 0);
     }
@@ -1599,8 +1608,8 @@
       Handle sh(THREAD, s);
       char* str = java_lang_String::as_utf8_string(s);
       Flag* flag = Flag::find_flag(str, strlen(str));
-      if (flag != NULL) {
-        add_global_entry(env, sh, &globals[i], flag, THREAD);
+      if (flag != NULL &&
+          add_global_entry(env, sh, &globals[i], flag, THREAD)) {
         num_entries++;
       } else {
         globals[i].name = NULL;
@@ -1617,8 +1626,8 @@
     for (int i = 0; i < nFlags && num_entries < count;  i++) {
       Flag* flag = &Flag::flags[i];
       // Exclude the locked (diagnostic, experimental) flags
-      if (flag->is_unlocked() || flag->is_unlocker()) {
-        add_global_entry(env, null_h, &globals[num_entries], flag, THREAD);
+      if ((flag->is_unlocked() || flag->is_unlocker()) &&
+          add_global_entry(env, null_h, &globals[num_entries], flag, THREAD)) {
         num_entries++;
       }
     }
@@ -1650,11 +1659,14 @@
     bool bvalue = (new_value.z == JNI_TRUE ? true : false);
     succeed = CommandLineFlags::boolAtPut(name, &bvalue, MANAGEMENT);
   } else if (flag->is_intx()) {
-    intx ivalue = new_value.j;
+    intx ivalue = (intx)new_value.j;
     succeed = CommandLineFlags::intxAtPut(name, &ivalue, MANAGEMENT);
   } else if (flag->is_uintx()) {
-    uintx uvalue = new_value.j;
+    uintx uvalue = (uintx)new_value.j;
     succeed = CommandLineFlags::uintxAtPut(name, &uvalue, MANAGEMENT);
+  } else if (flag->is_uint64_t()) {
+    uint64_t uvalue = (uint64_t)new_value.j;
+    succeed = CommandLineFlags::uint64_tAtPut(name, &uvalue, MANAGEMENT);
   } else if (flag->is_ccstr()) {
     oop str = JNIHandles::resolve_external_guard(new_value.l);
     if (str == NULL) {
@@ -1734,7 +1746,7 @@
 
   // Make sure we have a String array
   klassOop element_klass = objArrayKlass::cast(names_ah->klass())->element_klass();
-  if (element_klass != SystemDictionary::string_klass()) {
+  if (element_klass != SystemDictionary::String_klass()) {
     THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
                "Array element type is not String class", 0);
   }
@@ -1769,7 +1781,7 @@
     num_threads += cycle->num_threads();
   }
 
-  objArrayOop r = oopFactory::new_objArray(SystemDictionary::thread_klass(), num_threads, CHECK_NH);
+  objArrayOop r = oopFactory::new_objArray(SystemDictionary::Thread_klass(), num_threads, CHECK_NH);
   objArrayHandle threads_ah(THREAD, r);
 
   int index = 0;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/memoryManager.cpp
--- a/src/share/vm/services/memoryManager.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/memoryManager.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -72,6 +72,14 @@
   return (GCMemoryManager*) new PSMarkSweepMemoryManager();
 }
 
+GCMemoryManager* MemoryManager::get_g1YoungGen_memory_manager() {
+  return (GCMemoryManager*) new G1YoungGenMemoryManager();
+}
+
+GCMemoryManager* MemoryManager::get_g1OldGen_memory_manager() {
+  return (GCMemoryManager*) new G1OldGenMemoryManager();
+}
+
 instanceOop MemoryManager::get_memory_manager_instance(TRAPS) {
   // Must do an acquire so as to force ordering of subsequent
   // loads from anything _memory_mgr_obj points to or implies.
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/memoryManager.hpp
--- a/src/share/vm/services/memoryManager.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/memoryManager.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -54,7 +54,9 @@
     ParNew,
     ConcurrentMarkSweep,
     PSScavenge,
-    PSMarkSweep
+    PSMarkSweep,
+    G1YoungGen,
+    G1OldGen
   };
 
   MemoryManager();
@@ -85,6 +87,8 @@
   static GCMemoryManager* get_cms_memory_manager();
   static GCMemoryManager* get_psScavenge_memory_manager();
   static GCMemoryManager* get_psMarkSweep_memory_manager();
+  static GCMemoryManager* get_g1YoungGen_memory_manager();
+  static GCMemoryManager* get_g1OldGen_memory_manager();
 
 };
 
@@ -231,3 +235,21 @@
   MemoryManager::Name kind() { return MemoryManager::PSMarkSweep; }
   const char* name()         { return "PS MarkSweep"; }
 };
+
+class G1YoungGenMemoryManager : public GCMemoryManager {
+private:
+public:
+  G1YoungGenMemoryManager() : GCMemoryManager() {}
+
+  MemoryManager::Name kind() { return MemoryManager::G1YoungGen; }
+  const char* name()         { return "G1 Young Generation"; }
+};
+
+class G1OldGenMemoryManager : public GCMemoryManager {
+private:
+public:
+  G1OldGenMemoryManager() : GCMemoryManager() {}
+
+  MemoryManager::Name kind() { return MemoryManager::G1OldGen; }
+  const char* name()         { return "G1 Old Generation"; }
+};
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/memoryService.cpp
--- a/src/share/vm/services/memoryService.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/memoryService.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -60,8 +60,8 @@
       break;
     }
     case CollectedHeap::G1CollectedHeap : {
-      G1CollectedHeap::g1_unimplemented();
-      return;
+      add_g1_heap_info(G1CollectedHeap::heap());
+      break;
     }
 #endif // SERIALGC
     default: {
@@ -164,6 +164,19 @@
   add_psOld_memory_pool(heap->old_gen(), _major_gc_manager);
   add_psPerm_memory_pool(heap->perm_gen(), _major_gc_manager);
 }
+
+void MemoryService::add_g1_heap_info(G1CollectedHeap* g1h) {
+  assert(UseG1GC, "sanity");
+
+  _minor_gc_manager = MemoryManager::get_g1YoungGen_memory_manager();
+  _major_gc_manager = MemoryManager::get_g1OldGen_memory_manager();
+  _managers_list->append(_minor_gc_manager);
+  _managers_list->append(_major_gc_manager);
+
+  add_g1YoungGen_memory_pool(g1h, _major_gc_manager, _minor_gc_manager);
+  add_g1OldGen_memory_pool(g1h, _major_gc_manager);
+  add_g1PermGen_memory_pool(g1h, _major_gc_manager);
+}
 #endif // SERIALGC
 
 MemoryPool* MemoryService::add_gen(Generation* gen,
@@ -384,6 +397,64 @@
   mgr->add_pool(perm_gen);
   _pools_list->append(perm_gen);
 }
+
+void MemoryService::add_g1YoungGen_memory_pool(G1CollectedHeap* g1h,
+                                               MemoryManager* major_mgr,
+                                               MemoryManager* minor_mgr) {
+  assert(major_mgr != NULL && minor_mgr != NULL, "should have two managers");
+
+  G1EdenPool* eden = new G1EdenPool(g1h);
+  G1SurvivorPool* survivor = new G1SurvivorPool(g1h);
+
+  major_mgr->add_pool(eden);
+  major_mgr->add_pool(survivor);
+  minor_mgr->add_pool(eden);
+  minor_mgr->add_pool(survivor);
+  _pools_list->append(eden);
+  _pools_list->append(survivor);
+}
+
+void MemoryService::add_g1OldGen_memory_pool(G1CollectedHeap* g1h,
+                                             MemoryManager* mgr) {
+  assert(mgr != NULL, "should have one manager");
+
+  G1OldGenPool* old_gen = new G1OldGenPool(g1h);
+  mgr->add_pool(old_gen);
+  _pools_list->append(old_gen);
+}
+
+void MemoryService::add_g1PermGen_memory_pool(G1CollectedHeap* g1h,
+                                              MemoryManager* mgr) {
+  assert(mgr != NULL, "should have one manager");
+
+  CompactingPermGenGen* perm_gen = (CompactingPermGenGen*) g1h->perm_gen();
+  PermanentGenerationSpec* spec = perm_gen->spec();
+  size_t max_size = spec->max_size() - spec->read_only_size()
+                                     - spec->read_write_size();
+  MemoryPool* pool = add_space(perm_gen->unshared_space(),
+                               "G1 Perm Gen",
+                               false, /* is_heap */
+                               max_size,
+                               true   /* support_usage_threshold */);
+  mgr->add_pool(pool);
+
+  // in case we support CDS in G1
+  if (UseSharedSpaces) {
+    pool = add_space(perm_gen->ro_space(),
+                     "G1 Perm Gen [shared-ro]",
+                     false, /* is_heap */
+                     spec->read_only_size(),
+                     true   /* support_usage_threshold */);
+    mgr->add_pool(pool);
+
+    pool = add_space(perm_gen->rw_space(),
+                     "G1 Perm Gen [shared-rw]",
+                     false, /* is_heap */
+                     spec->read_write_size(),
+                     true   /* support_usage_threshold */);
+    mgr->add_pool(pool);
+  }
+}
 #endif // SERIALGC
 
 void MemoryService::add_code_heap_memory_pool(CodeHeap* heap) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/memoryService.hpp
--- a/src/share/vm/services/memoryService.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/memoryService.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -40,6 +40,7 @@
 class ParallelScavengeHeap;
 class CompactingPermGenGen;
 class CMSPermGenGen;
+class G1CollectedHeap;
 
 // VM Monitoring and Management Support
 
@@ -88,6 +89,13 @@
   static void add_psPerm_memory_pool(PSPermGen* perm,
                                      MemoryManager* mgr);
 
+  static void add_g1YoungGen_memory_pool(G1CollectedHeap* g1h,
+                                         MemoryManager* major_mgr,
+                                         MemoryManager* minor_mgr);
+  static void add_g1OldGen_memory_pool(G1CollectedHeap* g1h,
+                                       MemoryManager* mgr);
+  static void add_g1PermGen_memory_pool(G1CollectedHeap* g1h,
+                                        MemoryManager* mgr);
 
   static MemoryPool* add_space(ContiguousSpace* space,
                                const char* name,
@@ -111,6 +119,7 @@
 
   static void add_gen_collected_heap_info(GenCollectedHeap* heap);
   static void add_parallel_scavenge_heap_info(ParallelScavengeHeap* heap);
+  static void add_g1_heap_info(G1CollectedHeap* g1h);
 
 public:
   static void set_universe_heap(CollectedHeap* heap);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/runtimeService.cpp
--- a/src/share/vm/services/runtimeService.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/runtimeService.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 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
@@ -104,6 +104,13 @@
 
 void RuntimeService::record_safepoint_begin() {
   HS_DTRACE_PROBE(hs_private, safepoint__begin);
+
+  // Print the time interval in which the app was executing
+  if (PrintGCApplicationConcurrentTime) {
+    gclog_or_tty->print_cr("Application time: %3.7f seconds",
+                                last_application_time_sec());
+  }
+
   // update the time stamp to begin recording safepoint time
   _safepoint_timer.update();
   if (UsePerfData) {
@@ -122,6 +129,15 @@
 
 void RuntimeService::record_safepoint_end() {
   HS_DTRACE_PROBE(hs_private, safepoint__end);
+
+  // Print the time interval for which the app was stopped
+  // during the current safepoint operation.
+  if (PrintGCApplicationStoppedTime) {
+    gclog_or_tty->print_cr("Total time for which application threads "
+                           "were stopped: %3.7f seconds",
+                           last_safepoint_time_sec());
+  }
+
   // update the time stamp to begin recording app time
   _app_timer.update();
   if (UsePerfData) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/serviceUtil.hpp
--- a/src/share/vm/services/serviceUtil.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/serviceUtil.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -45,7 +45,7 @@
     // instance
     if (o->is_instance()) {
       // instance objects are visible
-      if (o->klass() != SystemDictionary::class_klass()) {
+      if (o->klass() != SystemDictionary::Class_klass()) {
         return true;
       }
       if (java_lang_Class::is_primitive(o)) {
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/threadService.cpp
--- a/src/share/vm/services/threadService.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/threadService.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 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
@@ -540,7 +540,7 @@
 }
 
 Handle ThreadStackTrace::allocate_fill_stack_trace_element_array(TRAPS) {
-  klassOop k = SystemDictionary::stackTraceElement_klass();
+  klassOop k = SystemDictionary::StackTraceElement_klass();
   assert(k != NULL, "must be loaded in 1.4+");
   instanceKlassHandle ik(THREAD, k);
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/services/threadService.hpp
--- a/src/share/vm/services/threadService.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/services/threadService.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 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
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/constantTag.hpp
--- a/src/share/vm/utilities/constantTag.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/constantTag.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -36,7 +36,8 @@
   JVM_CONSTANT_UnresolvedString         = 102,  // Temporary tag until actual use
   JVM_CONSTANT_StringIndex              = 103,  // Temporary tag while constructing constant pool
   JVM_CONSTANT_UnresolvedClassInError   = 104,  // Error tag due to resolution error
-  JVM_CONSTANT_InternalMax              = 104   // Last implementation tag
+  JVM_CONSTANT_Object                   = 105,  // Required for BoundMethodHandle arguments.
+  JVM_CONSTANT_InternalMax              = 105   // Last implementation tag
 };
 
 
@@ -70,6 +71,8 @@
   bool is_unresolved_string() const { return _tag == JVM_CONSTANT_UnresolvedString; }
   bool is_string_index() const      { return _tag == JVM_CONSTANT_StringIndex; }
 
+  bool is_object() const            { return _tag == JVM_CONSTANT_Object; }
+
   bool is_klass_reference() const   { return is_klass_index() || is_unresolved_klass(); }
   bool is_klass_or_reference() const{ return is_klass() || is_klass_reference(); }
   bool is_field_or_method() const   { return is_field() || is_method() || is_interface_method(); }
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/debug.cpp
--- a/src/share/vm/utilities/debug.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/debug.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -702,11 +702,14 @@
   tty->print_cr("Searching strong roots:");
   Universe::oops_do(&lookFor, false);
   JNIHandles::oops_do(&lookFor);   // Global (strong) JNI handles
-  Threads::oops_do(&lookFor);
+  Threads::oops_do(&lookFor, NULL);
   ObjectSynchronizer::oops_do(&lookFor);
   //FlatProfiler::oops_do(&lookFor);
   SystemDictionary::oops_do(&lookFor);
 
+  tty->print_cr("Searching code cache:");
+  CodeCache::oops_do(&lookFor);
+
   tty->print_cr("Done.");
 }
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/exceptions.cpp
--- a/src/share/vm/utilities/exceptions.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/exceptions.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -103,15 +103,18 @@
   _throw(thread, file, line, h_exception);
 }
 
-void Exceptions::_throw(Thread* thread, const char* file, int line, Handle h_exception) {
+void Exceptions::_throw(Thread* thread, const char* file, int line, Handle h_exception, const char* message) {
   assert(h_exception() != NULL, "exception should not be NULL");
 
   // tracing (do this up front - so it works during boot strapping)
   if (TraceExceptions) {
     ttyLocker ttyl;
     ResourceMark rm;
-    tty->print_cr("Exception <%s> (" INTPTR_FORMAT " ) \nthrown [%s, line %d]\nfor thread " INTPTR_FORMAT,
-                      h_exception->print_value_string(), (address)h_exception(), file, line, thread);
+    tty->print_cr("Exception <%s>%s%s (" INTPTR_FORMAT " ) \n"
+                  "thrown [%s, line %d]\nfor thread " INTPTR_FORMAT,
+                  h_exception->print_value_string(),
+                  message ? ": " : "", message ? message : "",
+                  (address)h_exception(), file, line, thread);
   }
   // for AbortVMOnException flag
   NOT_PRODUCT(Exceptions::debug_check_abort(h_exception));
@@ -119,7 +122,7 @@
   // Check for special boot-strapping/vm-thread handling
   if (special_exception(thread, file, line, h_exception)) return;
 
-  assert(h_exception->is_a(SystemDictionary::throwable_klass()), "exception is not a subclass of java/lang/Throwable");
+  assert(h_exception->is_a(SystemDictionary::Throwable_klass()), "exception is not a subclass of java/lang/Throwable");
 
   // set the pending exception
   thread->set_pending_exception(h_exception(), file, line);
@@ -135,7 +138,7 @@
   // Create and throw exception
   Handle h_cause(thread, NULL);
   Handle h_exception = new_exception(thread, h_name, message, h_cause, h_loader, h_protection_domain);
-  _throw(thread, file, line, h_exception);
+  _throw(thread, file, line, h_exception, message);
 }
 
 // Throw an exception with a message and a cause
@@ -144,7 +147,7 @@
   if (special_exception(thread, file, line, h_name, message)) return;
   // Create and throw exception and init cause
   Handle h_exception = new_exception(thread, h_name, message, h_cause, h_loader, h_protection_domain);
-  _throw(thread, file, line, h_exception);
+  _throw(thread, file, line, h_exception, message);
 }
 
 // This version creates handles and calls the other version
@@ -252,7 +255,7 @@
 
     // Future: object initializer should take a cause argument
     if (h_cause() != NULL) {
-      assert(h_cause->is_a(SystemDictionary::throwable_klass()),
+      assert(h_cause->is_a(SystemDictionary::Throwable_klass()),
           "exception cause is not a subclass of java/lang/Throwable");
       JavaValue result1(T_OBJECT);
       JavaCallArguments args1;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/exceptions.hpp
--- a/src/share/vm/utilities/exceptions.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/exceptions.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -103,7 +103,7 @@
   } ExceptionMsgToUtf8Mode;
   // Throw exceptions: w/o message, w/ message & with formatted message.
   static void _throw_oop(Thread* thread, const char* file, int line, oop exception);
-  static void _throw(Thread* thread, const char* file, int line, Handle exception);
+  static void _throw(Thread* thread, const char* file, int line, Handle exception, const char* msg = NULL);
   static void _throw_msg(Thread* thread, const char* file, int line,
                          symbolHandle name, const char* message, Handle loader,
                          Handle protection_domain);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/globalDefinitions.hpp
--- a/src/share/vm/utilities/globalDefinitions.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/globalDefinitions.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -139,6 +139,10 @@
 const size_t G                  = M*K;
 const size_t HWperKB            = K / sizeof(HeapWord);
 
+const size_t LOG_K              = 10;
+const size_t LOG_M              = 2 * LOG_K;
+const size_t LOG_G              = 2 * LOG_M;
+
 const jint min_jint = (jint)1 << (sizeof(jint)*BitsPerByte-1); // 0x80000000 == smallest jint
 const jint max_jint = (juint)min_jint - 1;                     // 0x7FFFFFFF == largest jint
 
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/growableArray.hpp
--- a/src/share/vm/utilities/growableArray.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/growableArray.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -278,6 +278,17 @@
     _len--;
   }
 
+  // inserts the given element before the element at index i
+  void insert_before(const int idx, const E& elem) {
+    check_nesting();
+    if (_len == _max) grow(_len);
+    for (int j = _len - 1; j >= idx; j--) {
+      _data[j + 1] = _data[j];
+    }
+    _len++;
+    _data[idx] = elem;
+  }
+
   void appendAll(const GrowableArray<E>* l) {
     for (int i = 0; i < l->_len; i++) {
       raw_at_put_grow(_len, l->_data[i], 0);
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/numberSeq.cpp
--- a/src/share/vm/utilities/numberSeq.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/numberSeq.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -241,3 +241,33 @@
 
   return b0 + b1 * num;
 }
+
+
+// Printing/Debugging Support
+
+void AbsSeq::dump() { dump_on(gclog_or_tty); }
+
+void AbsSeq::dump_on(outputStream* s) {
+  s->print_cr("\t _num = %d, _sum = %7.3f, _sum_of_squares = %7.3f",
+                  _num,      _sum,         _sum_of_squares);
+  s->print_cr("\t _davg = %7.3f, _dvariance = %7.3f, _alpha = %7.3f",
+                  _davg,         _dvariance,         _alpha);
+}
+
+void NumberSeq::dump_on(outputStream* s) {
+  AbsSeq::dump_on(s);
+  s->print_cr("\t\t _last = %7.3f, _maximum = %7.3f");
+}
+
+void TruncatedSeq::dump_on(outputStream* s) {
+  AbsSeq::dump_on(s);
+  s->print_cr("\t\t _length = %d, _next = %d", _length, _next);
+  for (int i = 0; i < _length; i++) {
+    if (i%5 == 0) {
+      s->cr();
+      s->print("\t");
+    }
+    s->print("\t[%d]=%7.3f", i, _sequence[i]);
+  }
+  s->print_cr("");
+}
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/numberSeq.hpp
--- a/src/share/vm/utilities/numberSeq.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/numberSeq.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -74,6 +74,10 @@
   double davg() const; // decaying average
   double dvariance() const; // decaying variance
   double dsd() const; // decaying "standard deviation"
+
+  // Debugging/Printing
+  virtual void dump();
+  virtual void dump_on(outputStream* s);
 };
 
 class NumberSeq: public AbsSeq {
@@ -91,6 +95,9 @@
   virtual void add(double val);
   virtual double maximum() const { return _maximum; }
   virtual double last() const { return _last; }
+
+  // Debugging/Printing
+  virtual void dump_on(outputStream* s);
 };
 
 class TruncatedSeq: public AbsSeq {
@@ -114,4 +121,7 @@
 
   double oldest() const; // the oldest valid value in the sequence
   double predict_next() const; // prediction based on linear regression
+
+  // Debugging/Printing
+  virtual void dump_on(outputStream* s);
 };
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/taskqueue.hpp
--- a/src/share/vm/utilities/taskqueue.hpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/taskqueue.hpp	Thu Mar 25 16:54:59 2010 -0700
@@ -133,6 +133,9 @@
   // Maximum number of elements allowed in the queue.  This is two less
   // than the actual queue size, for somewhat complicated reasons.
   uint max_elems() { return N - 2; }
+
+  // Total size of queue.
+  static const uint total_size() { return N; }
 };
 
 template<class E> class GenericTaskQueue: public TaskQueueSuper {
@@ -207,7 +210,7 @@
     // Actually means 0, so do the push.
     uint localBot = _bottom;
     _elems[localBot] = t;
-    _bottom = increment_index(localBot);
+    OrderAccess::release_store(&_bottom, increment_index(localBot));
     return true;
   }
   return false;
@@ -465,19 +468,7 @@
 #endif
 };
 
-#define SIMPLE_STACK 0
-
 template<class E> inline bool GenericTaskQueue<E>::push(E t) {
-#if SIMPLE_STACK
-  uint localBot = _bottom;
-  if (_bottom < max_elems()) {
-    _elems[localBot] = t;
-    _bottom = localBot + 1;
-    return true;
-  } else {
-    return false;
-  }
-#else
   uint localBot = _bottom;
   assert((localBot >= 0) && (localBot < N), "_bottom out of range.");
   idx_t top = _age.top();
@@ -485,23 +476,14 @@
   assert((dirty_n_elems >= 0) && (dirty_n_elems < N), "n_elems out of range.");
   if (dirty_n_elems < max_elems()) {
     _elems[localBot] = t;
-    _bottom = increment_index(localBot);
+    OrderAccess::release_store(&_bottom, increment_index(localBot));
     return true;
   } else {
     return push_slow(t, dirty_n_elems);
   }
-#endif
 }
 
 template<class E> inline bool GenericTaskQueue<E>::pop_local(E& t) {
-#if SIMPLE_STACK
-  uint localBot = _bottom;
-  assert(localBot > 0, "precondition.");
-  localBot--;
-  t = _elems[localBot];
-  _bottom = localBot;
-  return true;
-#else
   uint localBot = _bottom;
   // This value cannot be N-1.  That can only occur as a result of
   // the assignment to bottom in this method.  If it does, this method
@@ -529,7 +511,6 @@
     // path.
     return pop_local_slow(localBot, _age.get());
   }
-#endif
 }
 
 typedef oop Task;
diff -r 39e409a664b3 -r 84043c7507b9 src/share/vm/utilities/vmError.cpp
--- a/src/share/vm/utilities/vmError.cpp	Thu Mar 25 16:27:12 2010 -0700
+++ b/src/share/vm/utilities/vmError.cpp	Thu Mar 25 16:54:59 2010 -0700
@@ -458,6 +458,40 @@
 
      if (_verbose && _thread && _thread->is_Java_thread()) {
        JavaThread* jt = (JavaThread*)_thread;
+#ifdef ZERO
+       if (jt->zero_stack()->sp() && jt->top_zero_frame()) {
+         // StackFrameStream uses the frame anchor, which may not have
+         // been set up.  This can be done at any time in Zero, however,
+         // so if it hasn't been set up then we just set it up now and
+         // clear it again when we're done.
+         bool has_last_Java_frame = jt->has_last_Java_frame();
+         if (!has_last_Java_frame)
+           jt->set_last_Java_frame();
+         st->print("Java frames:");
+
+         // If the top frame is a Shark frame and the frame anchor isn't
+         // set up then it's possible that the information in the frame
+         // is garbage: it could be from a previous decache, or it could
+         // simply have never been written.  So we print a warning...
+         StackFrameStream sfs(jt);
+         if (!has_last_Java_frame && !sfs.is_done()) {
+           if (sfs.current()->zeroframe()->is_shark_frame()) {
+             st->print(" (TOP FRAME MAY BE JUNK)");
+           }
+         }
+         st->cr();
+
+         // Print the frames
+         for(int i = 0; !sfs.is_done(); sfs.next(), i++) {
+           sfs.current()->zero_print_on_error(i, st, buf, sizeof(buf));
+           st->cr();
+         }
+
+         // Reset the frame anchor if necessary
+         if (!has_last_Java_frame)
+           jt->reset_last_Java_frame();
+       }
+#else
        if (jt->has_last_Java_frame()) {
          st->print_cr("Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)");
          for(StackFrameStream sfs(jt); !sfs.is_done(); sfs.next()) {
@@ -465,6 +499,24 @@
            st->cr();
          }
        }
+#endif // ZERO
+     }
+
+  STEP(135, "(printing target Java thread stack)" )
+
+     // printing Java thread stack trace if it is involved in GC crash
+     if (_verbose && (_thread->is_Named_thread())) {
+       JavaThread*  jt = ((NamedThread *)_thread)->processed_thread();
+       if (jt != NULL) {
+         st->print_cr("JavaThread " PTR_FORMAT " (nid = " UINTX_FORMAT ") was being processed", jt, jt->osthread()->thread_id());
+         if (jt->has_last_Java_frame()) {
+           st->print_cr("Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)");
+           for(StackFrameStream sfs(jt); !sfs.is_done(); sfs.next()) {
+             sfs.current()->print_on_error(st, buf, sizeof(buf), true);
+             st->cr();
+           }
+         }
+       }
      }
 
   STEP(140, "(printing VM operation)" )
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6636138/Test1.java
--- a/test/compiler/6636138/Test1.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/test/compiler/6636138/Test1.java	Thu Mar 25 16:54:59 2010 -0700
@@ -45,7 +45,7 @@
         for (int i = 0; i < src.length; i++) {
             if (src[i] != ref[i]) {
                 System.out.println("Error: src and ref don't match at " + i);
-                System.exit(-1);
+                System.exit(97);
             }
         }
     }
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6636138/Test2.java
--- a/test/compiler/6636138/Test2.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/test/compiler/6636138/Test2.java	Thu Mar 25 16:54:59 2010 -0700
@@ -51,7 +51,7 @@
             int value = (i-1 + src.length)%src.length; // correct value after shifting
                 if (src[i] != value) {
                     System.out.println("Error: src["+i+"] should be "+ value + " instead of " + src[i]);
-                    System.exit(-1);
+                    System.exit(97);
                 }
         }
     }
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6663854/Test6663854.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6663854/Test6663854.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,1521 @@
+/*
+ * Copyright 2010 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6663854
+ * @summary assert(n != __null,"Bad immediate dominator info.") in C2 with -Xcomp
+ *
+ * @run main/othervm -Xcomp Test6663854
+ */
+
+// This is a randomly generated test that exposed a crash so don't try
+// to make sense of what's it's doing.  The output produced is likely
+// to be stable but it is not being checked as part of this test.
+
+final class Test6663854_Class_0 {
+    final long var_1 = ((byte)1.2510591E38F & - ~ - - - ~3554133935918431232L) << 'g';
+    final static long var_2 = 662144491976981504L;
+    static byte[] var_3;
+    static byte var_4;
+    static float var_5;
+    final short var_6 = 4156;
+    double var_7;
+    char var_8 = 'F';
+    static long var_9;
+    char var_10;
+
+
+    public Test6663854_Class_0()
+    {
+        var_7 = (var_9 = (var_4 = (var_4 = (byte)~ -var_1)));
+        var_7 = (var_4 = (var_4 = (byte)(var_9 = 690685817))) + ~var_2;
+        long var_17 = 1755837857030316032L;
+        var_8 *= (var_7 = var_6);
+        {
+            var_4 = (var_4 = (byte)var_6);
+        }
+        var_5 = (var_4 = (var_4 = (var_4 = (var_4 = (byte)var_17))));
+        if (false)
+        {
+            var_5 = var_6;
+            var_4 = (var_4 = (var_4 = (var_4 = (var_4 = (var_4 = (var_4 = (byte)3.2446162E38F))))));
+        }
+        else
+        {
+            var_8 &= false ? var_6 : var_6;
+        }
+        ((new Test6663854_Class_0[(byte)+ (var_5 = (var_4 = (byte)'Q'))])[var_4 = (byte)396008820]).var_8++;
+        var_5 = (var_8 ^= var_6 >>> - (var_4 = (byte)var_6)) >= 360526660 ? var_8 : var_8;
+    }
+
+
+
+    protected Object clone()
+    {
+        char var_11 = 'E';
+        var_7 = 1.2181972357945285E308 + var_6 - + (var_7 = 1269180234) * 6.244754764669101E307;
+        var_7 = (var_4 = (var_4 = (var_4 = (var_4 = (var_4 = (byte)var_11)))));
+        {
+            var_4 = (var_4 = (var_4 = (byte)1016847968));
+            (false & true ? "nmot" : "m").charAt((false || !true ? var_6 : var_6) * var_6);
+            var_8 |= var_8-- == (long)(var_7 = (byte)var_2 & ~var_2) ? (var_4 = (var_4 = (var_4 = (var_4 = (byte)1.5012703E38F)))) : (var_4 = (byte)4795604615834685440L);
+            ++var_11;
+            var_5 = (var_9 = (int)var_6 | 302324412 - 1720735728);
+            "yfkasl".replaceAll("xlvn" + "peedfph", "awfbuujts");
+        }
+        var_9 = false ? var_6 : var_6;
+        {
+            final boolean var_12 = false;
+        }
+        var_5 = var_2;
+        {
+            var_9 = ((new byte[(byte)var_6][(byte)1.3719104187525612E308])[var_4 = (byte)var_1])[var_4 = (var_4 = (var_4 = (var_4 = (byte)2.2549062E38F)))] + 889886326;
+        }
+        var_9 = (var_2 | ~var_1) & 848602225;
+        {
+            var_4 = (var_4 = (var_4 = (var_4 = (byte)var_6)));
+        }
+        var_7 = var_6;
+        var_9 = var_6;
+        var_5 = (var_4 = (var_4 = (byte)var_8));
+        var_7 = 964691433430251520L ^ var_6;
+        var_5 = ~2571981928559810560L;
+        return "yvetn".endsWith("dtgstxcu".toLowerCase()) | true | true ? (4.2416016638902373E307 != -3.1295498440444366E307 ? "p" : "ars") : (new Object[(byte)var_1])[(byte)(var_9 = 7519039949758987264L)];
+    }
+
+    public boolean equals(Object obj)
+    {
+        var_5 = 1445825238;
+        {
+            var_7 = 2.221982E38F;
+        }
+        {
+            var_9 = var_6;
+        }
+        var_7 = true ? (var_8 ^= (byte)3588201925057082368L) : (var_7 = var_8);
+        short var_13 = var_6;
+        var_4 = (var_4 = (var_4 = (var_4 = (var_4 = (byte)'L'))));
+        var_13--;
+        return true | !false;
+    }
+
+
+    protected char[] func_0()
+    {
+        if (!true ? !false : false)
+        {
+            var_8 %= -(new double[(byte)197311342][(byte)5.6183004E36F])[(byte)(var_5 = (var_9 = 'l'))][(byte)(var_7 = var_6)] * (1.9583867E38F * + (var_4 = (byte)1566742425));
+            var_8 >>= ~6333520277515092992L | var_8;
+        }
+        else
+        {
+            new String();
+        }
+        {
+            var_7 = (byte)5882830303456225280L % ((var_9 = var_6) << var_1);
+        }
+        var_7 = var_6;
+        float var_14;
+        var_14 = (var_4 = (var_4 = (byte)1081376784));
+        var_8 -= 3.1929636E38F;
+        var_7 = 1.5931970715760934E308;
+        var_4 = true | (!false | (var_7 = 2.4773615E37F) < (byte)(short)825088022) ? (var_4 = (byte)4.3114896E37F) : (byte)var_8;
+        final int var_15 = var_6 >> 1197848918;
+        var_9 = var_15;
+        var_14 = 983699379;
+        var_9 = var_6;
+        return (new char[var_4 = (byte)3.593425789671245E307][(byte)1.6242754453980546E308])[var_4 = (byte)(var_9 = (var_4 = (byte)var_1))];
+    }
+
+    final void func_1(final int arg_0)
+    {
+        var_5 = 6370513305314412544L == -5.201821E37F ? 2.5220462E38F : (var_5 = (byte)'f');
+        ((new Test6663854_Class_0[(byte)1250580004024059904L][(byte)(short)var_8])[(byte)(var_8 ^= 68680455462355968L)][var_4 = (var_4 = (byte)var_2)]).var_8 *= (char)(byte)(var_6 * var_6) <= - (var_7 = (var_7 = var_6)) ? ~5194741848806877184L : var_8;
+        var_5 = !"tshhykoap".endsWith("q") ? arg_0 : 'K';
+        var_8 *= (var_8 -= (var_5 = - (var_5 = var_8)));
+        int var_16;
+    }
+
+    public String toString()
+    {
+        String result =  "[\n";
+        result += "Test6663854_Class_0.var_8 = "; result += Test6663854.Printer.print(var_8);
+        result += "\n";
+        result += "Test6663854_Class_0.var_10 = "; result += Test6663854.Printer.print(var_10);
+        result += "\n";
+        result += "Test6663854_Class_0.var_3 = "; result += Test6663854.Printer.print(var_3);
+        result += "\n";
+        result += "Test6663854_Class_0.var_1 = "; result += Test6663854.Printer.print(var_1);
+        result += "\n";
+        result += "Test6663854_Class_0.var_2 = "; result += Test6663854.Printer.print(var_2);
+        result += "\n";
+        result += "Test6663854_Class_0.var_9 = "; result += Test6663854.Printer.print(var_9);
+        result += "\n";
+        result += "Test6663854_Class_0.var_7 = "; result += Test6663854.Printer.print(var_7);
+        result += "\n";
+        result += "Test6663854_Class_0.var_5 = "; result += Test6663854.Printer.print(var_5);
+        result += "\n";
+        result += "Test6663854_Class_0.var_6 = "; result += Test6663854.Printer.print(var_6);
+        result += "\n";
+        result += "Test6663854_Class_0.var_4 = "; result += Test6663854.Printer.print(var_4);
+        result += "";
+        result += "\n]";
+        return result;
+    }
+}
+
+
+interface Test6663854_Interface_1 {
+    public boolean func_0();
+    public String func_1(final String arg_0, final long arg_1, byte arg_2, char[][] arg_3);
+}
+
+
+interface Test6663854_Interface_2 extends Test6663854_Interface_1 {
+}
+
+
+final class Test6663854_Class_3 implements Test6663854_Interface_2, Test6663854_Interface_1 {
+    Object var_18;
+    long var_19;
+    static double var_20;
+    final static float var_21 = 2.0644203E38F;
+    Test6663854_Class_0 var_22;
+    final static byte var_23 = 110;
+    static boolean var_24 = false;
+
+
+    public Test6663854_Class_3()
+    {
+        Test6663854_Class_0.var_5 = new Test6663854_Class_0().var_6;
+        var_22 = (var_22 = (new Test6663854_Class_0[var_23])[var_23]);
+        Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = var_23));
+        char var_37;
+        var_19 = var_23;
+    }
+
+
+    public boolean func_0()
+    {
+        if (var_24 = var_24)
+        {
+            Test6663854_Class_0.var_4 = var_24 ^ (var_24 || (var_24 = false)) ? var_23 : (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = var_23));
+        }
+        else
+        {
+            ((Test6663854_Class_0)(var_18 = new Test6663854_Interface_1[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = var_23)][var_23])).var_7 = ((var_22 = (var_22 = (Test6663854_Class_0)(var_18 = "uwt"))).var_8 >>>= (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = var_23)));
+            var_24 |= !false;
+        }
+        var_18 = (var_18 = "ymmk");
+        if (var_24)
+        {
+            long var_25;
+            ((Test6663854_Class_0)(var_18 = "wsxqujs")).var_8 >>= 'F';
+            var_24 ^= false;
+        }
+        else
+        {
+            {
+                (var_22 = (Test6663854_Class_0)(var_18 = (var_18 = (var_18 = "lrgiwpwet")))).var_8++;
+            }
+            {
+                var_18 = new String[Test6663854_Class_0.var_4 = var_23];
+            }
+            {
+                new String();
+            }
+            ((var_24 |= var_24) | true ^ false ? (var_22 = (Test6663854_Class_0)(var_18 = "rpmudju")) : (var_22 = (new Test6663854_Class_0[var_23])[var_23])).var_8--;
+            var_24 ^= var_24;
+            var_19 = 206416809;
+            var_20 = 1581809112;
+            Test6663854_Class_0 var_26;
+            Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = var_23);
+        }
+        byte var_27 = 29;
+        short var_28 = 24653;
+        var_22 = (var_22 = (var_22 = (Test6663854_Class_0)(var_18 = "umagt")));
+        return var_24;
+    }
+
+    public String func_1(final String arg_0, final long arg_1, byte arg_2, char[][] arg_3)
+    {
+        {
+            final Test6663854_Class_0 var_29 = (new Test6663854_Class_0[var_23])[arg_2];
+        }
+        var_18 = (var_18 = (var_22 = (Test6663854_Class_0)(var_18 = arg_0)));
+        ++(var_22 = (Test6663854_Class_0)(var_18 = (Test6663854_Class_0)(var_18 = (var_18 = new char[var_23])))).var_8;
+        {
+            (var_22 = (var_22 = (Test6663854_Class_0)(var_18 = "xcj"))).var_8 |= arg_1 * (short)6.671469496987355E307;
+            Test6663854_Class_0.var_5 = false ? var_23 : 8012291795221583872L;
+            (var_24 ? (var_22 = (var_22 = (Test6663854_Class_0)(var_18 = arg_0))) : (var_22 = (Test6663854_Class_0)(var_18 = arg_3))).var_8--;
+        }
+        ((new String[var_23][var_23])[var_23][var_23]).compareTo(arg_0);
+        var_18 = (var_18 = arg_0);
+        var_24 &= (var_24 ^= true) & ! !false;
+        {
+            var_18 = "lok";
+        }
+        float var_30 = 2.0346904E38F;
+        var_30 += ((Test6663854_Class_0)(var_18 = new float[var_23])).var_6 + 210775691;
+        final double var_31 = 8.865908414454469E307;
+        var_20 = 'm';
+        var_22 = (Test6663854_Class_0)(var_18 = arg_0);
+        return arg_0;
+    }
+
+
+    protected Object clone()
+    {
+        ((Test6663854_Class_0)(var_18 = new short[var_23])).var_7 = 'M';
+        if (var_24)
+        {
+            var_24 = false;
+            String var_32 = "luigad";
+            ((Test6663854_Class_0.var_5 = 1.2920056E38F) > (Test6663854_Class_0.var_4 = var_23) ? (Test6663854_Class_0)(var_18 = new Test6663854_Interface_1[var_23][var_23]) : (var_22 = (var_22 = (Test6663854_Class_0)(var_18 = new byte[var_23])))).var_10 = 'A';
+            (var_22 = (var_22 = (var_22 = (new Test6663854_Class_0[var_23][var_23])[var_23][var_23]))).var_8 /= ((var_22 = (Test6663854_Class_0)(var_18 = (new short[var_23][var_23][var_23])[var_23])).var_7 = 'h');
+            (var_32 = var_32).toString();
+            var_32.length();
+            var_18 = (var_22 = (var_22 = new Test6663854_Class_0()));
+        }
+        else
+        {
+            Test6663854_Class_0.var_4 = var_23;
+            var_22 = (var_22 = (Test6663854_Class_0)(var_18 = "wbeuae"));
+            float var_33;
+            --(var_22 = (var_22 = (var_22 = (Test6663854_Class_0)(var_18 = (var_18 = "irl"))))).var_8;
+        }
+        Test6663854_Class_0.var_4 = var_23;
+        Test6663854_Class_0.var_5 = true ? ((Test6663854_Class_0)(var_18 = (var_18 = new boolean[Test6663854_Class_0.var_4 = var_23]))).var_8 : 'n';
+        var_24 = (var_24 ^= ((var_22 = (Test6663854_Class_0)(var_18 = "g")).var_6 > ((Test6663854_Class_0)(var_18 = "")).var_6 ? var_24 : true) ? false : (var_24 = var_24)) ? var_24 : false;
+        var_22 = (var_22 = (var_22 = (Test6663854_Class_0)(var_18 = new Test6663854_Interface_2[var_23])));
+        return var_18 = "qrlonljqj";
+    }
+
+    public boolean equals(Object obj)
+    {
+        Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = var_23)));
+        Test6663854_Class_0.var_5 = var_23 % (var_22 = (var_22 = (Test6663854_Class_0)obj)).var_6;
+        Test6663854_Class_0.var_5 = (((new Test6663854_Class_0[var_23][var_23][var_23])[var_23])[var_24 | (var_24 &= var_24) ? var_23 : (Test6663854_Class_0.var_4 = var_23)][var_23]).var_8;
+        var_22 = false ? (var_22 = (var_22 = (Test6663854_Class_0)obj)) : (var_22 = new Test6663854_Class_0());
+        Test6663854_Class_0.var_5 = ((new Test6663854_Class_0[var_23])[Test6663854_Class_0.var_4 = var_23]).var_8;
+        if (! !var_24)
+        {
+            var_18 = "";
+            (var_22 = (var_22 = (var_22 = (new Test6663854_Class_0[var_23])[Test6663854_Class_0.var_4 = var_23]))).var_8 >>= true ? ~ (Test6663854_Class_0.var_4 = var_23) : (var_22 = (Test6663854_Class_0)obj).var_8++;
+            (var_24 ? (Test6663854_Class_0)(var_18 = "") : (Test6663854_Class_0)obj).var_8 <<= var_23;
+            Test6663854_Class_0.var_4 = var_23;
+            var_20 = (var_22 = (var_22 = (var_22 = (var_22 = (Test6663854_Class_0)obj)))).var_8;
+        }
+        else
+        {
+            var_19 = ((Test6663854_Class_0)obj).var_6;
+        }
+        (var_24 ? "qyukxpui" : (new String[var_23])[Test6663854_Class_0.var_4 = var_23]).substring(612084215);
+        Test6663854_Class_0.var_5 = 'B';
+        if (!false || false)
+        {
+            Test6663854_Class_0.var_4 = true & var_24 ? var_23 : var_23;
+        }
+        else
+        {
+            "eksoig".lastIndexOf('b' > (var_22 = (Test6663854_Class_0)obj).var_8 | 4782397447545636864L >= (short)'[' ? "qusgbf" : "kvmylvct");
+        }
+        Test6663854_Class_0.var_5 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = var_23)) << var_23;
+        int var_34;
+        var_24 = (var_24 &= (var_24 &= true));
+        var_22 = (var_22 = (var_22 = (var_22 = (Test6663854_Class_0)obj)));
+        Test6663854_Interface_1 var_35 = var_24 & ((var_24 &= var_24) ^ var_24) ? (new Test6663854_Interface_1[var_23])[var_23] : (new Test6663854_Interface_1[var_23][var_23])[var_23][var_23];
+        long var_36 = 1042482863045573632L;
+        return var_24;
+    }
+
+
+    public String toString()
+    {
+        String result =  "[\n";
+        result += "Test6663854_Class_3.var_19 = "; result += Test6663854.Printer.print(var_19);
+        result += "\n";
+        result += "Test6663854_Class_3.var_20 = "; result += Test6663854.Printer.print(var_20);
+        result += "\n";
+        result += "Test6663854_Class_3.var_21 = "; result += Test6663854.Printer.print(var_21);
+        result += "\n";
+        result += "Test6663854_Class_3.var_23 = "; result += Test6663854.Printer.print(var_23);
+        result += "\n";
+        result += "Test6663854_Class_3.var_24 = "; result += Test6663854.Printer.print(var_24);
+        result += "\n";
+        result += "Test6663854_Class_3.var_22 = "; result += Test6663854.Printer.print(var_22);
+        result += "\n";
+        result += "Test6663854_Class_3.var_18 = "; result += Test6663854.Printer.print(var_18);
+        result += "";
+        result += "\n]";
+        return result;
+    }
+}
+
+
+final class Test6663854_Class_4 implements Test6663854_Interface_1, Test6663854_Interface_2 {
+    long var_38 = (Test6663854_Class_3.var_24 |= Test6663854_Class_3.var_23 < (short)+3417996718812544000L) ? ~543562136204028928L : 1593726438;
+    char var_39;
+    static Test6663854_Interface_2 var_40;
+    Test6663854_Class_3 var_41;
+    final short var_42 = false ? Test6663854_Class_3.var_23 : (short)~Test6663854_Class_0.var_2;
+    byte var_43;
+    static Test6663854_Interface_1[] var_44;
+    final char var_45 = 4.321821176880639E307 < var_42 ? 'o' : 'v';
+
+
+    public Test6663854_Class_4()
+    {
+        Test6663854_Class_0.var_5 = 2137855185;
+        "nueqthqo".length();
+        {
+            Test6663854_Class_0.var_9 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23));
+            Object var_61;
+        }
+        String var_62 = "rirgfphe";
+        ((new Test6663854_Class_3[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).var_22 = ((var_41 = (var_41 = new Test6663854_Class_3())).var_22 = new Test6663854_Class_0());
+        {
+            Test6663854_Class_0.var_5 = ((new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_42;
+            new Test6663854_Class_0();
+            var_41 = (var_41 = new Test6663854_Class_3());
+            new Test6663854_Class_0().var_8 %= var_38;
+            (var_41 = ((new Test6663854_Class_3[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_22 = new Test6663854_Class_0();
+            Test6663854_Class_0.var_4 = (Test6663854_Class_3.var_24 |= true) ? (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23) : Test6663854_Class_3.var_23;
+            Test6663854_Interface_1 var_63 = ((new Test6663854_Interface_1[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[var_43 = (var_43 = Test6663854_Class_3.var_23)])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23];
+            (var_41 = (var_41 = (var_41 = (var_41 = (Test6663854_Class_3)var_63)))).var_18 = var_62;
+        }
+        if (Test6663854_Class_3.var_24 ^= false)
+        {
+            var_40 = (var_40 = new Test6663854_Class_3());
+        }
+        else
+        {
+            var_62 = "agwqc";
+            Test6663854_Class_3.var_24 ^= ((Test6663854_Class_3.var_24 ^= Test6663854_Class_3.var_24 && Test6663854_Class_3.var_24) & false ? false : !Test6663854_Class_3.var_24) ? false | (Test6663854_Class_3.var_24 &= Test6663854_Class_3.var_24) : (Test6663854_Class_3.var_24 &= (Test6663854_Class_3.var_24 |= ! (Test6663854_Class_3.var_24 |= true)));
+            var_38 *= (Test6663854_Class_3.var_20 = (Test6663854_Class_0.var_5 = var_42 + ((Test6663854_Class_3.var_20 = 5378782303770527744L) <= var_42 ? var_42 : var_42)));
+        }
+        var_38 &= ((var_41 = new Test6663854_Class_3()).var_22 = new Test6663854_Class_0()).var_6;
+        var_62 = var_62;
+        (var_41 = new Test6663854_Class_3()).var_18 = ((new Object[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (var_43 = Test6663854_Class_3.var_23))];
+        final short var_64 = (short)'C';
+        ((var_41 = new Test6663854_Class_3()).var_22 = new Test6663854_Class_0()).var_8 /= ((var_41 = new Test6663854_Class_3()).var_22 = new Test6663854_Class_0()).var_6;
+    }
+
+
+    public boolean func_0()
+    {
+        final boolean var_46 = false;
+        return Test6663854_Class_3.var_24;
+    }
+
+    public String func_1(final String arg_0, final long arg_1, byte arg_2, char[][] arg_3)
+    {
+        {
+            --(false ? new Test6663854_Class_0() : new Test6663854_Class_0()).var_8;
+            "d".substring(Test6663854_Class_3.var_23 - (arg_2 /= + (Test6663854_Class_3.var_20 = 1483190006) * (Test6663854_Class_3.var_20 = ~Test6663854_Class_3.var_23)), 496015226);
+            {
+                var_41 = new Test6663854_Class_3();
+            }
+            var_38 ^= (! ((Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24) && (new boolean[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]) ? arg_1 : (var_39 = var_45)) / var_45;
+            var_38 -= (Test6663854_Class_3.var_20 = (new short[Test6663854_Class_3.var_23])[arg_2]) != (arg_2 ^= new Test6663854_Class_0().var_6 & - (var_38 /= (Test6663854_Class_0.var_5 = var_38))) ? (Test6663854_Class_0.var_5 = - -Test6663854_Class_3.var_21) : arg_2;
+            var_41 = new Test6663854_Class_3();
+            var_40 = Test6663854_Class_3.var_24 ? new Test6663854_Class_3() : new Test6663854_Class_3();
+        }
+        int var_47;
+        (var_41 = new Test6663854_Class_3()).var_18 = "qvph";
+        {
+            ++arg_2;
+        }
+        final Test6663854_Class_3 var_48 = new Test6663854_Class_3();
+        {
+            var_48.var_22 = (Test6663854_Class_0)((var_41 = var_48).var_18 = (var_48.var_22 = (Test6663854_Class_0)(var_48.var_18 = new String[Test6663854_Class_3.var_23])));
+            {
+                final float[] var_49 = (new float[Test6663854_Class_3.var_23][arg_2])[arg_2];
+            }
+            "lcfxrlilw".replace(var_45, (char)(false ? (short)2998890687978943488L : var_42));
+            arg_0.lastIndexOf("mx");
+            final Test6663854_Class_0 var_50 = var_48.var_22 = (var_48.var_22 = (Test6663854_Class_0)((var_41 = var_48).var_18 = var_48));
+            new String();
+            ((Test6663854_Class_3)(var_40 = (var_40 = (var_41 = var_48)))).var_22 = var_50;
+            var_50.var_8 |= arg_2;
+            Test6663854_Class_3.var_20 = + - (Test6663854_Class_3.var_20 = var_42) - var_45 * Test6663854_Class_3.var_21;
+            double var_51 = false ? 1.6389923323715952E308 : (var_39 = var_45);
+            (((new Test6663854_Class_3[arg_2][arg_2])[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_18 = (var_48.var_18 = new Test6663854_Class_0[arg_2 %= 2090054678][arg_2]);
+        }
+        {
+            var_47 = (arg_2 |= (((new Test6663854_Class_4[arg_2][arg_2][arg_2])[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_42);
+        }
+        ((new Test6663854_Class_4[arg_2][Test6663854_Class_3.var_23])[++arg_2][arg_2 <<= 'c']).var_41 = var_48;
+        var_41 = var_48;
+        Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24 & Test6663854_Class_3.var_24;
+        final boolean var_52 = false;
+        {
+            var_40 = (var_41 = (var_41 = var_48));
+            (false ? var_48 : var_48).var_18 = ((new Test6663854_Class_0[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23][arg_2])[arg_2])[++arg_2][(byte)203097731];
+            var_41 = (var_41 = var_48);
+        }
+        var_38 |= (short)Test6663854_Class_3.var_23;
+        var_40 = var_48;
+        {
+            arg_0.indexOf("lnf", var_47 = (((Test6663854_Class_0)(var_48.var_18 = arg_0)).var_8 <<= (var_39 = var_45)));
+        }
+        final boolean var_53 = true & 1.4130067467800934E308 < (arg_2 |= 'W');
+        var_48.var_18 = (var_41 = var_48);
+        (var_48.var_22 = new Test6663854_Class_0()).var_7 = Test6663854_Class_3.var_23;
+        Test6663854_Class_3.var_24 ^= (Test6663854_Class_3.var_24 || var_52) ^ ("axg".startsWith(arg_0, var_47 = (var_47 = var_45)) | var_52);
+        {
+            Test6663854_Class_0.var_5 = 275192701;
+        }
+        Test6663854_Interface_2 var_54;
+        if (true)
+        {
+            var_54 = (var_41 = (var_41 = (var_41 = var_48)));
+        }
+        else
+        {
+            ((Test6663854_Class_0)((var_41 = var_48).var_18 = (var_41 = var_48))).var_7 = var_42;
+        }
+        Test6663854_Class_0.var_5 = --arg_2;
+        ((new String[Test6663854_Class_3.var_23])[var_53 ? arg_2 : arg_2]).length();
+        return arg_0 + "qj";
+    }
+
+
+
+
+    final String func_0(byte arg_0, Test6663854_Class_0 arg_1, final Test6663854_Class_0 arg_2, final Object arg_3)
+    {
+        arg_2.var_7 = (new long[arg_0][arg_0])[Test6663854_Class_3.var_23][arg_0 >>>= 1960882886] % arg_0;
+        Object var_55 = (((new Test6663854_Class_4[Test6663854_Class_3.var_23])[--arg_0]).var_41 = new Test6663854_Class_3()).var_18 = (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24 ? (Test6663854_Class_3.var_24 |= (Test6663854_Class_3.var_24 &= true)) : Test6663854_Class_3.var_24 | Test6663854_Class_3.var_24) ? (var_41 = (var_41 = (Test6663854_Class_3)arg_3)) : arg_3;
+        var_38 >>= ((Test6663854_Class_3.var_24 = (Test6663854_Class_3.var_24 ^= Test6663854_Class_3.var_24)) | (Test6663854_Class_3.var_24 ^= Test6663854_Class_3.var_24) ? arg_2.var_6 : (arg_0 -= 1.2264686416488313E308)) != (((new Test6663854_Class_4[arg_0])[arg_0]).var_38 >>>= arg_2.var_8) ? Test6663854_Class_3.var_23 : arg_0;
+        arg_0 += 1826349110 / (Test6663854_Class_0.var_5 = arg_0) + Test6663854_Class_3.var_21;
+        (var_41 = !Test6663854_Class_3.var_24 ? (var_41 = (new Test6663854_Class_3[arg_0])[arg_0]) : (new Test6663854_Class_3[--arg_0])[arg_0]).var_22 = ((new Test6663854_Class_0[arg_0][(byte)9.18575257519393E307][Test6663854_Class_3.var_23])[arg_0])[Test6663854_Class_3.var_23][arg_0];
+        (var_41 = new Test6663854_Class_3()).var_22 = ((var_41 = (var_41 = (var_41 = (var_41 = (var_41 = (Test6663854_Class_3)arg_3))))).var_22 = (arg_1 = arg_2));
+        Test6663854_Class_3.var_20 = Test6663854_Class_3.var_21;
+        var_40 = (var_41 = (Test6663854_Class_3)(new Test6663854_Interface_2[Test6663854_Class_3.var_23])[arg_0]);
+        Test6663854_Class_0.var_5 = Test6663854_Class_3.var_24 || (Test6663854_Class_3.var_24 = (Test6663854_Class_3.var_24 &= true)) ? var_42 : arg_1.var_6;
+        Test6663854_Class_0.var_5 = arg_0;
+        {
+            arg_0 %= (short)var_45;
+        }
+        var_55 = arg_1;
+        var_40 = (var_41 = (Test6663854_Class_3.var_24 = false) ? (Test6663854_Class_3)var_55 : (Test6663854_Class_3)arg_3);
+        ((Test6663854_Class_3.var_24 &= (Test6663854_Class_3.var_20 = arg_0) == 2.2107098E38F) ? (Test6663854_Class_3)(new Test6663854_Interface_1[Test6663854_Class_3.var_23])[arg_0] : (Test6663854_Class_3)(var_55 = "unofratwy")).var_18 = var_55;
+        return "";
+    }
+
+    private static String func_1(final String arg_0, char arg_1, final boolean arg_2, Test6663854_Class_3 arg_3)
+    {
+        if (!false & Test6663854_Class_3.var_24)
+        {
+            char var_56 = 'C';
+        }
+        else
+        {
+            var_40 = (var_40 = (var_40 = arg_3));
+        }
+        ((new Test6663854_Class_0[Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).var_7 = 2.4396145E38F + (((new Test6663854_Class_4[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23][(byte)Test6663854_Class_0.var_2]).var_43 = Test6663854_Class_3.var_23);
+        if (Test6663854_Class_3.var_24)
+        {
+            arg_3 = arg_3;
+        }
+        else
+        {
+            arg_3 = (arg_3 = arg_3);
+        }
+        ((new Test6663854_Class_4[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23))])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).var_38 /= '`';
+        arg_3 = (arg_3 = arg_3);
+        new Test6663854_Class_0().var_8++;
+        return "qd";
+    }
+
+    private Object func_2(short[][] arg_0, final Test6663854_Interface_2 arg_1)
+    {
+        boolean var_57 = false;
+        Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23;
+        var_40 = arg_1;
+        ((var_41 = (var_41 = (var_41 = (Test6663854_Class_3)arg_1))).var_22 = (Test6663854_Class_0)(((Test6663854_Class_3)arg_1).var_18 = "dxrwk")).var_7 = 'c';
+        if (true)
+        {
+            var_40 = (var_40 = arg_1);
+        }
+        else
+        {
+            var_39 = 'Z';
+        }
+        Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23;
+        var_41 = (Test6663854_Class_3)arg_1;
+        return (var_57 ? (Test6663854_Class_3.var_20 = Test6663854_Class_3.var_23) % 1271549437 : 1.1177259470512304E308) <= 1363316667 ? (new Test6663854_Class_3().var_18 = new String[var_43 = Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]) : new Test6663854_Class_0();
+    }
+
+    private short func_3()
+    {
+        int var_58 = true ? var_42 : 1438975079;
+        float var_59 = Test6663854_Class_3.var_21;
+        var_43 = Test6663854_Class_3.var_23;
+        (var_41 = (Test6663854_Class_3)(new Test6663854_Interface_1[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_22 = (Test6663854_Class_3.var_24 |= Test6663854_Class_3.var_24) ? new Test6663854_Class_0() : new Test6663854_Class_0();
+        var_58++;
+        return Test6663854_Class_3.var_24 ? var_42 : (var_43 = Test6663854_Class_3.var_23);
+    }
+
+    protected void func_4(final long arg_0, Test6663854_Class_0 arg_1, long arg_2)
+    {
+        ++arg_2;
+        (arg_1 = (arg_1 = (arg_1 = arg_1))).var_8 /= var_42;
+        --arg_2;
+        final Test6663854_Interface_1 var_60 = ((new Test6663854_Interface_1[Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[var_43 = Test6663854_Class_3.var_23])[var_43 = Test6663854_Class_3.var_23];
+        (true ? (Test6663854_Class_3)var_60 : (Test6663854_Class_3)var_60).var_22 = (Test6663854_Class_0)((var_41 = (Test6663854_Class_3)(var_40 = (Test6663854_Class_3)var_60)).var_18 = (Test6663854_Class_3.var_24 ^= Test6663854_Class_3.var_23 == var_38) ? "xo" : "uocm");
+        var_38 >>= (((Test6663854_Class_3)(new Test6663854_Interface_2[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_22 = (new Test6663854_Class_0[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)]).var_8++;
+    }
+
+    public String toString()
+    {
+        String result =  "[\n";
+        result += "Test6663854_Class_4.var_39 = "; result += Test6663854.Printer.print(var_39);
+        result += "\n";
+        result += "Test6663854_Class_4.var_45 = "; result += Test6663854.Printer.print(var_45);
+        result += "\n";
+        result += "Test6663854_Class_4.var_44 = "; result += Test6663854.Printer.print(var_44);
+        result += "\n";
+        result += "Test6663854_Class_4.var_38 = "; result += Test6663854.Printer.print(var_38);
+        result += "\n";
+        result += "Test6663854_Class_4.var_40 = "; result += Test6663854.Printer.print(var_40);
+        result += "\n";
+        result += "Test6663854_Class_4.var_42 = "; result += Test6663854.Printer.print(var_42);
+        result += "\n";
+        result += "Test6663854_Class_4.var_43 = "; result += Test6663854.Printer.print(var_43);
+        result += "\n";
+        result += "Test6663854_Class_4.var_41 = "; result += Test6663854.Printer.print(var_41);
+        result += "";
+        result += "\n]";
+        return result;
+    }
+}
+
+
+class Test6663854_Class_5 implements Test6663854_Interface_1 {
+    final static char var_65 = 'S';
+    static Test6663854_Interface_2 var_66;
+    static Test6663854_Class_3 var_67;
+
+
+    public Test6663854_Class_5()
+    {
+        {
+            ((new Test6663854_Class_4[Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)])[((Test6663854_Class_4)(new Object[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_43 = Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).func_0();
+        }
+        Test6663854_Class_0.var_5 = 1409421143;
+        Test6663854_Class_3.var_24 &= (Test6663854_Class_3.var_24 = false);
+        Test6663854_Class_0.var_5 = 3.1496384E38F / (((new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).var_45 - (Test6663854_Class_3.var_23 + Test6663854_Class_3.var_23));
+        ((new Test6663854_Class_3[Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_18 = (new Object[Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23];
+        var_66 = (Test6663854_Class_4.var_40 = (Test6663854_Class_3.var_24 = (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24)) || false ? new Test6663854_Class_3() : new Test6663854_Class_3());
+    }
+
+
+    public boolean func_0()
+    {
+        {
+            Test6663854_Class_4.var_40 = (new Test6663854_Class_4[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23];
+        }
+        Test6663854_Class_0.var_5 = (new char[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23];
+        var_66 = (Test6663854_Class_4.var_40 = new Test6663854_Class_3());
+        Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23;
+        ((var_67 = (var_67 = new Test6663854_Class_3())).var_22 = (Test6663854_Class_0)(new Test6663854_Class_3().var_18 = (new Test6663854_Class_3().var_22 = (new Test6663854_Class_3().var_22 = new Test6663854_Class_0())))).var_8++;
+        Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23;
+        return (Test6663854_Class_3.var_24 &= Test6663854_Class_3.var_24) ? (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24) : (Test6663854_Class_3.var_24 = true);
+    }
+
+    public String func_1(final String arg_0, final long arg_1, byte arg_2, char[][] arg_3)
+    {
+        ((true | (Test6663854_Class_3.var_24 |= true)) ^ false ? (new Test6663854_Class_0[(byte)arg_1])[arg_2--] : new Test6663854_Class_0()).var_8 <<= 2320675830599883776L;
+        arg_2 -= ~ (Test6663854_Class_3.var_24 ? ~4954934861909065728L : 5155213238651986944L);
+        ((Test6663854_Class_4)((new Test6663854_Interface_1[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[arg_2 >>>= 1308733456])[Test6663854_Class_3.var_23]).var_43 = arg_2;
+        Test6663854_Class_0.var_5 = Test6663854_Class_3.var_21;
+        {
+            String var_68;
+            float var_69 = Test6663854_Class_3.var_21 * new Test6663854_Class_0().var_6;
+            ++arg_2;
+            Test6663854_Class_0.var_9 = arg_2;
+            --arg_2;
+            var_68 = arg_0;
+            final long[] var_70 = new long[arg_2 /= 8889610108908524544L];
+            Test6663854_Class_4 var_71;
+        }
+        new Test6663854_Class_4().var_38++;
+        Test6663854_Class_3 var_72;
+        (((new Test6663854_Class_4[arg_2 *= var_65][Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[arg_2])[arg_2 ^= arg_2][Test6663854_Class_3.var_23]).var_38--;
+        new Test6663854_Class_3();
+        (((new Test6663854_Class_4[arg_2 /= 7.692983E37F][Test6663854_Class_3.var_23])[arg_2])[Test6663854_Class_3.var_23]).var_38 |= arg_1;
+        Test6663854_Class_3.var_24 ^= "dlhn".startsWith(true ? "tad" : "bssdfvig", 1125165775) ? Test6663854_Class_3.var_24 : true;
+        Test6663854_Class_3.var_20 = new Test6663854_Class_0().var_8;
+        Test6663854_Class_4.var_40 = (Test6663854_Class_4.var_40 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]);
+        var_72 = (new Test6663854_Class_3[Test6663854_Class_3.var_23][arg_2])[arg_2][arg_2];
+        Test6663854_Class_0.var_5 = 8634870161778523136L;
+        {
+            Test6663854_Class_0.var_5 = ~4420139622226571264L;
+            Test6663854_Class_3.var_24 &= (var_72 = (var_67 = (new Test6663854_Class_3[arg_2][Test6663854_Class_3.var_23])[arg_2][arg_2])).func_0();
+            arg_2 >>= false ? 'H' : ']';
+        }
+        switch (arg_2)
+        {
+            case 72:
+                String var_73 = arg_0;
+                break;
+
+            default:
+
+        }
+        ((Test6663854_Class_0)((var_72 = (Test6663854_Class_3)(new Test6663854_Interface_1[Test6663854_Class_3.var_23])[arg_2]).var_18 = (Test6663854_Class_4)(new Test6663854_Interface_2[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])).var_7 = ((new Test6663854_Class_0[arg_2])[arg_2]).var_6 + Test6663854_Class_3.var_23;
+        var_67 = (var_67 = (new Test6663854_Class_3[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[(byte)7.184837949183326E307][arg_2 ^= 2188582676874919936L]);
+        return ((Test6663854_Class_3.var_24 = new Test6663854_Class_0().var_6 >= (short)3.4944631475014644E307) ? Test6663854_Class_3.var_24 : (Test6663854_Class_3.var_24 ? (Test6663854_Class_3.var_24 = false) : !Test6663854_Class_3.var_24)) ? "y" : arg_0;
+    }
+
+
+
+
+    private final static float func_0(boolean arg_0)
+    {
+        {
+            new String();
+            {
+                new String();
+            }
+            ((Test6663854_Class_3)(new Object[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[(new byte[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).var_18 = (new Object[Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[(byte)1.577204008065932E308][Test6663854_Class_3.var_23];
+            int var_74;
+            new String();
+            Test6663854_Class_0.var_5 = ((Test6663854_Class_0)(new Object[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_1;
+            new String();
+            new String();
+            new String();
+            var_74 = '_';
+            new Test6663854_Class_0();
+            Test6663854_Class_3 var_75 = var_67 = (((new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_41 = (new Test6663854_Class_3[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]);
+        }
+        if (Test6663854_Class_3.var_24 &= (Test6663854_Class_3.var_24 &= Test6663854_Class_3.var_24))
+        {
+            new String();
+            arg_0 &= ~ (((new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_38 /= Test6663854_Class_3.var_23) < 2.1129417E38F;
+        }
+        else
+        {
+            Test6663854_Class_3.var_24 &= false & arg_0 ? false : (Test6663854_Class_3.var_24 &= true);
+        }
+        new Test6663854_Class_0().var_8 ^= 682270015;
+        Test6663854_Class_4.var_40 = (Test6663854_Class_4)(new Test6663854_Interface_2[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23];
+        new Test6663854_Class_0();
+        new String();
+        new Test6663854_Class_0();
+        new Test6663854_Class_3().var_22 = new Test6663854_Class_0();
+        Test6663854_Class_4.var_40 = (new Test6663854_Class_4[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23];
+        new Test6663854_Class_0().var_8++;
+        new Test6663854_Class_0();
+        Test6663854_Interface_1 var_76;
+        return Test6663854_Class_3.var_21;
+    }
+
+    public String toString()
+    {
+        String result =  "[\n";
+        result += "Test6663854_Class_5.var_65 = "; result += Test6663854.Printer.print(var_65);
+        result += "\n";
+        result += "Test6663854_Class_5.var_66 = "; result += Test6663854.Printer.print(var_66);
+        result += "\n";
+        result += "Test6663854_Class_5.var_67 = "; result += Test6663854.Printer.print(var_67);
+        result += "";
+        result += "\n]";
+        return result;
+    }
+}
+
+
+class Test6663854_Class_6 implements Test6663854_Interface_1, Test6663854_Interface_2 {
+    static long var_77;
+    final byte var_78 = Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23;
+    long var_79;
+    static Test6663854_Class_4 var_80;
+    static long var_81 = 1365276905537306624L;
+    static Test6663854_Class_3 var_82;
+
+
+    public Test6663854_Class_6()
+    {
+        Test6663854_Class_0.var_5 = Test6663854_Class_3.var_24 ? "bdouannkn".charAt(373674594) : (char)2612074035904901120L;
+        if (Test6663854_Class_3.var_24)
+        {
+            ++var_81;
+            Test6663854_Class_0.var_4 = (new byte[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)])[var_78];
+            var_81++;
+        }
+        else
+        {
+            (var_80 = (Test6663854_Class_4)(new Test6663854_Interface_1[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = var_78]).var_41 = (((Test6663854_Class_4)(new Object[Test6663854_Class_3.var_23])[var_78]).var_41 = new Test6663854_Class_3());
+            var_81--;
+            ((new Test6663854_Class_0[var_78])[var_78]).equals((Test6663854_Class_5.var_67 = (Test6663854_Class_3)(new Test6663854_Interface_2[var_78])[var_78]).var_18 = Test6663854_Class_3.var_23 <= var_78 ? "uvoxke" : new String());
+            {
+                Test6663854_Class_5.var_66 = (new Test6663854_Interface_2[var_78])[((new Test6663854_Class_6[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_78];
+            }
+            "huxqcdmii".compareTo("owtdmma");
+            Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)));
+            var_81--;
+        }
+        {
+            Test6663854_Class_5[][] var_85;
+        }
+        Test6663854_Class_5.var_66 = (new Test6663854_Interface_2[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23][Test6663854_Class_3.var_23];
+        if (Test6663854_Class_3.var_24 || Test6663854_Class_3.var_24)
+        {
+            var_82 = (new Test6663854_Class_3[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[var_78][Test6663854_Class_3.var_23];
+            Test6663854_Class_0.var_5 = ++var_81;
+            Test6663854_Class_0.var_5 = Test6663854_Class_3.var_24 ? 'n' : Test6663854_Class_5.var_65;
+        }
+        else
+        {
+            new Test6663854_Class_0();
+        }
+        Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23);
+        Test6663854_Class_5.var_66 = new Test6663854_Class_3();
+        Test6663854_Class_3 var_86 = (var_80 = (var_80 = (var_80 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]))).var_41 = (var_82 = (Test6663854_Class_5.var_67 = ((new Test6663854_Class_3[Test6663854_Class_3.var_23][var_78][Test6663854_Class_3.var_23])[var_78])[var_78][Test6663854_Class_3.var_23]));
+        Test6663854_Class_3.var_24 &= (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24) ? (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24) : (Test6663854_Class_3.var_24 &= Test6663854_Class_3.var_24);
+        var_86.var_22 = (new Test6663854_Class_0[var_78][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][var_78];
+        (Test6663854_Class_3.var_24 ? "evayayw" : "ndcq").startsWith("hwlik" + "tnhfsky");
+        var_86 = var_86;
+    }
+
+
+    public boolean func_0()
+    {
+        Test6663854_Class_4.var_40 = (Test6663854_Class_5.var_67 = (new Test6663854_Class_3[var_78])[Test6663854_Class_3.var_23]);
+        return Test6663854_Class_0.var_2 != (((new Test6663854_Class_0[var_78])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).var_7 = Test6663854_Class_3.var_23);
+    }
+
+    public String func_1(final String arg_0, final long arg_1, byte arg_2, char[][] arg_3)
+    {
+        Test6663854_Class_3.var_24 |= Test6663854_Class_3.var_24;
+        Test6663854_Class_0.var_5 = var_78;
+        char var_83;
+        (Test6663854_Class_5.var_67 = (Test6663854_Class_5.var_67 = (Test6663854_Class_3)(new Test6663854_Interface_1[var_78])[Test6663854_Class_3.var_23])).var_18 = new Test6663854_Class_0[arg_2];
+        Test6663854_Class_4 var_84;
+        var_81++;
+        return arg_0;
+    }
+
+
+
+    public String toString()
+    {
+        String result =  "[\n";
+        result += "Test6663854_Class_6.var_77 = "; result += Test6663854.Printer.print(var_77);
+        result += "\n";
+        result += "Test6663854_Class_6.var_79 = "; result += Test6663854.Printer.print(var_79);
+        result += "\n";
+        result += "Test6663854_Class_6.var_81 = "; result += Test6663854.Printer.print(var_81);
+        result += "\n";
+        result += "Test6663854_Class_6.var_78 = "; result += Test6663854.Printer.print(var_78);
+        result += "\n";
+        result += "Test6663854_Class_6.var_80 = "; result += Test6663854.Printer.print(var_80);
+        result += "\n";
+        result += "Test6663854_Class_6.var_82 = "; result += Test6663854.Printer.print(var_82);
+        result += "";
+        result += "\n]";
+        return result;
+    }
+}
+
+
+final class Test6663854_Class_7 extends Test6663854_Class_5 implements Test6663854_Interface_2 {
+    final float var_87 = 1.1671899E38F;
+    static char var_88 = var_65;
+    float var_89 = 2.166908E37F;
+
+
+    public Test6663854_Class_7()
+    {
+        var_88--;
+        (Test6663854_Class_5.var_67 = (new Test6663854_Class_3[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).equals(((Test6663854_Class_3)(Test6663854_Class_4.var_40 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])).var_18 = "nycb");
+        Test6663854_Class_3.var_24 = (Test6663854_Class_3.var_24 |= Test6663854_Class_3.var_24 ^ false);
+        Test6663854_Class_3.var_24 ^= true;
+        var_88--;
+        Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)(new Test6663854_Interface_1[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]);
+        if (false)
+        {
+            Test6663854_Class_4.var_40 = (new Test6663854_Interface_2[Test6663854_Class_3.var_23])[((new Test6663854_Class_6[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_78];
+        }
+        else
+        {
+            --Test6663854_Class_6.var_81;
+        }
+        Test6663854_Class_6.var_81--;
+        ++Test6663854_Class_6.var_81;
+        if (Test6663854_Class_3.var_24 = !Test6663854_Class_3.var_24)
+        {
+            --var_88;
+            Test6663854_Class_5.var_66 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23];
+            Test6663854_Class_6.var_81 &= 1451013276;
+            var_88--;
+        }
+        else
+        {
+            var_88 >>= --var_88;
+        }
+        Test6663854_Class_3.var_24 &= Test6663854_Class_3.var_24;
+        Test6663854_Class_6.var_81--;
+        Test6663854_Class_6.var_81++;
+        --Test6663854_Class_6.var_81;
+        ((new Test6663854_Class_4[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_41 = new Test6663854_Class_3();
+    }
+
+
+
+
+    public final Test6663854_Class_4 func_0(int arg_0)
+    {
+        --arg_0;
+        {
+            switch ((char)var_89)
+            {
+                case 'R':
+
+            }
+            ++(Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]))).var_38;
+            ++var_88;
+            Test6663854_Class_5.var_66 = ~Test6663854_Class_6.var_81 % Test6663854_Class_6.var_81 != (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23) ? (Test6663854_Class_6.var_82 = (var_67 = new Test6663854_Class_3())) : new Test6663854_Class_3();
+        }
+        (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)(new Test6663854_Interface_2[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])).var_38 &= new Test6663854_Class_0().var_6;
+        Test6663854_Interface_1 var_90 = ((new Test6663854_Interface_1[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23];
+        (Test6663854_Class_5.var_67 = (new Test6663854_Class_3[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_22 = new Test6663854_Class_0();
+        if (true)
+        {
+            ((Test6663854_Class_3)(Test6663854_Interface_2)var_90).var_18 = (((Test6663854_Class_3)var_90).var_22 = new Test6663854_Class_0());
+        }
+        else
+        {
+            ++((Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)var_90)).var_45 > 7.093005581228189E307 ? (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)var_90)) : (Test6663854_Class_4)(var_90 = (Test6663854_Class_3)var_90)).var_38;
+        }
+        var_67 = (Test6663854_Class_3.var_24 ^= true) ^ true ? (Test6663854_Class_6.var_82 = (Test6663854_Class_3)var_90) : (Test6663854_Class_3)var_90;
+        {
+            {
+                var_90 = (var_90 = (Test6663854_Class_5)var_90);
+            }
+            Test6663854_Class_3.var_24 ^= (Test6663854_Class_3.var_24 = (Test6663854_Class_3.var_24 ? !false : true) ? (Test6663854_Class_3.var_24 &= (Test6663854_Class_3.var_24 = (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24))) : ! !Test6663854_Class_3.var_24 && false);
+            Test6663854_Class_0 var_91;
+            Test6663854_Class_4.var_40 = (Test6663854_Class_3.var_24 |= (Test6663854_Class_3.var_24 |= Test6663854_Class_3.var_24) && (Test6663854_Class_3.var_24 |= Test6663854_Class_3.var_24) | ! (Test6663854_Class_3.var_24 ^= Test6663854_Class_3.var_24)) ? (+Test6663854_Class_3.var_21 != 4.6479454E37F ? (Test6663854_Class_6)(Test6663854_Interface_2)var_90 : (Test6663854_Class_6)var_90) : (new Test6663854_Class_6[Test6663854_Class_3.var_23])[((Test6663854_Class_6)(Test6663854_Class_5.var_66 = (Test6663854_Interface_2)var_90)).var_78];
+        }
+        arg_0 |= ((((Test6663854_Class_6.var_80 = (Test6663854_Class_4)var_90).var_41 = (((Test6663854_Class_4)var_90).var_41 = (Test6663854_Class_3)var_90)).var_22 = new Test6663854_Class_0()).var_8 += (Test6663854_Class_3.var_20 = new Test6663854_Class_0().var_1));
+        {
+            (Test6663854_Class_6.var_82 = (new Test6663854_Class_3[((Test6663854_Class_6)var_90).var_78])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).var_18 = ((Test6663854_Class_3.var_24 ^ (!false & Test6663854_Class_3.var_24 ? Test6663854_Class_3.var_24 : (Test6663854_Class_3.var_24 ^= true)) ? (Test6663854_Class_3)var_90 : (Test6663854_Class_3)(Test6663854_Interface_2)var_90).var_18 = ((Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)var_90)).var_41 = (Test6663854_Class_3)(((Test6663854_Class_3)(Test6663854_Class_5.var_66 = (Test6663854_Class_3)var_90)).var_18 = (((Test6663854_Class_3)(Test6663854_Interface_2)var_90).var_18 = (Test6663854_Class_3)var_90))));
+        }
+        {
+            arg_0++;
+        }
+        Test6663854_Interface_2 var_92;
+        {
+            ((Test6663854_Class_5.var_67 = ((Test6663854_Class_6.var_80 = (Test6663854_Class_4)(var_92 = (Test6663854_Class_3)var_90)).var_41 = (Test6663854_Class_5.var_67 = (Test6663854_Class_3)var_90))).var_22 = ((Test6663854_Class_5.var_67 = (new Test6663854_Class_3[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_22 = ((Test6663854_Class_6.var_82 = (((Test6663854_Class_4)var_90).var_41 = (Test6663854_Class_3)var_90)).var_22 = (Test6663854_Class_0)((Test6663854_Class_5.var_67 = (Test6663854_Class_3)var_90).var_18 = (Test6663854_Class_5)var_90)))).var_7 = Test6663854_Class_3.var_21;
+        }
+        arg_0 &= ((var_67 = (var_67 = new Test6663854_Class_3())).var_22 = (new Test6663854_Class_0[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_1 / 2084775982;
+        Test6663854_Class_3.var_20 = (Test6663854_Class_3.var_24 = false) ^ true ? Test6663854_Class_0.var_2 : var_88;
+        return Test6663854_Class_6.var_80 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[((Test6663854_Class_6)var_90).var_78];
+    }
+
+    public String toString()
+    {
+        String result =  "[\n";
+        result += "Test6663854_Class_7.var_65 = "; result += Test6663854.Printer.print(var_65);
+        result += "\n";
+        result += "Test6663854_Class_7.var_88 = "; result += Test6663854.Printer.print(var_88);
+        result += "\n";
+        result += "Test6663854_Class_7.var_87 = "; result += Test6663854.Printer.print(var_87);
+        result += "\n";
+        result += "Test6663854_Class_7.var_89 = "; result += Test6663854.Printer.print(var_89);
+        result += "\n";
+        result += "Test6663854_Class_7.var_66 = "; result += Test6663854.Printer.print(var_66);
+        result += "\n";
+        result += "Test6663854_Class_7.var_67 = "; result += Test6663854.Printer.print(var_67);
+        result += "";
+        result += "\n]";
+        return result;
+    }
+}
+
+
+final class Test6663854_Class_8 implements Test6663854_Interface_1 {
+    long var_93 = ++Test6663854_Class_6.var_81;
+    short var_94 = (short)'H';
+    float var_95;
+    Test6663854_Interface_1 var_96;
+    final static float var_97 = 2.43397E38F;
+    final static long var_98 = 7461452158234510336L;
+    static Test6663854_Class_7[] var_99;
+
+
+    public Test6663854_Class_8()
+    {
+        Test6663854_Class_6 var_103;
+        Test6663854_Class_3.var_20 = (Test6663854_Class_3.var_20 = var_94 / ~Test6663854_Class_3.var_23);
+        if (false)
+        {
+            Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24;
+        }
+        else
+        {
+            Test6663854_Class_3.var_20 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23);
+            --Test6663854_Class_7.var_88;
+        }
+        final boolean[] var_104 = new boolean[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23];
+        Test6663854_Class_3.var_24 &= false & (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24);
+    }
+
+
+    public boolean func_0()
+    {
+        Test6663854_Class_7.var_88--;
+        Test6663854_Class_7.var_88--;
+        (((new Test6663854_Class_0[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_7 = 1.2337083709828518E307;
+        Test6663854_Class_7.var_88++;
+        if (Test6663854_Class_3.var_24)
+        {
+            byte var_100 = 25;
+            "lwmbav".toLowerCase();
+            Test6663854_Class_3.var_24 |= (Test6663854_Class_3.var_24 |= false) & ((Test6663854_Class_3.var_24 = true) ^ Test6663854_Class_3.var_24 ? (Test6663854_Class_3.var_24 ^= Test6663854_Class_3.var_24) : Test6663854_Class_3.var_24);
+        }
+        else
+        {
+            long var_101;
+            new Test6663854_Class_0().var_7 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23);
+            Test6663854_Class_7.var_88++;
+            ++Test6663854_Class_6.var_81;
+            Test6663854_Class_7.var_88 |= 1083041050566936576L;
+            Test6663854_Class_7.var_88--;
+        }
+        var_94 ^= (var_94 = (var_94 *= 1.9072213520938263E307));
+        var_94++;
+        boolean var_102 = true;
+        ++Test6663854_Class_7.var_88;
+        Test6663854_Class_7.var_88 += (((new Test6663854_Class_7[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_87;
+        ((new Test6663854_Class_7[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_89 /= (new double[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23] * var_97;
+        return (Test6663854_Class_3.var_24 = (var_102 &= Test6663854_Class_3.var_24 & true)) ? false : Test6663854_Class_3.var_24;
+    }
+
+    public String func_1(final String arg_0, final long arg_1, byte arg_2, char[][] arg_3)
+    {
+        Test6663854_Class_7.var_88--;
+        --Test6663854_Class_7.var_88;
+        return arg_0;
+    }
+
+
+
+    private Test6663854_Class_0 func_0(Test6663854_Class_0 arg_0)
+    {
+        if (!Test6663854_Class_3.var_24)
+        {
+            Test6663854_Class_7.var_88 ^= (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23) << ~Test6663854_Class_0.var_2;
+        }
+        else
+        {
+            (Test6663854_Class_6.var_82 = (Test6663854_Class_7.var_67 = (Test6663854_Class_3)(new Test6663854_Interface_1[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])).var_22 = (((new Test6663854_Class_3[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_22 = (arg_0 = arg_0));
+        }
+        if ((Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23))) < Test6663854_Class_3.var_21)
+        {
+            Test6663854_Class_3.var_24 ^= (Test6663854_Class_3.var_24 ^= (arg_0.var_6 ^ Test6663854_Class_7.var_88++) != (long)"y".codePointAt((int)var_94)) | false;
+        }
+        else
+        {
+            ++Test6663854_Class_7.var_88;
+        }
+        var_94 >>= (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23);
+        {
+            Test6663854_Class_7.var_66 = (Test6663854_Class_6)(var_96 = new Test6663854_Class_3());
+        }
+        arg_0.var_8 = 'u';
+        var_94 ^= arg_0.var_8;
+        ++var_94;
+        Test6663854_Class_7.var_88++;
+        var_94 += (Test6663854_Class_3.var_20 = '^');
+        return arg_0;
+    }
+
+    public String toString()
+    {
+        String result =  "[\n";
+        result += "Test6663854_Class_8.var_99 = "; result += Test6663854.Printer.print(var_99);
+        result += "\n";
+        result += "Test6663854_Class_8.var_93 = "; result += Test6663854.Printer.print(var_93);
+        result += "\n";
+        result += "Test6663854_Class_8.var_98 = "; result += Test6663854.Printer.print(var_98);
+        result += "\n";
+        result += "Test6663854_Class_8.var_95 = "; result += Test6663854.Printer.print(var_95);
+        result += "\n";
+        result += "Test6663854_Class_8.var_97 = "; result += Test6663854.Printer.print(var_97);
+        result += "\n";
+        result += "Test6663854_Class_8.var_94 = "; result += Test6663854.Printer.print(var_94);
+        result += "\n";
+        result += "Test6663854_Class_8.var_96 = "; result += Test6663854.Printer.print(var_96);
+        result += "";
+        result += "\n]";
+        return result;
+    }
+}
+
+public class Test6663854 {
+    static short var_105 = 19709;
+    static int var_106 = (((Test6663854_Class_3.var_24 = (Test6663854_Class_3.var_24 = false)) | true) & (false || !false) ? ! (Test6663854_Class_3.var_24 |= Test6663854_Class_3.var_24) : Test6663854_Class_3.var_24 | false) ? (short)5430142769559462912L : Test6663854_Class_3.var_23 << Test6663854_Class_3.var_23;
+    boolean var_107 = false;
+
+
+    private static long func_0(final boolean arg_0)
+    {
+        {
+            Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)(new Test6663854_Interface_2[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]);
+        }
+        var_105++;
+        ((new Test6663854_Class_7[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)][((new Test6663854_Class_6[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_78]).func_0();
+        byte var_108 = 107;
+        return Test6663854_Class_8.var_98 << ((new Test6663854_Class_4[var_108][Test6663854_Class_3.var_23])[var_108][Test6663854_Class_3.var_24 ? var_108 : var_108--]).var_42;
+    }
+
+    protected final long func_1(char[] arg_0, Object arg_1, String arg_2, final int arg_3)
+    {
+        (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1)))).var_43 = ((Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1)))))).var_43 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23));
+        {
+            Test6663854_Class_6.var_82 = ((Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1)).var_41 = (((new Test6663854[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_107 ^= var_107) ? (new Test6663854_Class_3[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23] : (Test6663854_Class_3)arg_1);
+        }
+        Test6663854_Class_7.var_88 += (Test6663854_Class_6.var_81 >>>= (var_107 &= var_107) | var_107 ? (int)- ~Test6663854_Class_6.var_81 : Test6663854_Class_3.var_23);
+        short var_109 = 11276;
+        final Test6663854_Class_8 var_110 = (Test6663854_Class_3.var_24 ^ (Test6663854_Class_3.var_24 = !true) ? 5788412835121658880L : var_109--) * (298795405395535872L << (((Test6663854_Class_0)arg_1).var_1 << (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23))) != (var_107 ? var_109 : var_105) ? (Test6663854_Class_8)(arg_1 = arg_1) : ((Test6663854_Class_3.var_24 &= ! !var_107) ? new Test6663854_Class_8() : new Test6663854_Class_8());
+        new Test6663854_Class_4().var_43 = Test6663854_Class_3.var_24 ^ Test6663854_Class_3.var_24 ^ Test6663854_Class_3.var_24 ? (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)) : (new byte[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23][Test6663854_Class_3.var_23];
+        Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1)));
+        Test6663854_Class_3.var_20 = (var_105 ^= (var_106 *= ((Test6663854_Class_7)arg_1).var_87 - ~Test6663854_Class_3.var_23));
+        Test6663854_Class_5 var_111;
+        Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1));
+        {
+            (arg_2 = "eiprceumt").compareTo(arg_2 = (arg_2 = "roae"));
+        }
+        if (false)
+        {
+            final Test6663854_Class_8 var_112 = var_110;
+            (true | (false && false) ? (Test6663854_Class_3)arg_1 : ((Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1)).var_41 = (Test6663854_Class_6.var_82 = (Test6663854_Class_3)(var_110.var_96 = var_112)))).var_18 = var_110;
+        }
+        else
+        {
+            (Test6663854_Class_3.var_24 ? "jpunp" : "giappofq").concat(arg_2 = (arg_2 = arg_2));
+        }
+        {
+            Test6663854_Class_3.var_24 &= Test6663854_Class_3.var_24;
+        }
+        var_110.var_96 = (Test6663854_Class_7)(var_110.var_96 = (Test6663854_Class_7)arg_1);
+        {
+            ((var_107 ^= !var_107) && (!Test6663854_Class_3.var_24 | (Test6663854_Class_3.var_24 |= true) ? !false : !true) ? (Test6663854_Class_4)arg_1 : (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1)).var_41 = (((var_107 &= (var_107 &= (var_107 &= (Test6663854_Class_3.var_24 ^= (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24))))) ? (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1) : (Test6663854_Class_4)(Test6663854_Class_4.var_40 = (Test6663854_Class_7)arg_1)).var_41 = ((Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1)))).var_41 = false || Test6663854_Class_3.var_24 ? (Test6663854_Class_3)arg_1 : (Test6663854_Class_3)arg_1));
+        }
+        Test6663854_Class_5.var_66 = false ? (new Test6663854_Class_6[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23] : new Test6663854_Class_6();
+        var_105++;
+        arg_1 = (var_111 = new Test6663854_Class_7());
+        ((true ? (Test6663854_Class_3)arg_1 : (Test6663854_Class_3)arg_1).var_22 = (new Test6663854_Class_0[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_8 >>= (var_106 /= ((Test6663854_Class_4)arg_1).var_42) - ((Test6663854_Class_3.var_24 ? (Test6663854_Class_4)arg_1 : (Test6663854_Class_4)arg_1).var_43 = ((Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1))).var_43 = new Test6663854_Class_6().var_78));
+        return 5795172173382514688L | (((var_107 &= (Test6663854_Class_3.var_24 |= false) | Test6663854_Class_3.var_24) ? (Test6663854_Class_4)arg_1 : (Test6663854_Class_6.var_80 = (Test6663854_Class_4)arg_1)).var_43 = Test6663854_Class_3.var_23);
+    }
+
+    public static String execute()
+    {
+        try {
+            Test6663854 t = new Test6663854();
+            try { t.test(); }
+            catch(Throwable e) { }
+            try { return t.toString(); }
+            catch (Throwable e) { return "Error during result conversion to String"; }
+        } catch (Throwable e) { return "Error during test execution"; }
+    }
+
+    public static void main(String[] args)
+    {
+        try {
+            Test6663854 t = new Test6663854();
+            try { t.test(); }
+            catch(Throwable e) { }
+            try { System.out.println(t); }
+            catch(Throwable e) { }
+        } catch (Throwable e) { }
+    }
+
+    private void test()
+    {
+        if ((true & (false ? !false : true) || var_107 ? (var_105 <<= Test6663854_Class_5.var_65) / (Test6663854_Class_0.var_5 = var_105) : 2509076152709535744L) >= (true ? new Test6663854_Class_8().var_93 : (Test6663854_Class_3.var_20 = Test6663854_Class_3.var_23)))
+        {
+            (true ? (new Test6663854_Class_6[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23] : (Test6663854_Class_7.var_66 = new Test6663854_Class_6())).func_0();
+            (var_107 ? (new Test6663854_Class_4().var_41 = new Test6663854_Class_3()) : (Test6663854_Class_3)(new Test6663854_Class_3().var_18 = new Test6663854_Class_8())).var_18 = (new Test6663854_Class_4[new Test6663854_Class_4().var_43 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)])[Test6663854_Class_3.var_23];
+            {
+                ++var_106;
+                ((new Test6663854_Class_5().func_0() ? (Test6663854_Class_3.var_24 ^= true) : !false) ? (Test6663854_Class_7)new Test6663854_Class_5() : (Test6663854_Class_7)((Test6663854_Class_6.var_82 = new Test6663854_Class_3()).var_18 = (Test6663854_Class_6.var_80 = new Test6663854_Class_4()))).var_89 -= Test6663854_Class_3.var_23;
+            }
+            var_105 *= 4.59906108270682E307;
+            {
+                Test6663854_Class_0.var_4 = ((Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = new Test6663854_Class_4()))).var_43 = (Test6663854_Class_0.var_4 = false ? (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23) : Test6663854_Class_3.var_23));
+            }
+            long var_113 = 0L;
+            var_106 %= (Test6663854_Class_7.var_88 = 'i');
+            for (short var_114 = ((Test6663854_Class_8)(new Test6663854_Interface_1[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23))])[Test6663854_Class_3.var_23]).var_94; var_113 < 4 && false; "dmmntw".length())
+            {
+                var_114++;
+                var_113++;
+                Test6663854_Class_3.var_24 &= Test6663854_Class_3.var_24;
+                new String("kprvouugy");
+            }
+            {
+                new Test6663854_Class_8().var_94 /= (long)5.719961906225282E307;
+            }
+            double var_115 = 0;
+            Test6663854_Class_3.var_24 |= var_107;
+            do
+            {
+                Test6663854_Class_3.var_24 ^= (Test6663854_Class_3.var_24 |= !Test6663854_Class_3.var_24 && var_107);
+                var_115++;
+                var_106++;
+            } while (var_115 < 29 && (var_107 = (Test6663854_Class_3.var_24 |= Test6663854_Class_3.var_24)));
+            Test6663854_Class_7.var_66 = new Test6663854_Class_7();
+            Test6663854_Class_3.var_20 = (false ? (Test6663854_Class_6.var_80 = new Test6663854_Class_4()) : new Test6663854_Class_4()).var_42;
+        }
+        else
+        {
+            (((new Test6663854_Class_3[Test6663854_Class_3.var_23])[new Test6663854_Class_6().var_78]).var_22 = (new Test6663854_Class_3().var_22 = (new Test6663854_Class_3().var_22 = new Test6663854_Class_0()))).var_8 >>>= (var_106 &= new Test6663854_Class_0().var_8 << Test6663854_Class_7.var_65);
+        }
+        Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = new Test6663854_Class_4()));
+        {
+            Test6663854_Class_8 var_116;
+            (!true | (Test6663854_Class_3.var_24 &= true) ? new Test6663854_Class_7() : new Test6663854_Class_7()).var_89 /= Test6663854_Class_7.var_88--;
+            Test6663854_Class_6.var_81 &= ((new Test6663854_Class_6[Test6663854_Class_3.var_23][Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_78;
+        }
+        if (true ? var_107 : (Test6663854_Class_3.var_24 &= (Test6663854_Class_3.var_24 |= false)))
+        {
+            Test6663854_Class_3.var_24 |= (Test6663854_Class_3.var_24 &= (Test6663854_Class_3.var_24 ^= (Test6663854_Class_3.var_24 &= !true)));
+            Test6663854_Class_7.var_66 = (Test6663854_Class_7)new Test6663854_Class_5();
+            Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)));
+            {
+                Test6663854_Class_7.var_88++;
+                float var_117 = 0F;
+                final long var_118 = 1388589135930756096L;
+                for (var_106++; ((Test6663854_Class_3.var_24 &= false) && (Test6663854_Class_3.var_24 |= true)) ^ true && (var_117 < 1 && Test6663854_Class_3.var_24); new Test6663854_Class_0().var_8 += !false || (new float[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23] <= Test6663854_Class_3.var_23 || Test6663854_Class_3.var_24 ? ((new Test6663854_Class_6[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_78 : Test6663854_Class_3.var_23)
+                {
+                    Test6663854_Class_6.var_82 = (Test6663854_Class_7.var_67 = new Test6663854_Class_3());
+                    var_117++;
+                    Test6663854_Class_5.var_66 = Test6663854_Class_3.var_24 & !Test6663854_Class_3.var_24 ^ var_107 ^ new Test6663854_Class_0().var_8 == new Test6663854_Class_0().var_1 ? new Test6663854_Class_6() : new Test6663854_Class_6();
+                    (Test6663854_Class_6.var_80 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)]).var_43 = (Test6663854_Class_0.var_4 = ((Test6663854_Class_6)(new Object[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_78);
+                }
+                if (false & ((var_107 = true) || ! ((Test6663854_Class_3.var_24 ^= true || !var_107) ? false : Test6663854_Class_3.var_24 ^ var_107) ? (var_107 = Test6663854_Class_3.var_24) && Test6663854_Class_3.var_24 : true))
+                {
+                    "yvjk".toString();
+                }
+                else
+                {
+                    Test6663854_Class_4 var_119 = Test6663854_Class_6.var_80 = ((var_107 = true) ? (Test6663854_Class_6.var_81 |= var_106) : var_118) < (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23))) ? (Test6663854_Class_4)(new Test6663854_Class_3().var_18 = new float[Test6663854_Class_3.var_23]) : (new Test6663854_Class_4[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23];
+                }
+                (false | (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23) >= var_106 ? new Test6663854_Class_3() : (Test6663854_Class_7.var_67 = new Test6663854_Class_3())).var_18 = ((false ? (new Test6663854_Class_3[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23] : new Test6663854_Class_3()).var_22 = ((Test6663854_Class_7.var_67 = (Test6663854_Class_3)(new Test6663854_Class_3().var_18 = (Test6663854_Class_8)(new Test6663854_Class_8().var_96 = new Test6663854_Class_8()))).var_22 = ((Test6663854_Class_5.var_67 = new Test6663854_Class_3()).var_22 = new Test6663854_Class_0())));
+                short var_120;
+                (Test6663854_Class_6.var_80 = new Test6663854_Class_4()).var_41 = new Test6663854_Class_3();
+                ((new Test6663854_Class_8[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).var_96 = (Test6663854_Class_4.var_40 = !false & var_107 ? (Test6663854_Class_7)new Test6663854_Class_5() : new Test6663854_Class_7());
+            }
+            if ((Test6663854_Class_3.var_24 &= (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24)) || Test6663854_Class_3.var_24)
+            {
+                {
+                    var_106--;
+                    Test6663854_Class_6.var_81 -= 2.5265952E38F;
+                    Test6663854_Class_7.var_88++;
+                    Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)(new Test6663854_Interface_1[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]));
+                    Test6663854_Class_6.var_81++;
+                    (((new Test6663854_Class_7[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[(byte)(var_105 &= var_106)])[Test6663854_Class_3.var_23]).equals(((new Test6663854_Class_3[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_18 = new Test6663854_Class_8());
+                }
+                ((((new Test6663854_Class_4[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_41 = (Test6663854_Class_7.var_67 = (Test6663854_Class_7.var_67 = (new Test6663854_Class_3[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]))).var_18 = "mnxktbgv";
+                var_105++;
+                ((Test6663854_Class_3.var_24 &= Test6663854_Class_3.var_24) ? (new Test6663854_Class_3().var_22 = new Test6663854_Class_0()) : new Test6663854_Class_0()).var_7 = new Test6663854_Class_0().var_6;
+                var_105 = (var_105 >>>= Test6663854_Class_3.var_23);
+                ++var_105;
+                {
+                    Test6663854_Class_0.var_4 = ((Test6663854_Class_6.var_80 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_43 = ((new Test6663854_Class_6[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)]).var_78);
+                    ((Test6663854_Class_8)(new Object[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_96 = (Test6663854_Class_6.var_80 = (Test6663854_Class_4)(Test6663854_Class_5.var_66 = (new Test6663854_Class_6[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]));
+                }
+                if (2125632862 >= Test6663854_Class_5.var_65)
+                {
+                    "nfdjgd".toLowerCase();
+                    ((new Test6663854_Class_8[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]).var_96 = new Test6663854_Class_8();
+                    Test6663854_Interface_2 var_121;
+                    new Test6663854_Class_0().var_7 = Test6663854_Class_8.var_97;
+                    --var_105;
+                    --Test6663854_Class_7.var_88;
+                    ((new Test6663854_Class_0[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)])[((Test6663854_Class_6)(Test6663854_Class_4.var_40 = (Test6663854_Class_3)(new Object[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])).var_78]).var_7 = (((new Test6663854_Class_8[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_94 += (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23));
+                }
+                else
+                {
+                    --Test6663854_Class_6.var_81;
+                }
+                if (false)
+                {
+                    Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23;
+                }
+                else
+                {
+                    var_105--;
+                    (true | (Test6663854_Class_3.var_24 |= var_107) ? (Test6663854_Class_7)(new Test6663854_Class_5[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23] : (new Test6663854_Class_7[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]).var_89 *= 2.5396491E38F;
+                    var_107 = Test6663854_Class_3.var_24;
+                    var_105++;
+                }
+                Test6663854_Class_6.var_81--;
+                new Test6663854_Class_5();
+            }
+            else
+            {
+                Test6663854_Class_0 var_122;
+            }
+            var_107 = false;
+            (Test6663854_Class_3.var_24 ? new Test6663854_Class_7() : (Test6663854_Class_7)(new Test6663854_Class_3().var_18 = new Test6663854_Class_6())).var_89 *= (var_106 -= (new Test6663854_Class_3().var_22 = new Test6663854_Class_0()).var_6);
+            new Test6663854_Class_8().var_94 *= Test6663854_Class_7.var_88;
+            ((new String[new Test6663854_Class_6().var_78])[Test6663854_Class_3.var_23]).codePointAt(135817988);
+            final double var_123 = 7.395191963488875E307;
+            --var_105;
+            Test6663854_Class_7.var_88++;
+        }
+        else
+        {
+            (Test6663854_Class_6.var_80 = Test6663854_Class_3.var_24 ? (Test6663854_Class_6.var_80 = new Test6663854_Class_4()) : (Test6663854_Class_6.var_80 = new Test6663854_Class_4())).var_38 <<= (Test6663854_Class_7.var_88 <<= (new Test6663854_Class_4().var_43 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23))) >>> Test6663854_Class_3.var_23);
+        }
+        int var_124 = 0;
+        Test6663854_Class_7 var_125;
+        float var_126 = 2.5216562E38F;
+        int var_127 = 0;
+        Test6663854_Class_7.var_66 = (Test6663854_Class_5.var_66 = (Test6663854_Class_4)(new Test6663854_Interface_1[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]);
+        while (var_127 < 1 && (Test6663854_Class_3.var_24 ? (var_107 |= var_107) : false))
+        {
+            short var_128;
+            var_127++;
+            var_125 = (var_125 = (var_125 = (var_125 = (Test6663854_Class_7)(new Test6663854_Interface_1[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])));
+            "nkv".indexOf("ptrepiu" + "aljmjttym", var_106 << (new byte[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]);
+        }
+        {
+            Test6663854_Class_7.var_66 = (Test6663854_Class_7.var_67 = (new Test6663854_Class_3[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]);
+        }
+        var_125 = (new Test6663854_Class_7[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23];
+        var_126 += var_106;
+        while (var_124 < 537 && true)
+        {
+            Test6663854_Class_7.var_88 %= var_105;
+            var_124++;
+            var_106++;
+            Test6663854_Class_5.var_66 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (new Test6663854_Class_4[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]));
+            final long var_129 = 3230407753980990464L;
+            new Test6663854_Class_8();
+            final Test6663854_Class_3 var_130 = (Test6663854_Class_3)((Test6663854_Class_3.var_24 |= !false) | (var_107 | !var_107) | (new Test6663854_Class_8().var_94++ >= 1015752753 | !true) ? (new Test6663854_Class_6[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23] : (new Test6663854_Interface_1[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23]);
+            Test6663854_Class_5.var_66 = (Test6663854_Class_7.var_66 = (Test6663854_Class_7.var_66 = (Test6663854_Class_7.var_67 = var_130)));
+        }
+        Test6663854_Class_7.var_66 = var_126 >= (Test6663854_Class_3.var_24 || (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24) ? var_106 : var_126) ? new Test6663854_Class_6() : new Test6663854_Class_6();
+        var_107 &= true;
+        (new Test6663854_Class_8().var_96 = (var_125 = (var_125 = (var_125 = new Test6663854_Class_7())))).func_0();
+        float var_131 = 0F;
+        Test6663854_Class_3 var_132 = new Test6663854_Class_3();
+        do
+        {
+            long var_133;
+            var_131++;
+            Test6663854_Interface_2 var_134 = Test6663854_Class_7.var_66 = var_132;
+        } while ((Test6663854_Class_3.var_24 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23) == 1.2758309E38F) && (var_131 < 117 && ((new short[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)] == ((var_107 &= ! (Test6663854_Class_3.var_24 ^= false)) ^ ! !false ? new Test6663854_Class_0().var_6 : new Test6663854_Class_4().var_42)));
+        (var_107 ? var_132 : (Test6663854_Class_3)(Test6663854_Class_7.var_66 = var_132)).var_18 = (Test6663854_Class_0)((Test6663854_Class_5.var_67 = (Test6663854_Class_7.var_67 = (var_132 = var_132))).var_18 = ((new Test6663854_Class_8[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23))])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]);
+        long var_135 = 0L;
+        (((new Test6663854_Class_8[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = (byte)+ (Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23)]).var_96 = var_132;
+        for (((var_107 = ((new Test6663854_Class_0[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).equals(var_132.var_18 = (Test6663854_Class_8)(new Test6663854_Class_8().var_96 = var_132))) ? "oedsntb" : "ouspr").concat("t"); var_135 < 27; (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23]))).var_38 %= (double)func_0(Test6663854_Class_3.var_24 = false ? !var_107 && ! !Test6663854_Class_3.var_24 : Test6663854_Class_3.var_24 ^ ! (Test6663854_Class_3.var_24 = Test6663854_Class_3.var_24)))
+        {
+            Test6663854_Class_6.var_80 = (Test6663854_Class_4)(new Test6663854_Class_8().var_96 = new Test6663854_Class_8());
+            var_135++;
+            Test6663854_Class_3.var_24 &= !true;
+            new Test6663854_Class_0().var_8 += Test6663854_Class_7.var_65;
+        }
+        Test6663854_Class_3 var_136 = var_132;
+        if ((var_107 = ((Test6663854_Class_4)(Test6663854_Class_7.var_66 = (var_125 = (Test6663854_Class_7)(Test6663854_Class_7.var_66 = var_136)))).func_0() ^ true) && (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (Test6663854_Class_6.var_80 = (new Test6663854_Class_4[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]))).var_45 <= ((new Test6663854_Class_6[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23]).var_78)
+        {
+            var_126 %= ((var_107 = true) ? (var_105 *= 8272288534835139584L) : (var_105 |= var_105)) % new Test6663854_Class_7().var_89;
+            ((Test6663854_Class_3)(new Test6663854_Class_8().var_96 = (new Test6663854_Interface_1[Test6663854_Class_3.var_23])[Test6663854_Class_3.var_23])).var_18 = new Test6663854_Class_0();
+            var_105 <<= ++((Test6663854_Class_3.var_24 |= false) ? new Test6663854_Class_8() : (Test6663854_Class_8)(new Test6663854_Class_8().var_96 = new Test6663854_Class_4())).var_94 % (Test6663854_Class_0.var_2 - var_106);
+            Test6663854_Interface_2 var_137;
+            var_137 = new Test6663854_Class_4();
+            int var_138;
+        }
+        else
+        {
+            final Test6663854_Interface_2 var_139 = Test6663854_Class_4.var_40 = (var_136 = var_136);
+            new Test6663854_Class_8().var_93 -= new Test6663854_Class_6().var_78;
+            --((Test6663854_Class_3.var_24 ^= var_126 < Test6663854_Class_3.var_23 | !var_107) ? (new Test6663854_Class_8[Test6663854_Class_3.var_23][Test6663854_Class_3.var_23])[Test6663854_Class_0.var_4 = Test6663854_Class_3.var_23][new Test6663854_Class_6().var_78] : new Test6663854_Class_8()).var_93;
+            var_105 >>= ! (Test6663854_Class_3.var_24 = true) || ((Test6663854_Class_8)(! (Test6663854_Class_3.var_24 |= var_107) | (false ? Test6663854_Class_3.var_23 : new Test6663854_Class_6().var_78) != new Test6663854_Class_8().var_93 ? (Test6663854_Class_6.var_82 = var_136) : (new Test6663854_Class_8().var_96 = (var_132 = var_136)))).var_94 >= Test6663854_Class_6.var_81++ ? var_124 : '`';
+        }
+        var_126 /= var_105;
+        var_105 *= var_127;
+        var_107 ^= (var_107 = true);
+        {
+            Test6663854_Class_7.var_66 = (var_125 = (Test6663854_Class_7)(new Test6663854_Class_5[Test6663854_Class_3.var_23])[new Test6663854_Class_6().var_78]);
+        }
+        (var_136.var_22 = ((var_136 = var_132).var_22 = new Test6663854_Class_0())).var_7 = ((!false ? var_132 : (Test6663854_Class_7.var_67 = var_132)).var_22 = (((Test6663854_Class_3)(var_136.var_18 = var_136)).var_22 = (Test6663854_Class_0)(var_132.var_18 = "sgybwy"))).var_6;
+        ((Test6663854_Class_3.var_20 = var_105--) >= ~Test6663854_Class_3.var_23 ? new String() : "lgcfkbsw").replace(new Test6663854_Class_0().var_8 |= 't', false ? (Test6663854_Class_7.var_88 -= var_105) : 'q');
+        Test6663854_Class_7.var_88 <<= Test6663854_Class_7.var_88;
+    }
+    public String toString()
+    {
+        String result =  "[\n";
+        result += "Test6663854.var_105 = "; result += Printer.print(var_105);
+        result += "\n";
+        result += "Test6663854.var_107 = "; result += Printer.print(var_107);
+        result += "\n";
+        result += "Test6663854.var_106 = "; result += Printer.print(var_106);
+        result += "";
+        result += "\n]";
+        return result;
+    }
+    static class Printer
+    {
+        public static String print(boolean arg) { return String.valueOf(arg); }
+        public static String print(byte arg)    { return String.valueOf(arg); }
+        public static String print(short arg)   { return String.valueOf(arg); }
+        public static String print(char arg)    { return String.valueOf((int)arg); }
+        public static String print(int arg)     { return String.valueOf(arg); }
+        public static String print(long arg)    { return String.valueOf(arg); }
+        public static String print(float arg)   { return String.valueOf(arg); }
+        public static String print(double arg)  { return String.valueOf(arg); }
+
+
+        public static String print(Object arg)
+        {
+            return print_r(new java.util.Stack(), arg);
+        }
+
+        private static String print_r(java.util.Stack visitedObjects, Object arg)
+        {
+            String result = "";
+            if (arg == null)
+                result += "null";
+            else
+            if (arg.getClass().isArray())
+            {
+                for (int i = 0; i < visitedObjects.size(); i++)
+                    if (visitedObjects.elementAt(i) == arg) return "<recursive>";
+
+                visitedObjects.push(arg);
+
+                final String delimiter = ", ";
+                result += "[";
+
+                if (arg instanceof Object[])
+                {
+                    Object[] array = (Object[]) arg;
+                    for (int i = 0; i < array.length; i++)
+                    {
+                        result += print_r(visitedObjects, array[i]);
+                        if (i < array.length - 1) result += delimiter;
+                    }
+                }
+                else
+                if (arg instanceof boolean[])
+                {
+                    boolean[] array = (boolean[]) arg;
+                    for (int i = 0; i < array.length; i++)
+                    {
+                        result += print(array[i]);
+                        if (i < array.length - 1) result += delimiter;
+                    }
+                }
+                else
+                if (arg instanceof byte[])
+                {
+                    byte[] array = (byte[]) arg;
+                    for (int i = 0; i < array.length; i++)
+                    {
+                        result += print(array[i]);
+                        if (i < array.length - 1) result += delimiter;
+                    }
+                }
+                else
+                if (arg instanceof short[])
+                {
+                    short[] array = (short[]) arg;
+                    for (int i = 0; i < array.length; i++)
+                    {
+                        result += print(array[i]);
+                        if (i < array.length - 1) result += delimiter;
+                    }
+                }
+                else
+                if (arg instanceof char[])
+                {
+                    char[] array = (char[]) arg;
+                    for (int i = 0; i < array.length; i++)
+                    {
+                        result += print(array[i]);
+                        if (i < array.length - 1) result += delimiter;
+                    }
+                }
+                else
+                if (arg instanceof int[])
+                {
+                     int[] array = (int[]) arg;
+                     for (int i = 0; i < array.length; i++)
+                     {
+                        result += print(array[i]);
+                        if (i < array.length - 1) result += delimiter;
+                     }
+                }
+                else
+                if (arg instanceof long[])
+                {
+                    long[] array = (long[]) arg;
+                    for (int i = 0; i < array.length; i++)
+                    {
+                        result += print(array[i]);
+                        if (i < array.length - 1) result += delimiter;
+                    }
+                }
+                else
+                if (arg instanceof float[])
+                {
+                    float[] array = (float[]) arg;
+                    for (int i = 0; i < array.length; i++)
+                    {
+                        result += print(array[i]);
+                        if (i < array.length - 1) result += delimiter;
+                    }
+                }
+                else
+                if (arg instanceof double[])
+                {
+                    double[] array = (double[]) arg;
+                    for (int i = 0; i < array.length; i++)
+                    {
+                        result += print(array[i]);
+                        if (i < array.length - 1) result += delimiter;
+                    }
+                }
+
+                result += "]";
+                visitedObjects.pop();
+
+            } else
+            {
+                result += arg.toString();
+            }
+
+            return result;
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6769124/TestArrayCopy6769124.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6769124/TestArrayCopy6769124.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6769124
+ * @summary arraycopy may crash the VM with c1 on 64 bit
+ */
+
+public class TestArrayCopy6769124 {
+
+    public static void main(String[] args) {
+
+        int k = 1 << 31;
+
+
+        for(int j = 0; j <1000000; j++) {
+            int i = -1;
+            while(i < 10) {
+                i++;
+            }
+
+            int m = k * i;
+
+            int[] O1 = new int[20];
+            int[] O2 = new int[20];
+
+            System.arraycopy(O1, i, O2, i, 1); //will crash on amd64
+            System.arraycopy(O1, m, O2, m, 1); //will crash on sparcv9
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6769124/TestDeoptInt6769124.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6769124/TestDeoptInt6769124.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6769124
+ * @summary int value might not be correctly decoded on deopt with c1 on 64 bit
+ *
+ * @run main/othervm -Xcomp -XX:CompileOnly=TestDeoptInt6769124.m TestDeoptInt6769124
+ */
+
+public class TestDeoptInt6769124 {
+
+    static class A {
+        volatile int vl;
+        A(int v) {
+            vl = v;
+        }
+    }
+
+    static void m(int b) {
+        A a = new A(10);
+        int c;
+        c = b + a.vl; //accessing volatile field of class not loaded at compile time forces a deopt
+        if(c != 20) {
+            System.out.println("a (= " + a.vl + ") + b (= " + b + ") = c (= " + c + ") != 20");
+            throw new InternalError();
+        }
+    }
+
+    public static void main(String[] args) {
+        m(10);
+    }
+
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6769124/TestUnalignedLoad6769124.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6769124/TestUnalignedLoad6769124.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6769124
+ * @summary unaligned load may fail with c1 on 64 bit
+ */
+
+public class TestUnalignedLoad6769124 {
+
+    static long l1v = 0x200000003L;
+    static long l2v = 0x400000005L;
+    static double d1v = Double.MAX_VALUE;
+    static double d2v = Double.MIN_VALUE;
+
+    public static void main(String[] args) {
+        long l1 = l1v;
+        double d1 = d1v;
+        long l2 = l2v;
+        double d2 = d2v;
+
+        // Run long enough to induce an OSR
+        for (int i = 0; i < 10000000; i++) {
+        }
+        boolean error = false;
+
+        if (l1 != l1v) {
+            System.out.println(l1 + " != " + l1v);
+            error = true;
+        }
+        if (l2 != l2v) {
+            System.out.println(l2 + " != " + l2v);
+            error = true;
+        }
+        if (d1 != d1v) {
+            System.out.println(d1 + " != " + d1v);
+            error = true;
+        }
+        if (d2 != d2v) {
+            System.out.println(d2 + " != " + d2v);
+            error = true;
+        }
+        if (error) {
+            throw new InternalError();
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6792161/Test6792161.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6792161/Test6792161.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6792161
+ * @summary assert("No dead instructions after post-alloc")
+ *
+ * @run main/othervm -Xcomp -XX:MaxInlineSize=120 Test6792161
+ */
+
+import java.lang.reflect.Constructor;
+public class Test6792161 {
+    static Constructor test(Class cls) throws Exception {
+        Class[] args= { String.class };
+        try {
+            return cls.getConstructor(args);
+        } catch (NoSuchMethodException e) {}
+        return cls.getConstructor(new Class[0]);
+    }
+    public static void main(final String[] args) throws Exception {
+        try {
+            for (int i = 0; i < 100000; i++) {
+                Constructor ctor = test(Class.forName("Test6792161"));
+            }
+        } catch (NoSuchMethodException e) {}
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6795465/Test6795465.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6795465/Test6795465.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6795465
+ * @summary Crash in assembler_sparc.cpp with client compiler on solaris-sparc
+ *
+ * @run main Test6795465
+ */
+
+public class Test6795465 {
+    static long var_1 = -1;
+
+    void test() {
+        long var_2 = var_1 * 1;
+        var_2 = var_2 + (new byte[1])[0];
+    }
+
+    public static void main(String[] args) {
+        Test6795465 t = new Test6795465();
+        for (int i = 0; i < 200000; i++) {
+            t.test();
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6823453/Test.java
--- a/test/compiler/6823453/Test.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/test/compiler/6823453/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 6823453
  * @summary DeoptimizeALot causes fastdebug server jvm to fail with assert(false,"unscheduable graph")
- * @run main/othervm -Xcomp -XX:CompileOnly=Test -XX:+DeoptimizeALot Test
+ * @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:CompileOnly=Test -XX:+DeoptimizeALot Test
  */
 
 public class Test {
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6833129/Test.java
--- a/test/compiler/6833129/Test.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/test/compiler/6833129/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 6833129
  * @summary Object.clone() and Arrays.copyOf ignore coping with -XX:+DeoptimizeALot
- * @run main/othervm -Xbatch -XX:+DeoptimizeALot Test
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+DeoptimizeALot Test
  */
 
 public class Test{
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6852078/Test6852078.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6852078/Test6852078.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6852078
+ * @summary Disable SuperWord optimization for unsafe read/write
+ *
+ * @run main/othervm Test6852078
+ */
+
+import java.util.*;
+import java.nio.ByteBuffer;
+import com.sun.corba.se.impl.encoding.ByteBufferWithInfo;
+import com.sun.jndi.toolkit.corba.CorbaUtils;
+
+public class Test6852078 {
+
+    public Test6852078(String [] args) {
+
+        int capacity = 128;
+        ByteBuffer bb = ByteBuffer.allocateDirect(capacity);
+        ByteBufferWithInfo bbwi = new ByteBufferWithInfo( CorbaUtils.getOrb(null, -1, new Hashtable()), bb);
+        byte[] tmpBuf;
+        tmpBuf = new byte[bbwi.buflen];
+
+        for (int i = 0; i < capacity; i++)
+            tmpBuf[i] = bbwi.byteBuffer.get(i);
+    }
+
+    public static void main(String [] args) {
+        for (int i=0; i<2000; i++) {
+            Test6852078 t = new Test6852078(args);
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6855215/Test6855215.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6855215/Test6855215.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6855215
+ * @summary Calculation error (NaN) after about 1500 calculations
+ *
+ * @run main/othervm -Xbatch -XX:UseSSE=0 Test6855215
+ */
+
+public class Test6855215 {
+    private double m;
+    private double b;
+
+    public static double log10(double x) {
+        return Math.log(x) / Math.log(10);
+    }
+
+    void calcMapping(double xmin, double xmax, double ymin, double ymax) {
+        m = (ymax - ymin) / (log10(xmax) - log10(xmin));
+        b = (log10(xmin) * ymax - log10(xmax) * ymin);
+    }
+
+    public static void main(String[] args) {
+        Test6855215 c = new Test6855215();
+        for (int i = 0; i < 30000; i++) {
+            c.calcMapping(91, 121, 177, 34);
+            if (c.m != c.m) {
+                throw new InternalError();
+            }
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6865031/Test.java
--- a/test/compiler/6865031/Test.java	Thu Mar 25 16:27:12 2010 -0700
+++ b/test/compiler/6865031/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 6865031
  * @summary Application gives bad result (throws bad exception) with compressed oops
- * @run main/othervm -XX:+UseCompressedOops -XX:HeapBaseMinAddress=32g -XX:-LoopUnswitching -XX:CompileCommand=inline,AbstractMemoryEfficientList.equals Test hello goodbye
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:HeapBaseMinAddress=32g -XX:-LoopUnswitching -XX:CompileCommand=inline,AbstractMemoryEfficientList.equals Test hello goodbye
  */
 
 import java.lang.ref.ReferenceQueue;
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6866651/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6866651/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 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.
+ */
+
+/**
+ * @test
+ * @bug 6866651
+ * @summary delay dead node elimination in set_req_X to prevent killing the current node when it is in use
+ *
+ * @run main Test
+ */
+
+public class Test {
+
+    static int sum() {
+        int s = 0;
+        for (int x = 1, y = 0; x != 0; x++, y--) {
+            s ^= y;
+        }
+        return s;
+    }
+
+    public static void main(final String[] args) {
+        for (int k = 0; k < 2; k++) {
+            System.err.println(String.valueOf(sum()));
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6875866/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6875866/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009 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.
+ */
+
+/**
+ * @test
+ * @bug 6875866
+ * @summary Intrinsic for String.indexOf() is broken on x86 with SSE4.2
+ *
+ * @run main/othervm -Xcomp Test
+ */
+
+public class Test {
+
+  static int IndexOfTest(String str) {
+    return str.indexOf("11111xx1x");
+  }
+
+  public static void main(String args[]) {
+    String str = "11111xx11111xx1x";
+    int idx = IndexOfTest(str);
+    System.out.println("IndexOf = " + idx);
+    if (idx != 7) {
+      System.exit(97);
+    }
+  }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6877254/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6877254/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009 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.
+ */
+
+/**
+ * @test
+ * @bug 6877254
+ * @summary Implement StoreCMNode::Ideal to promote its OopStore above the MergeMem
+ *
+ * @run main/othervm -Xcomp Test
+ */
+
+public class Test {
+    static byte var_1;
+    static String var_2 = "";
+    static byte var_3;
+    static float var_4 = 0;
+
+    public static void main(String[] args) {
+        int i = 0;
+
+        for (String var_tmp = var_2; i < 11; var_1 = 0, i++) {
+            var_2 = var_2;
+            var_4 *= (var_4 *= (var_3 = 0));
+        }
+
+        System.out.println("var_1 = " + var_1);
+        System.out.println("var_2 = " + var_2);
+        System.out.println("var_3 = " + var_3);
+        System.out.println("var_4 = " + var_4);
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6879902/Test6879902.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6879902/Test6879902.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 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.
+ */
+
+/**
+ * @test
+ * @bug 6879902
+ * @summary CTW failure jdk6_18/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp:845
+ *
+ * @run main Test6879902
+ */
+
+import java.util.Arrays;
+
+public class Test6879902 {
+    public static void main(String[] args) {
+        Object[] oa = new Object[250];
+        for (int i = 0; i < 250; i++) {
+            oa[i] = Integer.valueOf(i);
+        }
+        Object[] oa2 = createArray(oa[0], oa[1], oa[2], oa[3], oa[4], oa[5], oa[6], oa[7], oa[8], oa[9], oa[10], oa[11], oa[12], oa[13], oa[14], oa[15], oa[16], oa[17], oa[18], oa[19], oa[20], oa[21], oa[22], oa[23], oa[24], oa[25], oa[26], oa[27], oa[28], oa[29], oa[30], oa[31], oa[32], oa[33], oa[34], oa[35], oa[36], oa[37], oa[38], oa[39], oa[40], oa[41], oa[42], oa[43], oa[44], oa[45], oa[46], oa[47], oa[48], oa[49], oa[50], oa[51], oa[52], oa[53], oa[54], oa[55], oa[56], oa[57], oa[58], oa[59], oa[60], oa[61], oa[62], oa[63], oa[64], oa[65], oa[66], oa[67], oa[68], oa[69], oa[70], oa[71], oa[72], oa[73], oa[74], oa[75], oa[76], oa[77], oa[78], oa[79], oa[80], oa[81], oa[82], oa[83], oa[84], oa[85], oa[86], oa[87], oa[88], oa[89], oa[90], oa[91], oa[92], oa[93], oa[94], oa[95], oa[96], oa[97], oa[98], oa[99], oa[100], oa[101], oa[102], oa[103], oa[104], oa[105], oa[106], oa[107], oa[108], oa[109], oa[110], oa[111], oa[112], oa[113], oa[114], oa[115], oa[116], oa[117], oa[118], oa[119], oa[120], oa[121], oa[122], oa[123], oa[124], oa[125], oa[126], oa[127], oa[128], oa[129], oa[130], oa[131], oa[132], oa[133], oa[134], oa[135], oa[136], oa[137], oa[138], oa[139], oa[140], oa[141], oa[142], oa[143], oa[144], oa[145], oa[146], oa[147], oa[148], oa[149], oa[150], oa[151], oa[152], oa[153], oa[154], oa[155], oa[156], oa[157], oa[158], oa[159], oa[160], oa[161], oa[162], oa[163], oa[164], oa[165], oa[166], oa[167], oa[168], oa[169], oa[170], oa[171], oa[172], oa[173], oa[174], oa[175], oa[176], oa[177], oa[178], oa[179], oa[180], oa[181], oa[182], oa[183], oa[184], oa[185], oa[186], oa[187], oa[188], oa[189], oa[190], oa[191], oa[192], oa[193], oa[194], oa[195], oa[196], oa[197], oa[198], oa[199], oa[200], oa[201], oa[202], oa[203], oa[204], oa[205], oa[206], oa[207], oa[208], oa[209], oa[210], oa[211], oa[212], oa[213], oa[214], oa[215], oa[216], oa[217], oa[218], oa[219], oa[220], oa[221], oa[222], oa[223], oa[224], oa[225], oa[226], oa[227], oa[228], oa[229], oa[230], oa[231], oa[232], oa[233], oa[234], oa[235], oa[236], oa[237], oa[238], oa[239], oa[240], oa[241], oa[242], oa[243], oa[244], oa[245], oa[246], oa[247], oa[248], oa[249]);
+        if (!Arrays.equals(oa, oa2))
+            throw new InternalError("arrays not equal");
+    }
+
+    public static Object[] createArray(Object arg0, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14, Object arg15, Object arg16, Object arg17, Object arg18, Object arg19, Object arg20, Object arg21, Object arg22, Object arg23, Object arg24, Object arg25, Object arg26, Object arg27, Object arg28, Object arg29, Object arg30, Object arg31, Object arg32, Object arg33, Object arg34, Object arg35, Object arg36, Object arg37, Object arg38, Object arg39, Object arg40, Object arg41, Object arg42, Object arg43, Object arg44, Object arg45, Object arg46, Object arg47, Object arg48, Object arg49, Object arg50, Object arg51, Object arg52, Object arg53, Object arg54, Object arg55, Object arg56, Object arg57, Object arg58, Object arg59, Object arg60, Object arg61, Object arg62, Object arg63, Object arg64, Object arg65, Object arg66, Object arg67, Object arg68, Object arg69, Object arg70, Object arg71, Object arg72, Object arg73, Object arg74, Object arg75, Object arg76, Object arg77, Object arg78, Object arg79, Object arg80, Object arg81, Object arg82, Object arg83, Object arg84, Object arg85, Object arg86, Object arg87, Object arg88, Object arg89, Object arg90, Object arg91, Object arg92, Object arg93, Object arg94, Object arg95, Object arg96, Object arg97, Object arg98, Object arg99, Object arg100, Object arg101, Object arg102, Object arg103, Object arg104, Object arg105, Object arg106, Object arg107, Object arg108, Object arg109, Object arg110, Object arg111, Object arg112, Object arg113, Object arg114, Object arg115, Object arg116, Object arg117, Object arg118, Object arg119, Object arg120, Object arg121, Object arg122, Object arg123, Object arg124, Object arg125, Object arg126, Object arg127, Object arg128, Object arg129, Object arg130, Object arg131, Object arg132, Object arg133, Object arg134, Object arg135, Object arg136, Object arg137, Object arg138, Object arg139, Object arg140, Object arg141, Object arg142, Object arg143, Object arg144, Object arg145, Object arg146, Object arg147, Object arg148, Object arg149, Object arg150, Object arg151, Object arg152, Object arg153, Object arg154, Object arg155, Object arg156, Object arg157, Object arg158, Object arg159, Object arg160, Object arg161, Object arg162, Object arg163, Object arg164, Object arg165, Object arg166, Object arg167, Object arg168, Object arg169, Object arg170, Object arg171, Object arg172, Object arg173, Object arg174, Object arg175, Object arg176, Object arg177, Object arg178, Object arg179, Object arg180, Object arg181, Object arg182, Object arg183, Object arg184, Object arg185, Object arg186, Object arg187, Object arg188, Object arg189, Object arg190, Object arg191, Object arg192, Object arg193, Object arg194, Object arg195, Object arg196, Object arg197, Object arg198, Object arg199, Object arg200, Object arg201, Object arg202, Object arg203, Object arg204, Object arg205, Object arg206, Object arg207, Object arg208, Object arg209, Object arg210, Object arg211, Object arg212, Object arg213, Object arg214, Object arg215, Object arg216, Object arg217, Object arg218, Object arg219, Object arg220, Object arg221, Object arg222, Object arg223, Object arg224, Object arg225, Object arg226, Object arg227, Object arg228, Object arg229, Object arg230, Object arg231, Object arg232, Object arg233, Object arg234, Object arg235, Object arg236, Object arg237, Object arg238, Object arg239, Object arg240, Object arg241, Object arg242, Object arg243, Object arg244, Object arg245, Object arg246, Object arg247, Object arg248, Object arg249) {
+        return new Object[]{
+            arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20, arg21, arg22, arg23, arg24, arg25, arg26, arg27, arg28, arg29, arg30, arg31, arg32, arg33, arg34, arg35, arg36, arg37, arg38, arg39, arg40, arg41, arg42, arg43, arg44, arg45, arg46, arg47, arg48, arg49, arg50, arg51, arg52, arg53, arg54, arg55, arg56, arg57, arg58, arg59, arg60, arg61, arg62, arg63, arg64, arg65, arg66, arg67, arg68, arg69, arg70, arg71, arg72, arg73, arg74, arg75, arg76, arg77, arg78, arg79, arg80, arg81, arg82, arg83, arg84, arg85, arg86, arg87, arg88, arg89, arg90, arg91, arg92, arg93, arg94, arg95, arg96, arg97, arg98, arg99, arg100, arg101, arg102, arg103, arg104, arg105, arg106, arg107, arg108, arg109, arg110, arg111, arg112, arg113, arg114, arg115, arg116, arg117, arg118, arg119, arg120, arg121, arg122, arg123, arg124, arg125, arg126, arg127, arg128, arg129, arg130, arg131, arg132, arg133, arg134, arg135, arg136, arg137, arg138, arg139, arg140, arg141, arg142, arg143, arg144, arg145, arg146, arg147, arg148, arg149, arg150, arg151, arg152, arg153, arg154, arg155, arg156, arg157, arg158, arg159, arg160, arg161, arg162, arg163, arg164, arg165, arg166, arg167, arg168, arg169, arg170, arg171, arg172, arg173, arg174, arg175, arg176, arg177, arg178, arg179, arg180, arg181, arg182, arg183, arg184, arg185, arg186, arg187, arg188, arg189, arg190, arg191, arg192, arg193, arg194, arg195, arg196, arg197, arg198, arg199, arg200, arg201, arg202, arg203, arg204, arg205, arg206, arg207, arg208, arg209, arg210, arg211, arg212, arg213, arg214, arg215, arg216, arg217, arg218, arg219, arg220, arg221, arg222, arg223, arg224, arg225, arg226, arg227, arg228, arg229, arg230, arg231, arg232, arg233, arg234, arg235, arg236, arg237, arg238, arg239, arg240, arg241, arg242, arg243, arg244, arg245, arg246, arg247, arg248, arg249};
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6880034/Test6880034.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6880034/Test6880034.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2009 SAP AG.  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.
+ */
+
+/**
+ * @test
+ * @bug 6880034
+ * @summary SIGBUS during deoptimisation at a safepoint on 64bit-SPARC
+ *
+ * @run main/othervm -Xcomp -Xbatch -XX:CompileCommand=compileonly,Test6880034,deopt_compiledframe_at_safepoint -XX:+PrintCompilation Test6880034
+ */
+
+
+
+// This test provokes a deoptimisation at a safepoint.
+//
+// It achieves this by compiling the method 'deopt_compiledframe_at_safepoint'
+// before its first usage at a point in time when a call to the virtual method
+// A::doSomething() from within 'deopt_compiledframe_at_safepoint' can be
+// optimised to a static call because class A has no descendants.
+//
+// Later, when deopt_compiledframe_at_safepoint() is running, class B which
+// extends A and overrides the virtual method "doSomething()", is loaded
+// asynchronously in another thread.  This makes the compiled code of
+// 'deopt_compiledframe_at_safepoint' invalid and triggers a deoptimisation of
+// the frame where 'deopt_compiledframe_at_safepoint' is running in a
+// loop.
+//
+// The deoptimisation leads to a SIGBUS on 64-bit server VMs on SPARC and to
+// an incorrect result on 32-bit server VMs on SPARC due to a regression
+// introduced by the change: "6420645: Create a vm that uses compressed oops
+// for up to 32gb heapsizes"
+// (http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/ba764ed4b6f2).  Further
+// investigation showed that change 6420645 is not really the root cause of
+// this error but only reveals a problem with the float register encodings in
+// sparc.ad which was hidden until now.
+//
+// Notice that for this test to fail in jtreg it is crucial that
+// deopt_compiledframe_at_safepoint() runs in the main thread. Otherwise a
+// crash in deopt_compiledframe_at_safepoint() will not be detected as a test
+// failure by jtreg.
+//
+// Author: Volker H. Simonis
+
+class A {
+  public int doSomething() {
+    return 0;
+  }
+}
+
+class B extends A {
+  public B() {}
+  // override 'A::doSomething()'
+  public int doSomething() {
+    return 1;
+  }
+}
+
+class G {
+  public static volatile A a = new A();
+
+  // Change 'a' to point to a 'B' object
+  public static void setAtoB() {
+    try {
+      a =  (A) ClassLoader.
+        getSystemClassLoader().
+        loadClass("B").
+        getConstructor(new Class[] {}).
+        newInstance(new Object[] {});
+    }
+    catch (Exception e) {
+      System.out.println(e);
+    }
+  }
+}
+
+public class Test6880034 {
+
+  public static volatile boolean is_in_loop = false;
+  public static volatile boolean stop_while_loop = false;
+
+  public static double deopt_compiledframe_at_safepoint() {
+    // This will be an optimised static call to A::doSomething() until we load "B"
+    int i = G.a.doSomething();
+
+    // Need more than 16 'double' locals in this frame
+    double local1 = 1;
+    double local2 = 2;
+    double local3 = 3;
+    double local4 = 4;
+    double local5 = 5;
+    double local6 = 6;
+    double local7 = 7;
+    double local8 = 8;
+
+    long k = 0;
+    // Once we load "B", this method will be made 'not entrant' and deoptimised
+    // at the safepoint which is at the end of this loop.
+    while (!stop_while_loop) {
+      if (k ==  1) local1 += i;
+      if (k ==  2) local2 += i;
+      if (k ==  3) local3 += i;
+      if (k ==  4) local4 += i;
+      if (k ==  5) local5 += i;
+      if (k ==  6) local6 += i;
+      if (k ==  7) local7 += i;
+      if (k ==  8) local8 += i;
+
+      // Tell the world that we're now running wild in the loop
+      if (k++ == 20000) is_in_loop = true;
+    }
+
+    return
+      local1 + local2 + local3 + local4 +
+      local5 + local6 + local7 + local8 + i;
+  }
+
+  public static void main(String[] args) {
+
+    // Just to resolve G before we compile deopt_compiledframe_at_safepoint()
+    G g = new G();
+
+    // Asynchronous thread which will eventually invalidate the code for
+    // deopt_compiledframe_at_safepoint() and therefore triggering a
+    // deoptimisation of that method.
+    new Thread() {
+      public void run() {
+        while (!is_in_loop) {
+          // Wait until the loop is running
+        }
+        // Load class 'B' asynchronously..
+        G.setAtoB();
+        // ..and stop the loop
+        stop_while_loop = true;
+      }
+    }.start();
+
+    // Run the loop in deopt_compiledframe_at_safepoint()
+    double retVal = deopt_compiledframe_at_safepoint();
+
+    System.out.println(retVal == 36 ? "OK" : "ERROR : " + retVal);
+    if (retVal != 36) throw new RuntimeException();
+  }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6885584/Test6885584.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6885584/Test6885584.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6885584
+ * @summary A particular class structure causes large allocation spike for jit
+ *
+ * @run main/othervm -Xbatch Test6885584
+ */
+
+
+
+public class Test6885584 {
+   static private int i1;
+   static private int i2;
+   static private int i3;
+
+    static int limit = Integer.MAX_VALUE - 8;
+
+   public static void main(String args[]) {
+       // Run long enough to trigger an OSR
+       for(int j = 200000; j != 0; j--) {
+       }
+
+       // This must reference a field
+       i1 = i2;
+
+       // The resource leak is roughly proportional to this initial value
+       for(int k = Integer.MAX_VALUE - 1; k != 0; k--) {
+           // Make sure the body does some work
+           if(i2 > i3)i1 = k;
+           if (k <= limit) break;
+       }
+   }
+
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6891750/Test6891750.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6891750/Test6891750.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6891750
+ * @summary deopt blob kills values in O5
+ *
+ * @run main Test6891750
+ */
+
+abstract class Base6891750 extends Thread {
+    abstract public long m();
+}
+class Other6891750 extends Base6891750 {
+    public long m() {
+        return 0;
+    }
+}
+
+public class Test6891750 extends Base6891750 {
+    Base6891750 d;
+    volatile long  value = 9;
+
+    static int limit = 400000;
+
+    Test6891750() {
+        d = this;
+
+    }
+    public long m() {
+        return value;
+    }
+
+    public long test(boolean doit) {
+        if (doit) {
+            long total0 = 0;
+            long total1 = 0;
+            long total2 = 0;
+            long total3 = 0;
+            long total4 = 0;
+            long total5 = 0;
+            long total6 = 0;
+            long total7 = 0;
+            long total8 = 0;
+            long total9 = 0;
+            for (int i = 0; i < limit; i++) {
+                total0 += d.m();
+                total1 += d.m();
+                total2 += d.m();
+                total3 += d.m();
+                total4 += d.m();
+                total5 += d.m();
+                total6 += d.m();
+                total7 += d.m();
+                total8 += d.m();
+                total9 += d.m();
+            }
+            return total0 + total1 + total2 + total3 + total4 + total5 + total6 + total7 + total8 + total9;
+        }
+        return 0;
+    }
+
+    public void run() {
+        long result = test(true);
+        for (int i = 0; i < 300; i++) {
+            long result2 = test(true);
+            if (result != result2) {
+                throw new InternalError(result + " != " + result2);
+            }
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        Test6891750 Test6891750 = new Test6891750();
+        // warm it up
+        for (int i = 0; i < 200000; i++) {
+            Test6891750.test(false);
+        }
+        // set in off running
+        Test6891750.start();
+        Thread.sleep(2000);
+
+        // Load a class to invalidate CHA
+        new Other6891750();
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6895383/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6895383/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6895383
+ * @summary JCK test throws NPE for method compiled with Escape Analysis
+ *
+ * @run main/othervm -Xcomp Test
+ */
+
+import java.util.*;
+import java.util.concurrent.*;
+
+public class Test {
+    public static void main(String argv[]) {
+        Test test = new Test();
+        test.testRemove1_IndexOutOfBounds();
+        test.testAddAll1_IndexOutOfBoundsException();
+    }
+
+    public void testRemove1_IndexOutOfBounds() {
+        CopyOnWriteArrayList c = new CopyOnWriteArrayList();
+    }
+
+    public void testAddAll1_IndexOutOfBoundsException() {
+        try {
+            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
+            c.addAll(-1, new LinkedList()); // should throw IndexOutOfBoundsException
+        } catch (IndexOutOfBoundsException e) {
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6896727/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6896727/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 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.
+ *
+ */
+
+/*
+ * @test
+ * @bug 6896727
+ * @summary nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys w/o COOPs
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:+DoEscapeAnalysis Test
+ */
+
+public class Test {
+
+    final static String testString = "abracadabra";
+    public static void main(String args[]) {
+        String params[][] = {
+            {"control", testString}
+        };
+        for (int i=0; i<params.length; i++) {
+            try {
+                System.out.println("Params :" + testString + " and " + params[i][0] + ", " + params[i][1]);
+                if (params[i][1] == null) {
+                    System.exit(97);
+                }
+            } catch (Exception e) {}
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6901572/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6901572/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009 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.
+ */
+
+/**
+ * @test
+ * @bug 6901572
+ * @summary JVM 1.6.16 crash on loops: assert(has_node(i),"")
+ *
+ * @run main/othervm Test
+ */
+
+
+public class Test {
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 2; i++)
+            NestedLoop();
+    }
+
+    public static long NestedLoop() {
+        final int n = 50;
+        long startTime = System.currentTimeMillis();
+        int x = 0;
+        for(int a = 0; a < n; a++)
+            for(int b = 0; b < n; b++)
+                for(int c = 0; c < n; c++)
+                    for(int d = 0; d < n; d++)
+                        for(int e = 0; e < n; e++)
+                            for(int f = 0; f < n; f++)
+                                x++;
+        long stopTime = System.currentTimeMillis();
+
+        return stopTime - startTime;
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6909839/Test6909839.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6909839/Test6909839.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2010 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6909839
+ * @summary missing unsigned compare cases for some cmoves in sparc.ad
+ *
+ * @run main/othervm -XX:+AggressiveOpts -Xbatch Test6909839
+ */
+
+public class Test6909839 {
+    public static void main(String[] args) {
+        testi();
+        testi();
+        testi();
+        testui();
+        testui();
+        testui();
+        testdi();
+        testdi();
+        testdi();
+        testfi();
+        testfi();
+        testfi();
+
+        testl();
+        testl();
+        testl();
+        testul();
+        testul();
+        testul();
+        testdl();
+        testdl();
+        testdl();
+        testfl();
+        testfl();
+        testfl();
+
+        testf();
+        testf();
+        testf();
+        testuf();
+        testuf();
+        testuf();
+        testdf();
+        testdf();
+        testdf();
+        testff();
+        testff();
+        testff();
+
+        testd();
+        testd();
+        testd();
+        testud();
+        testud();
+        testud();
+        testdd();
+        testdd();
+        testdd();
+        testfd();
+        testfd();
+        testfd();
+
+        testp();
+        testp();
+        testp();
+        testup();
+        testup();
+        testup();
+        testdp();
+        testdp();
+        testdp();
+        testfp();
+        testfp();
+        testfp();
+    }
+
+    static void testui() {
+        int total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += ((v >= 1 && v < 3) ? 1 : 2);
+        }
+        System.out.println(total);
+    }
+
+    static void testdi() {
+        int total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += (v > 1.0) ? 1 : 2;
+        }
+        System.out.println(total);
+    }
+
+    static void testfi() {
+        int total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += (v > 1.0f) ? 1 : 2;
+        }
+        System.out.println(total);
+    }
+
+    static void testi() {
+        int total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            total += (i % 4 != 0) ? 1 : 2;
+        }
+        System.out.println(total);
+    }
+
+    static void testul() {
+        long total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += ((v >= 1 && v < 3) ? 1L : 2L);
+        }
+        System.out.println(total);
+    }
+
+    static void testdl() {
+        long total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += (v > 1.0) ? 1L : 2L;
+        }
+        System.out.println(total);
+    }
+
+    static void testfl() {
+        long total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += (v > 1.0f) ? 1L : 2L;
+        }
+        System.out.println(total);
+    }
+
+    static void testl() {
+        long total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            total += (i % 4 != 0) ? 1L : 2L;
+        }
+        System.out.println(total);
+    }
+
+    static void testuf() {
+        float total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += ((v >= 1 && v < 3) ? 1.0f : 2.0f);
+        }
+        System.out.println(total);
+    }
+
+    static void testdf() {
+        float total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += (v > 0.0) ? 1.0f : 2.0f;
+        }
+        System.out.println(total);
+    }
+
+    static void testff() {
+        float total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += (v > 0.0f) ? 1.0f : 2.0f;
+        }
+        System.out.println(total);
+    }
+
+    static void testf() {
+        float total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            total += (i % 4 != 0) ? 1.0f : 2.0f;
+        }
+        System.out.println(total);
+    }
+
+    static void testud() {
+        double total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += ((v >= 1 && v < 3) ? 1.0d : 2.0d);
+        }
+        System.out.println(total);
+    }
+
+    static void testdd() {
+        double total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += (v > 1.0) ? 1.0d : 2.0d;
+        }
+        System.out.println(total);
+    }
+
+    static void testfd() {
+        double total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += (v > 1.0f) ? 1.0d : 2.0d;
+        }
+        System.out.println(total);
+    }
+
+    static void testd() {
+        double total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            total += (i % 4 != 0) ? 1.0d : 2.0d;
+        }
+        System.out.println(total);
+    }
+
+    static void testp() {
+        Object a = new Object();
+        Object b = new Object();;
+        int total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            total += ((i % 4 != 0) ? a : b).hashCode();
+        }
+        System.out.println(total);
+    }
+
+    static void testup() {
+        Object a = new Object();
+        Object b = new Object();;
+        int total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += ((v >= 1 && v < 3) ? a : b).hashCode();
+        }
+        System.out.println(total);
+    }
+
+    static void testdp() {
+        Object a = new Object();
+        Object b = new Object();;
+        int total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += ((v > 1.0) ? a : b).hashCode();
+        }
+        System.out.println(total);
+    }
+    static void testfp() {
+        Object a = new Object();
+        Object b = new Object();;
+        int total = 0;
+        for (int i = 0 ; i < 10000; i++) {
+            int v = i % 4;
+            total += ((v > 1.0f) ? a : b).hashCode();
+        }
+        System.out.println(total);
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6910484/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6910484/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2009 SAP.  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.
+ */
+
+/**
+ * @test
+ * @bug 6910484
+ * @summary incorrect integer optimization (loosing and op-r in a given example)
+ *
+ * @run main/othervm -Xbatch Test
+ */
+
+public class Test {
+
+    public static void main(String[] args) {
+        long iteration = 0;
+        for(int i = 0; i <11000; i++) {
+            iteration++;
+            int result = test(255);
+            if (result != 112) {
+                System.out.println("expected 112, but got " + result + " after iteration " + iteration);
+                System.exit(97);
+            }
+        }
+    }
+
+    private static int test(int x) {
+        return (x & -32) / 2;
+    }
+
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6910605/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6910605/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6910605
+ * @summary C2: NullPointerException/ClassCaseException is thrown when C2 with DeoptimizeALot is used
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+DeoptimizeALot -Xbatch Test
+ *
+ * original test: nsk/coverage/runtime/runtime007
+ */
+
+import java.io.*;
+
+public class Test {
+        public static int buf=0;
+
+        public static void main( String argv[] ) {
+                System.exit(run(argv, System.out)+95);
+        }
+
+        public static int run(String argv[],PrintStream out) {
+                int ret=0, retx=0, bad=0;
+
+                for( int i=0; (i < 100000) && (bad < 10) ; i++ ) {
+                        retx = OptoRuntime_f2i_Type(out);
+                        ret += retx;
+                        if( retx !=0 ) {
+                                out.println("i="+i);
+                                bad++;
+                        }
+                }
+                return ret==0 ? 0 : 2 ;
+        }
+
+        public static int OptoRuntime_f2i_Type(PrintStream out) {
+                int c1=2, c2=3, c3=4, c4=5, c5=6;
+                int j=0, k=0;
+                try {
+                        int[][] iii=(int[][])(new int[c1][c2]);
+
+                        for( j=0; j<c1; j++ ) {
+                                for( k=0; k<c2; k++ ) {
+                                        iii[j][k]=(int)((float)(j+1)/(float)(k+1));
+                                }
+                        }
+                } catch (Throwable e) {
+                        out.println("Unexpected exception " + e);
+                        e.printStackTrace(out);
+                        out.println("j="+j+", k="+k);
+                        return 1;
+                }
+                return 0;
+        }
+
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6910618/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6910618/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2010 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6910605
+ * @summary C2: NullPointerException/ClassCaseException is thrown when C2 with DeoptimizeALot is used
+ *
+ * @run main/othervm -Xmx64m -XX:+IgnoreUnrecognizedVMOptions -XX:+DeoptimizeALot -XX:+DoEscapeAnalysis -Xbatch -XX:InlineSmallCode=2000 Test
+ *
+ */
+
+/*
+ * Added InlineSmallCode=2000 to guaranty inlining of StringBuilder::append() to allow scalar replace StringBuilder object.
+ *
+ * original test: gc/gctests/StringGC
+ */
+
+public class Test {
+        private final String toAdd = "0123456789abcdef";
+        private int maxLength;
+        private static final int numberOfThreads = 8;
+
+        private class StringAdder extends Thread {
+                private String s;
+
+                public void test() {
+                        s = s + toAdd;
+                }
+                public void run() {
+                        do {
+                                test();
+                        } while (s.length() < maxLength);
+                 }
+        }
+
+        public void test() throws InterruptedException {
+                maxLength = toAdd.length() * 15000/ numberOfThreads;
+                StringAdder[] sa = new StringAdder[numberOfThreads];
+                for (int i = 0; i < numberOfThreads; i++) {
+                        sa[i] = new StringAdder();
+                        sa[i].start();
+                }
+                for (int i = 0; i < numberOfThreads; i++) {
+                        sa[i].join();
+                }
+        }
+
+        public static void main(String[] args) throws InterruptedException {
+                Test t = new Test();
+                t.test();
+        }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6912517/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6912517/Test.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2009 D.E. Shaw.  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.
+ */
+
+/**
+ * @test
+ * @bug 6912517
+ * @summary JIT bug compiles out (and stops running) code that needs to be run.  Causes NPE.
+ *
+ * @run main/othervm -Xbatch -XX:CompileThreshold=100 -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops Test
+ */
+
+/**
+ * Highlights a bug with the JIT compiler.
+ * @author Matt Bruce m b r u c e __\at/__ g m a i l DOT c o m
+ */
+public class Test implements Runnable
+{
+    private final Thread myThread;
+    private Thread       myInitialThread;
+    private boolean      myShouldCheckThreads;
+
+    /**
+     * Sets up the running thread, and starts it.
+     */
+    public Test(int id)
+    {
+        myThread = new Thread(this);
+        myThread.setName("Runner: " + id);
+        myThread.start();
+        myShouldCheckThreads = false;
+    }
+
+    /**
+     * @param shouldCheckThreads the shouldCheckThreads to set
+     */
+    public void setShouldCheckThreads(boolean shouldCheckThreads)
+    {
+        myShouldCheckThreads = shouldCheckThreads;
+    }
+
+    /**
+     * Starts up the two threads with enough delay between them for JIT to
+     * kick in.
+     * @param args
+     * @throws InterruptedException
+     */
+    public static void main(String[] args) throws InterruptedException
+    {
+        // let this run for a bit, so the "run" below is JITTed.
+        for (int id = 0; id < 20; id++) {
+            System.out.println("Starting thread: " + id);
+            Test bug = new Test(id);
+            bug.setShouldCheckThreads(true);
+            Thread.sleep(2500);
+        }
+    }
+
+    /**
+     * @see java.lang.Runnable#run()
+     */
+    public void run()
+    {
+        long runNumber = 0;
+        while (true) {
+            // run hot for a little while, give JIT time to kick in to this loop.
+            // then run less hot.
+            if (runNumber > 15000) {
+                try {
+                    Thread.sleep(5);
+                }
+                catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+            runNumber++;
+            ensureProperCallingThread();
+        }
+    }
+
+    private void ensureProperCallingThread()
+    {
+        // this should never be null.  but with the JIT bug, it will be.
+        // JIT BUG IS HERE ==>>>>>
+        if (myShouldCheckThreads) {
+            if (myInitialThread == null) {
+                myInitialThread = Thread.currentThread();
+            }
+            else if (myInitialThread != Thread.currentThread()) {
+                System.out.println("Not working: " + myInitialThread.getName());
+            }
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6916644/Test6916644.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6916644/Test6916644.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6916644
+ * @summary C2 compiler crash on x86
+ *
+ * @run main/othervm -Xcomp -XX:CompileOnly=Test6916644.test Test6916644
+ */
+
+public class Test6916644 {
+    static int result;
+    static int i1;
+    static int i2;
+
+    static public void test(double d) {
+        result = (d <= 0.0D) ? i1 : i2;
+    }
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 100000; i++) {
+            // use an alternating value so the test doesn't always go
+            // the same direction.  Otherwise we won't transform it
+            // into a cmove.
+            test(i & 1);
+        }
+    }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/compiler/6921969/TestMultiplyLongHiZero.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6921969/TestMultiplyLongHiZero.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2010 Google, 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.
+ *
+ */
+
+/*
+ * @test
+ * @bug 6921969
+ * @summary Tests shorter long multiply sequences when the high 32 bits of long operands are known to be zero on x86_32
+ * @run main/othervm -Xbatch -XX:-Inline -XX:CompileOnly=.testNormal,.testLeftOptimized,.testRightOptimized,.testOptimized,.testLeftOptimized_LoadUI2L,.testRightOptimized_LoadUI2L,.testOptimized_LoadUI2L TestMultiplyLongHiZero
+ */
+
+// This test must run without any command line arguments.
+
+public class TestMultiplyLongHiZero {
+
+  private static void check(long leftFactor, long rightFactor, long optimizedProduct, long constantProduct) {
+    long normalProduct = leftFactor * rightFactor; // unaffected by the new optimization
+    if (optimizedProduct != constantProduct || normalProduct != constantProduct) {
+      throw new RuntimeException("Not all three products are equal: " +
+                                 Long.toHexString(normalProduct) + ", " +
+                                 Long.toHexString(optimizedProduct) + ", " +
+                                 Long.toHexString(constantProduct));
+    }
+  }
+
+  private static int initInt(String[] args, int v) {
+    if (args.length > 0) {
+      try {
+        return Integer.valueOf(args[0]);
+      } catch (NumberFormatException e) { }
+    }
+    return v;
+  }
+
+  private static final long mask32 = 0x00000000FFFFFFFFL;
+
+  private static void testNormal(int leftFactor, int rightFactor, long constantProduct) {
+    check((long) leftFactor,
+          (long) rightFactor,
+          (long) leftFactor * (long) rightFactor, // unaffected by the new optimization
+          constantProduct);
+  }
+
+  private static void testLeftOptimized(int leftFactor, int rightFactor, long constantProduct) {
+    check((leftFactor & mask32),
+          (long) rightFactor,
+          (leftFactor & mask32) * (long) rightFactor, // left factor optimized
+          constantProduct);
+  }
+
+  private static void testRightOptimized(int leftFactor, int rightFactor, long constantProduct) {
+    check((long) leftFactor,
+          (rightFactor & mask32),
+          (long) leftFactor * (rightFactor & mask32), // right factor optimized
+          constantProduct);
+  }
+
+  private static void testOptimized(int leftFactor, int rightFactor, long constantProduct) {
+    check((leftFactor & mask32),
+          (rightFactor & mask32),
+          (leftFactor & mask32) * (rightFactor & mask32), // both factors optimized
+          constantProduct);
+  }
+
+  private static void testLeftOptimized_LoadUI2L(int leftFactor, int rightFactor, long constantProduct, int[] factors) {
+    check((leftFactor & mask32),
+          (long) rightFactor,
+          (factors[0] & mask32) * (long) rightFactor, // left factor optimized
+          constantProduct);
+  }
+
+  private static void testRightOptimized_LoadUI2L(int leftFactor, int rightFactor, long constantProduct, int[] factors) {
+    check((long) leftFactor,
+          (rightFactor & mask32),
+          (long) leftFactor * (factors[1] & mask32), // right factor optimized
+          constantProduct);
+  }
+
+  private static void testOptimized_LoadUI2L(int leftFactor, int rightFactor, long constantProduct, int[] factors) {
+    check((leftFactor & mask32),
+          (rightFactor & mask32),
+          (factors[0] & mask32) * (factors[1] & mask32), // both factors optimized
+          constantProduct);
+  }
+
+  private static void test(int leftFactor, int rightFactor,
+                           long normalConstantProduct,
+                           long leftOptimizedConstantProduct,
+                           long rightOptimizedConstantProduct,
+                           long optimizedConstantProduct) {
+    int[] factors = new int[2];
+    factors[0] = leftFactor;
+    factors[1] = rightFactor;
+    testNormal(leftFactor, rightFactor, normalConstantProduct);
+    testLeftOptimized(leftFactor, rightFactor, leftOptimizedConstantProduct);
+    testRightOptimized(leftFactor, rightFactor, rightOptimizedConstantProduct);
+    testOptimized(leftFactor, rightFactor, optimizedConstantProduct);
+    testLeftOptimized_LoadUI2L(leftFactor, rightFactor, leftOptimizedConstantProduct, factors);
+    testRightOptimized_LoadUI2L(leftFactor, rightFactor, rightOptimizedConstantProduct, factors);
+    testOptimized_LoadUI2L(leftFactor, rightFactor, optimizedConstantProduct, factors);
+  }
+
+  public static void main(String[] args) {
+    for (int i = 0; i < 100000; ++i) { // Trigger compilation
+      int i0 = initInt(args, 1);
+      int i1 = initInt(args, 3);
+      int i2 = initInt(args, -1);
+      int i3 = initInt(args, 0x7FFFFFFF);
+      test(i0, i1, 3L, 3L, 3L, 3L);
+      test(i0, i2, -1L, -1L, 0xFFFFFFFFL, 0xFFFFFFFFL);
+      test(i0, i3, 0x7FFFFFFFL, 0x7FFFFFFFL, 0x7FFFFFFFL, 0x7FFFFFFFL);
+      test(i1, i2, -3L, -3L, 0x2FFFFFFFDL, 0x2FFFFFFFDL);
+      test(i1, i3, 0x17FFFFFFDL, 0x17FFFFFFDL, 0x17FFFFFFDL, 0x17FFFFFFDL);
+      test(i2, i3, 0xFFFFFFFF80000001L, 0x7FFFFFFE80000001L,
+           0xFFFFFFFF80000001L, 0x7FFFFFFE80000001L);
+    }
+  }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/gc/6845368/bigobj.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/gc/6845368/bigobj.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,65563 @@
+/*
+   @test
+   @bug 6845368
+   @summary ensure gc updates references > 64K bytes from the start of the obj
+   @author John Coomes
+   @run main/othervm/timeout=720 -Xmx64m bigobj
+*/
+
+// Allocate an object with a block of reference fields that starts more
+// than 64K bytes from the start of the object.  This is done with
+// inheritance because VMs typically rearrange the order fields appear in
+// memory, and group fields of the same type together within an object (i.e.,
+// in a single object, all reference fields could be put into a block near the
+// start of the object).
+//
+// A block of reference fields > 64K bytes from the start of the object would
+// cause HotSpot's OopMapBlock _offset field to overflow, so any references in
+// that block would not be updated properly after GC.
+//
+// After allocating the big object, set a reference field within the
+// block to a known object, provoke GC, then make sure the field was
+// updated properly.
+
+public class bigobj extends bigparent {
+    public static void main(String argv[]) {
+        bigobj c = new bigobj();
+        Object o = c.o = new Object();
+
+        // Provoke GC so o is moved (if this is a moving collector).
+        for (int i = 0; i < 64 * 1024 * 1024; i++) new Object();
+
+        if (o != c.o) {
+            System.out.println("failed:  o=" + o + " != c.o=" + c.o);
+            throw new RuntimeException("failed - c.o was not updated");
+        }
+    }
+
+    Object o;
+}
+
+class bigparent {
+    public long l00001;
+    public long l00002;
+    public long l00003;
+    public long l00004;
+    public long l00005;
+    public long l00006;
+    public long l00007;
+    public long l00008;
+    public long l00009;
+    public long l00010;
+    public long l00011;
+    public long l00012;
+    public long l00013;
+    public long l00014;
+    public long l00015;
+    public long l00016;
+    public long l00017;
+    public long l00018;
+    public long l00019;
+    public long l00020;
+    public long l00021;
+    public long l00022;
+    public long l00023;
+    public long l00024;
+    public long l00025;
+    public long l00026;
+    public long l00027;
+    public long l00028;
+    public long l00029;
+    public long l00030;
+    public long l00031;
+    public long l00032;
+    public long l00033;
+    public long l00034;
+    public long l00035;
+    public long l00036;
+    public long l00037;
+    public long l00038;
+    public long l00039;
+    public long l00040;
+    public long l00041;
+    public long l00042;
+    public long l00043;
+    public long l00044;
+    public long l00045;
+    public long l00046;
+    public long l00047;
+    public long l00048;
+    public long l00049;
+    public long l00050;
+    public long l00051;
+    public long l00052;
+    public long l00053;
+    public long l00054;
+    public long l00055;
+    public long l00056;
+    public long l00057;
+    public long l00058;
+    public long l00059;
+    public long l00060;
+    public long l00061;
+    public long l00062;
+    public long l00063;
+    public long l00064;
+    public long l00065;
+    public long l00066;
+    public long l00067;
+    public long l00068;
+    public long l00069;
+    public long l00070;
+    public long l00071;
+    public long l00072;
+    public long l00073;
+    public long l00074;
+    public long l00075;
+    public long l00076;
+    public long l00077;
+    public long l00078;
+    public long l00079;
+    public long l00080;
+    public long l00081;
+    public long l00082;
+    public long l00083;
+    public long l00084;
+    public long l00085;
+    public long l00086;
+    public long l00087;
+    public long l00088;
+    public long l00089;
+    public long l00090;
+    public long l00091;
+    public long l00092;
+    public long l00093;
+    public long l00094;
+    public long l00095;
+    public long l00096;
+    public long l00097;
+    public long l00098;
+    public long l00099;
+    public long l00100;
+    public long l00101;
+    public long l00102;
+    public long l00103;
+    public long l00104;
+    public long l00105;
+    public long l00106;
+    public long l00107;
+    public long l00108;
+    public long l00109;
+    public long l00110;
+    public long l00111;
+    public long l00112;
+    public long l00113;
+    public long l00114;
+    public long l00115;
+    public long l00116;
+    public long l00117;
+    public long l00118;
+    public long l00119;
+    public long l00120;
+    public long l00121;
+    public long l00122;
+    public long l00123;
+    public long l00124;
+    public long l00125;
+    public long l00126;
+    public long l00127;
+    public long l00128;
+    public long l00129;
+    public long l00130;
+    public long l00131;
+    public long l00132;
+    public long l00133;
+    public long l00134;
+    public long l00135;
+    public long l00136;
+    public long l00137;
+    public long l00138;
+    public long l00139;
+    public long l00140;
+    public long l00141;
+    public long l00142;
+    public long l00143;
+    public long l00144;
+    public long l00145;
+    public long l00146;
+    public long l00147;
+    public long l00148;
+    public long l00149;
+    public long l00150;
+    public long l00151;
+    public long l00152;
+    public long l00153;
+    public long l00154;
+    public long l00155;
+    public long l00156;
+    public long l00157;
+    public long l00158;
+    public long l00159;
+    public long l00160;
+    public long l00161;
+    public long l00162;
+    public long l00163;
+    public long l00164;
+    public long l00165;
+    public long l00166;
+    public long l00167;
+    public long l00168;
+    public long l00169;
+    public long l00170;
+    public long l00171;
+    public long l00172;
+    public long l00173;
+    public long l00174;
+    public long l00175;
+    public long l00176;
+    public long l00177;
+    public long l00178;
+    public long l00179;
+    public long l00180;
+    public long l00181;
+    public long l00182;
+    public long l00183;
+    public long l00184;
+    public long l00185;
+    public long l00186;
+    public long l00187;
+    public long l00188;
+    public long l00189;
+    public long l00190;
+    public long l00191;
+    public long l00192;
+    public long l00193;
+    public long l00194;
+    public long l00195;
+    public long l00196;
+    public long l00197;
+    public long l00198;
+    public long l00199;
+    public long l00200;
+    public long l00201;
+    public long l00202;
+    public long l00203;
+    public long l00204;
+    public long l00205;
+    public long l00206;
+    public long l00207;
+    public long l00208;
+    public long l00209;
+    public long l00210;
+    public long l00211;
+    public long l00212;
+    public long l00213;
+    public long l00214;
+    public long l00215;
+    public long l00216;
+    public long l00217;
+    public long l00218;
+    public long l00219;
+    public long l00220;
+    public long l00221;
+    public long l00222;
+    public long l00223;
+    public long l00224;
+    public long l00225;
+    public long l00226;
+    public long l00227;
+    public long l00228;
+    public long l00229;
+    public long l00230;
+    public long l00231;
+    public long l00232;
+    public long l00233;
+    public long l00234;
+    public long l00235;
+    public long l00236;
+    public long l00237;
+    public long l00238;
+    public long l00239;
+    public long l00240;
+    public long l00241;
+    public long l00242;
+    public long l00243;
+    public long l00244;
+    public long l00245;
+    public long l00246;
+    public long l00247;
+    public long l00248;
+    public long l00249;
+    public long l00250;
+    public long l00251;
+    public long l00252;
+    public long l00253;
+    public long l00254;
+    public long l00255;
+    public long l00256;
+    public long l00257;
+    public long l00258;
+    public long l00259;
+    public long l00260;
+    public long l00261;
+    public long l00262;
+    public long l00263;
+    public long l00264;
+    public long l00265;
+    public long l00266;
+    public long l00267;
+    public long l00268;
+    public long l00269;
+    public long l00270;
+    public long l00271;
+    public long l00272;
+    public long l00273;
+    public long l00274;
+    public long l00275;
+    public long l00276;
+    public long l00277;
+    public long l00278;
+    public long l00279;
+    public long l00280;
+    public long l00281;
+    public long l00282;
+    public long l00283;
+    public long l00284;
+    public long l00285;
+    public long l00286;
+    public long l00287;
+    public long l00288;
+    public long l00289;
+    public long l00290;
+    public long l00291;
+    public long l00292;
+    public long l00293;
+    public long l00294;
+    public long l00295;
+    public long l00296;
+    public long l00297;
+    public long l00298;
+    public long l00299;
+    public long l00300;
+    public long l00301;
+    public long l00302;
+    public long l00303;
+    public long l00304;
+    public long l00305;
+    public long l00306;
+    public long l00307;
+    public long l00308;
+    public long l00309;
+    public long l00310;
+    public long l00311;
+    public long l00312;
+    public long l00313;
+    public long l00314;
+    public long l00315;
+    public long l00316;
+    public long l00317;
+    public long l00318;
+    public long l00319;
+    public long l00320;
+    public long l00321;
+    public long l00322;
+    public long l00323;
+    public long l00324;
+    public long l00325;
+    public long l00326;
+    public long l00327;
+    public long l00328;
+    public long l00329;
+    public long l00330;
+    public long l00331;
+    public long l00332;
+    public long l00333;
+    public long l00334;
+    public long l00335;
+    public long l00336;
+    public long l00337;
+    public long l00338;
+    public long l00339;
+    public long l00340;
+    public long l00341;
+    public long l00342;
+    public long l00343;
+    public long l00344;
+    public long l00345;
+    public long l00346;
+    public long l00347;
+    public long l00348;
+    public long l00349;
+    public long l00350;
+    public long l00351;
+    public long l00352;
+    public long l00353;
+    public long l00354;
+    public long l00355;
+    public long l00356;
+    public long l00357;
+    public long l00358;
+    public long l00359;
+    public long l00360;
+    public long l00361;
+    public long l00362;
+    public long l00363;
+    public long l00364;
+    public long l00365;
+    public long l00366;
+    public long l00367;
+    public long l00368;
+    public long l00369;
+    public long l00370;
+    public long l00371;
+    public long l00372;
+    public long l00373;
+    public long l00374;
+    public long l00375;
+    public long l00376;
+    public long l00377;
+    public long l00378;
+    public long l00379;
+    public long l00380;
+    public long l00381;
+    public long l00382;
+    public long l00383;
+    public long l00384;
+    public long l00385;
+    public long l00386;
+    public long l00387;
+    public long l00388;
+    public long l00389;
+    public long l00390;
+    public long l00391;
+    public long l00392;
+    public long l00393;
+    public long l00394;
+    public long l00395;
+    public long l00396;
+    public long l00397;
+    public long l00398;
+    public long l00399;
+    public long l00400;
+    public long l00401;
+    public long l00402;
+    public long l00403;
+    public long l00404;
+    public long l00405;
+    public long l00406;
+    public long l00407;
+    public long l00408;
+    public long l00409;
+    public long l00410;
+    public long l00411;
+    public long l00412;
+    public long l00413;
+    public long l00414;
+    public long l00415;
+    public long l00416;
+    public long l00417;
+    public long l00418;
+    public long l00419;
+    public long l00420;
+    public long l00421;
+    public long l00422;
+    public long l00423;
+    public long l00424;
+    public long l00425;
+    public long l00426;
+    public long l00427;
+    public long l00428;
+    public long l00429;
+    public long l00430;
+    public long l00431;
+    public long l00432;
+    public long l00433;
+    public long l00434;
+    public long l00435;
+    public long l00436;
+    public long l00437;
+    public long l00438;
+    public long l00439;
+    public long l00440;
+    public long l00441;
+    public long l00442;
+    public long l00443;
+    public long l00444;
+    public long l00445;
+    public long l00446;
+    public long l00447;
+    public long l00448;
+    public long l00449;
+    public long l00450;
+    public long l00451;
+    public long l00452;
+    public long l00453;
+    public long l00454;
+    public long l00455;
+    public long l00456;
+    public long l00457;
+    public long l00458;
+    public long l00459;
+    public long l00460;
+    public long l00461;
+    public long l00462;
+    public long l00463;
+    public long l00464;
+    public long l00465;
+    public long l00466;
+    public long l00467;
+    public long l00468;
+    public long l00469;
+    public long l00470;
+    public long l00471;
+    public long l00472;
+    public long l00473;
+    public long l00474;
+    public long l00475;
+    public long l00476;
+    public long l00477;
+    public long l00478;
+    public long l00479;
+    public long l00480;
+    public long l00481;
+    public long l00482;
+    public long l00483;
+    public long l00484;
+    public long l00485;
+    public long l00486;
+    public long l00487;
+    public long l00488;
+    public long l00489;
+    public long l00490;
+    public long l00491;
+    public long l00492;
+    public long l00493;
+    public long l00494;
+    public long l00495;
+    public long l00496;
+    public long l00497;
+    public long l00498;
+    public long l00499;
+    public long l00500;
+    public long l00501;
+    public long l00502;
+    public long l00503;
+    public long l00504;
+    public long l00505;
+    public long l00506;
+    public long l00507;
+    public long l00508;
+    public long l00509;
+    public long l00510;
+    public long l00511;
+    public long l00512;
+    public long l00513;
+    public long l00514;
+    public long l00515;
+    public long l00516;
+    public long l00517;
+    public long l00518;
+    public long l00519;
+    public long l00520;
+    public long l00521;
+    public long l00522;
+    public long l00523;
+    public long l00524;
+    public long l00525;
+    public long l00526;
+    public long l00527;
+    public long l00528;
+    public long l00529;
+    public long l00530;
+    public long l00531;
+    public long l00532;
+    public long l00533;
+    public long l00534;
+    public long l00535;
+    public long l00536;
+    public long l00537;
+    public long l00538;
+    public long l00539;
+    public long l00540;
+    public long l00541;
+    public long l00542;
+    public long l00543;
+    public long l00544;
+    public long l00545;
+    public long l00546;
+    public long l00547;
+    public long l00548;
+    public long l00549;
+    public long l00550;
+    public long l00551;
+    public long l00552;
+    public long l00553;
+    public long l00554;
+    public long l00555;
+    public long l00556;
+    public long l00557;
+    public long l00558;
+    public long l00559;
+    public long l00560;
+    public long l00561;
+    public long l00562;
+    public long l00563;
+    public long l00564;
+    public long l00565;
+    public long l00566;
+    public long l00567;
+    public long l00568;
+    public long l00569;
+    public long l00570;
+    public long l00571;
+    public long l00572;
+    public long l00573;
+    public long l00574;
+    public long l00575;
+    public long l00576;
+    public long l00577;
+    public long l00578;
+    public long l00579;
+    public long l00580;
+    public long l00581;
+    public long l00582;
+    public long l00583;
+    public long l00584;
+    public long l00585;
+    public long l00586;
+    public long l00587;
+    public long l00588;
+    public long l00589;
+    public long l00590;
+    public long l00591;
+    public long l00592;
+    public long l00593;
+    public long l00594;
+    public long l00595;
+    public long l00596;
+    public long l00597;
+    public long l00598;
+    public long l00599;
+    public long l00600;
+    public long l00601;
+    public long l00602;
+    public long l00603;
+    public long l00604;
+    public long l00605;
+    public long l00606;
+    public long l00607;
+    public long l00608;
+    public long l00609;
+    public long l00610;
+    public long l00611;
+    public long l00612;
+    public long l00613;
+    public long l00614;
+    public long l00615;
+    public long l00616;
+    public long l00617;
+    public long l00618;
+    public long l00619;
+    public long l00620;
+    public long l00621;
+    public long l00622;
+    public long l00623;
+    public long l00624;
+    public long l00625;
+    public long l00626;
+    public long l00627;
+    public long l00628;
+    public long l00629;
+    public long l00630;
+    public long l00631;
+    public long l00632;
+    public long l00633;
+    public long l00634;
+    public long l00635;
+    public long l00636;
+    public long l00637;
+    public long l00638;
+    public long l00639;
+    public long l00640;
+    public long l00641;
+    public long l00642;
+    public long l00643;
+    public long l00644;
+    public long l00645;
+    public long l00646;
+    public long l00647;
+    public long l00648;
+    public long l00649;
+    public long l00650;
+    public long l00651;
+    public long l00652;
+    public long l00653;
+    public long l00654;
+    public long l00655;
+    public long l00656;
+    public long l00657;
+    public long l00658;
+    public long l00659;
+    public long l00660;
+    public long l00661;
+    public long l00662;
+    public long l00663;
+    public long l00664;
+    public long l00665;
+    public long l00666;
+    public long l00667;
+    public long l00668;
+    public long l00669;
+    public long l00670;
+    public long l00671;
+    public long l00672;
+    public long l00673;
+    public long l00674;
+    public long l00675;
+    public long l00676;
+    public long l00677;
+    public long l00678;
+    public long l00679;
+    public long l00680;
+    public long l00681;
+    public long l00682;
+    public long l00683;
+    public long l00684;
+    public long l00685;
+    public long l00686;
+    public long l00687;
+    public long l00688;
+    public long l00689;
+    public long l00690;
+    public long l00691;
+    public long l00692;
+    public long l00693;
+    public long l00694;
+    public long l00695;
+    public long l00696;
+    public long l00697;
+    public long l00698;
+    public long l00699;
+    public long l00700;
+    public long l00701;
+    public long l00702;
+    public long l00703;
+    public long l00704;
+    public long l00705;
+    public long l00706;
+    public long l00707;
+    public long l00708;
+    public long l00709;
+    public long l00710;
+    public long l00711;
+    public long l00712;
+    public long l00713;
+    public long l00714;
+    public long l00715;
+    public long l00716;
+    public long l00717;
+    public long l00718;
+    public long l00719;
+    public long l00720;
+    public long l00721;
+    public long l00722;
+    public long l00723;
+    public long l00724;
+    public long l00725;
+    public long l00726;
+    public long l00727;
+    public long l00728;
+    public long l00729;
+    public long l00730;
+    public long l00731;
+    public long l00732;
+    public long l00733;
+    public long l00734;
+    public long l00735;
+    public long l00736;
+    public long l00737;
+    public long l00738;
+    public long l00739;
+    public long l00740;
+    public long l00741;
+    public long l00742;
+    public long l00743;
+    public long l00744;
+    public long l00745;
+    public long l00746;
+    public long l00747;
+    public long l00748;
+    public long l00749;
+    public long l00750;
+    public long l00751;
+    public long l00752;
+    public long l00753;
+    public long l00754;
+    public long l00755;
+    public long l00756;
+    public long l00757;
+    public long l00758;
+    public long l00759;
+    public long l00760;
+    public long l00761;
+    public long l00762;
+    public long l00763;
+    public long l00764;
+    public long l00765;
+    public long l00766;
+    public long l00767;
+    public long l00768;
+    public long l00769;
+    public long l00770;
+    public long l00771;
+    public long l00772;
+    public long l00773;
+    public long l00774;
+    public long l00775;
+    public long l00776;
+    public long l00777;
+    public long l00778;
+    public long l00779;
+    public long l00780;
+    public long l00781;
+    public long l00782;
+    public long l00783;
+    public long l00784;
+    public long l00785;
+    public long l00786;
+    public long l00787;
+    public long l00788;
+    public long l00789;
+    public long l00790;
+    public long l00791;
+    public long l00792;
+    public long l00793;
+    public long l00794;
+    public long l00795;
+    public long l00796;
+    public long l00797;
+    public long l00798;
+    public long l00799;
+    public long l00800;
+    public long l00801;
+    public long l00802;
+    public long l00803;
+    public long l00804;
+    public long l00805;
+    public long l00806;
+    public long l00807;
+    public long l00808;
+    public long l00809;
+    public long l00810;
+    public long l00811;
+    public long l00812;
+    public long l00813;
+    public long l00814;
+    public long l00815;
+    public long l00816;
+    public long l00817;
+    public long l00818;
+    public long l00819;
+    public long l00820;
+    public long l00821;
+    public long l00822;
+    public long l00823;
+    public long l00824;
+    public long l00825;
+    public long l00826;
+    public long l00827;
+    public long l00828;
+    public long l00829;
+    public long l00830;
+    public long l00831;
+    public long l00832;
+    public long l00833;
+    public long l00834;
+    public long l00835;
+    public long l00836;
+    public long l00837;
+    public long l00838;
+    public long l00839;
+    public long l00840;
+    public long l00841;
+    public long l00842;
+    public long l00843;
+    public long l00844;
+    public long l00845;
+    public long l00846;
+    public long l00847;
+    public long l00848;
+    public long l00849;
+    public long l00850;
+    public long l00851;
+    public long l00852;
+    public long l00853;
+    public long l00854;
+    public long l00855;
+    public long l00856;
+    public long l00857;
+    public long l00858;
+    public long l00859;
+    public long l00860;
+    public long l00861;
+    public long l00862;
+    public long l00863;
+    public long l00864;
+    public long l00865;
+    public long l00866;
+    public long l00867;
+    public long l00868;
+    public long l00869;
+    public long l00870;
+    public long l00871;
+    public long l00872;
+    public long l00873;
+    public long l00874;
+    public long l00875;
+    public long l00876;
+    public long l00877;
+    public long l00878;
+    public long l00879;
+    public long l00880;
+    public long l00881;
+    public long l00882;
+    public long l00883;
+    public long l00884;
+    public long l00885;
+    public long l00886;
+    public long l00887;
+    public long l00888;
+    public long l00889;
+    public long l00890;
+    public long l00891;
+    public long l00892;
+    public long l00893;
+    public long l00894;
+    public long l00895;
+    public long l00896;
+    public long l00897;
+    public long l00898;
+    public long l00899;
+    public long l00900;
+    public long l00901;
+    public long l00902;
+    public long l00903;
+    public long l00904;
+    public long l00905;
+    public long l00906;
+    public long l00907;
+    public long l00908;
+    public long l00909;
+    public long l00910;
+    public long l00911;
+    public long l00912;
+    public long l00913;
+    public long l00914;
+    public long l00915;
+    public long l00916;
+    public long l00917;
+    public long l00918;
+    public long l00919;
+    public long l00920;
+    public long l00921;
+    public long l00922;
+    public long l00923;
+    public long l00924;
+    public long l00925;
+    public long l00926;
+    public long l00927;
+    public long l00928;
+    public long l00929;
+    public long l00930;
+    public long l00931;
+    public long l00932;
+    public long l00933;
+    public long l00934;
+    public long l00935;
+    public long l00936;
+    public long l00937;
+    public long l00938;
+    public long l00939;
+    public long l00940;
+    public long l00941;
+    public long l00942;
+    public long l00943;
+    public long l00944;
+    public long l00945;
+    public long l00946;
+    public long l00947;
+    public long l00948;
+    public long l00949;
+    public long l00950;
+    public long l00951;
+    public long l00952;
+    public long l00953;
+    public long l00954;
+    public long l00955;
+    public long l00956;
+    public long l00957;
+    public long l00958;
+    public long l00959;
+    public long l00960;
+    public long l00961;
+    public long l00962;
+    public long l00963;
+    public long l00964;
+    public long l00965;
+    public long l00966;
+    public long l00967;
+    public long l00968;
+    public long l00969;
+    public long l00970;
+    public long l00971;
+    public long l00972;
+    public long l00973;
+    public long l00974;
+    public long l00975;
+    public long l00976;
+    public long l00977;
+    public long l00978;
+    public long l00979;
+    public long l00980;
+    public long l00981;
+    public long l00982;
+    public long l00983;
+    public long l00984;
+    public long l00985;
+    public long l00986;
+    public long l00987;
+    public long l00988;
+    public long l00989;
+    public long l00990;
+    public long l00991;
+    public long l00992;
+    public long l00993;
+    public long l00994;
+    public long l00995;
+    public long l00996;
+    public long l00997;
+    public long l00998;
+    public long l00999;
+    public long l01000;
+    public long l01001;
+    public long l01002;
+    public long l01003;
+    public long l01004;
+    public long l01005;
+    public long l01006;
+    public long l01007;
+    public long l01008;
+    public long l01009;
+    public long l01010;
+    public long l01011;
+    public long l01012;
+    public long l01013;
+    public long l01014;
+    public long l01015;
+    public long l01016;
+    public long l01017;
+    public long l01018;
+    public long l01019;
+    public long l01020;
+    public long l01021;
+    public long l01022;
+    public long l01023;
+    public long l01024;
+    public long l01025;
+    public long l01026;
+    public long l01027;
+    public long l01028;
+    public long l01029;
+    public long l01030;
+    public long l01031;
+    public long l01032;
+    public long l01033;
+    public long l01034;
+    public long l01035;
+    public long l01036;
+    public long l01037;
+    public long l01038;
+    public long l01039;
+    public long l01040;
+    public long l01041;
+    public long l01042;
+    public long l01043;
+    public long l01044;
+    public long l01045;
+    public long l01046;
+    public long l01047;
+    public long l01048;
+    public long l01049;
+    public long l01050;
+    public long l01051;
+    public long l01052;
+    public long l01053;
+    public long l01054;
+    public long l01055;
+    public long l01056;
+    public long l01057;
+    public long l01058;
+    public long l01059;
+    public long l01060;
+    public long l01061;
+    public long l01062;
+    public long l01063;
+    public long l01064;
+    public long l01065;
+    public long l01066;
+    public long l01067;
+    public long l01068;
+    public long l01069;
+    public long l01070;
+    public long l01071;
+    public long l01072;
+    public long l01073;
+    public long l01074;
+    public long l01075;
+    public long l01076;
+    public long l01077;
+    public long l01078;
+    public long l01079;
+    public long l01080;
+    public long l01081;
+    public long l01082;
+    public long l01083;
+    public long l01084;
+    public long l01085;
+    public long l01086;
+    public long l01087;
+    public long l01088;
+    public long l01089;
+    public long l01090;
+    public long l01091;
+    public long l01092;
+    public long l01093;
+    public long l01094;
+    public long l01095;
+    public long l01096;
+    public long l01097;
+    public long l01098;
+    public long l01099;
+    public long l01100;
+    public long l01101;
+    public long l01102;
+    public long l01103;
+    public long l01104;
+    public long l01105;
+    public long l01106;
+    public long l01107;
+    public long l01108;
+    public long l01109;
+    public long l01110;
+    public long l01111;
+    public long l01112;
+    public long l01113;
+    public long l01114;
+    public long l01115;
+    public long l01116;
+    public long l01117;
+    public long l01118;
+    public long l01119;
+    public long l01120;
+    public long l01121;
+    public long l01122;
+    public long l01123;
+    public long l01124;
+    public long l01125;
+    public long l01126;
+    public long l01127;
+    public long l01128;
+    public long l01129;
+    public long l01130;
+    public long l01131;
+    public long l01132;
+    public long l01133;
+    public long l01134;
+    public long l01135;
+    public long l01136;
+    public long l01137;
+    public long l01138;
+    public long l01139;
+    public long l01140;
+    public long l01141;
+    public long l01142;
+    public long l01143;
+    public long l01144;
+    public long l01145;
+    public long l01146;
+    public long l01147;
+    public long l01148;
+    public long l01149;
+    public long l01150;
+    public long l01151;
+    public long l01152;
+    public long l01153;
+    public long l01154;
+    public long l01155;
+    public long l01156;
+    public long l01157;
+    public long l01158;
+    public long l01159;
+    public long l01160;
+    public long l01161;
+    public long l01162;
+    public long l01163;
+    public long l01164;
+    public long l01165;
+    public long l01166;
+    public long l01167;
+    public long l01168;
+    public long l01169;
+    public long l01170;
+    public long l01171;
+    public long l01172;
+    public long l01173;
+    public long l01174;
+    public long l01175;
+    public long l01176;
+    public long l01177;
+    public long l01178;
+    public long l01179;
+    public long l01180;
+    public long l01181;
+    public long l01182;
+    public long l01183;
+    public long l01184;
+    public long l01185;
+    public long l01186;
+    public long l01187;
+    public long l01188;
+    public long l01189;
+    public long l01190;
+    public long l01191;
+    public long l01192;
+    public long l01193;
+    public long l01194;
+    public long l01195;
+    public long l01196;
+    public long l01197;
+    public long l01198;
+    public long l01199;
+    public long l01200;
+    public long l01201;
+    public long l01202;
+    public long l01203;
+    public long l01204;
+    public long l01205;
+    public long l01206;
+    public long l01207;
+    public long l01208;
+    public long l01209;
+    public long l01210;
+    public long l01211;
+    public long l01212;
+    public long l01213;
+    public long l01214;
+    public long l01215;
+    public long l01216;
+    public long l01217;
+    public long l01218;
+    public long l01219;
+    public long l01220;
+    public long l01221;
+    public long l01222;
+    public long l01223;
+    public long l01224;
+    public long l01225;
+    public long l01226;
+    public long l01227;
+    public long l01228;
+    public long l01229;
+    public long l01230;
+    public long l01231;
+    public long l01232;
+    public long l01233;
+    public long l01234;
+    public long l01235;
+    public long l01236;
+    public long l01237;
+    public long l01238;
+    public long l01239;
+    public long l01240;
+    public long l01241;
+    public long l01242;
+    public long l01243;
+    public long l01244;
+    public long l01245;
+    public long l01246;
+    public long l01247;
+    public long l01248;
+    public long l01249;
+    public long l01250;
+    public long l01251;
+    public long l01252;
+    public long l01253;
+    public long l01254;
+    public long l01255;
+    public long l01256;
+    public long l01257;
+    public long l01258;
+    public long l01259;
+    public long l01260;
+    public long l01261;
+    public long l01262;
+    public long l01263;
+    public long l01264;
+    public long l01265;
+    public long l01266;
+    public long l01267;
+    public long l01268;
+    public long l01269;
+    public long l01270;
+    public long l01271;
+    public long l01272;
+    public long l01273;
+    public long l01274;
+    public long l01275;
+    public long l01276;
+    public long l01277;
+    public long l01278;
+    public long l01279;
+    public long l01280;
+    public long l01281;
+    public long l01282;
+    public long l01283;
+    public long l01284;
+    public long l01285;
+    public long l01286;
+    public long l01287;
+    public long l01288;
+    public long l01289;
+    public long l01290;
+    public long l01291;
+    public long l01292;
+    public long l01293;
+    public long l01294;
+    public long l01295;
+    public long l01296;
+    public long l01297;
+    public long l01298;
+    public long l01299;
+    public long l01300;
+    public long l01301;
+    public long l01302;
+    public long l01303;
+    public long l01304;
+    public long l01305;
+    public long l01306;
+    public long l01307;
+    public long l01308;
+    public long l01309;
+    public long l01310;
+    public long l01311;
+    public long l01312;
+    public long l01313;
+    public long l01314;
+    public long l01315;
+    public long l01316;
+    public long l01317;
+    public long l01318;
+    public long l01319;
+    public long l01320;
+    public long l01321;
+    public long l01322;
+    public long l01323;
+    public long l01324;
+    public long l01325;
+    public long l01326;
+    public long l01327;
+    public long l01328;
+    public long l01329;
+    public long l01330;
+    public long l01331;
+    public long l01332;
+    public long l01333;
+    public long l01334;
+    public long l01335;
+    public long l01336;
+    public long l01337;
+    public long l01338;
+    public long l01339;
+    public long l01340;
+    public long l01341;
+    public long l01342;
+    public long l01343;
+    public long l01344;
+    public long l01345;
+    public long l01346;
+    public long l01347;
+    public long l01348;
+    public long l01349;
+    public long l01350;
+    public long l01351;
+    public long l01352;
+    public long l01353;
+    public long l01354;
+    public long l01355;
+    public long l01356;
+    public long l01357;
+    public long l01358;
+    public long l01359;
+    public long l01360;
+    public long l01361;
+    public long l01362;
+    public long l01363;
+    public long l01364;
+    public long l01365;
+    public long l01366;
+    public long l01367;
+    public long l01368;
+    public long l01369;
+    public long l01370;
+    public long l01371;
+    public long l01372;
+    public long l01373;
+    public long l01374;
+    public long l01375;
+    public long l01376;
+    public long l01377;
+    public long l01378;
+    public long l01379;
+    public long l01380;
+    public long l01381;
+    public long l01382;
+    public long l01383;
+    public long l01384;
+    public long l01385;
+    public long l01386;
+    public long l01387;
+    public long l01388;
+    public long l01389;
+    public long l01390;
+    public long l01391;
+    public long l01392;
+    public long l01393;
+    public long l01394;
+    public long l01395;
+    public long l01396;
+    public long l01397;
+    public long l01398;
+    public long l01399;
+    public long l01400;
+    public long l01401;
+    public long l01402;
+    public long l01403;
+    public long l01404;
+    public long l01405;
+    public long l01406;
+    public long l01407;
+    public long l01408;
+    public long l01409;
+    public long l01410;
+    public long l01411;
+    public long l01412;
+    public long l01413;
+    public long l01414;
+    public long l01415;
+    public long l01416;
+    public long l01417;
+    public long l01418;
+    public long l01419;
+    public long l01420;
+    public long l01421;
+    public long l01422;
+    public long l01423;
+    public long l01424;
+    public long l01425;
+    public long l01426;
+    public long l01427;
+    public long l01428;
+    public long l01429;
+    public long l01430;
+    public long l01431;
+    public long l01432;
+    public long l01433;
+    public long l01434;
+    public long l01435;
+    public long l01436;
+    public long l01437;
+    public long l01438;
+    public long l01439;
+    public long l01440;
+    public long l01441;
+    public long l01442;
+    public long l01443;
+    public long l01444;
+    public long l01445;
+    public long l01446;
+    public long l01447;
+    public long l01448;
+    public long l01449;
+    public long l01450;
+    public long l01451;
+    public long l01452;
+    public long l01453;
+    public long l01454;
+    public long l01455;
+    public long l01456;
+    public long l01457;
+    public long l01458;
+    public long l01459;
+    public long l01460;
+    public long l01461;
+    public long l01462;
+    public long l01463;
+    public long l01464;
+    public long l01465;
+    public long l01466;
+    public long l01467;
+    public long l01468;
+    public long l01469;
+    public long l01470;
+    public long l01471;
+    public long l01472;
+    public long l01473;
+    public long l01474;
+    public long l01475;
+    public long l01476;
+    public long l01477;
+    public long l01478;
+    public long l01479;
+    public long l01480;
+    public long l01481;
+    public long l01482;
+    public long l01483;
+    public long l01484;
+    public long l01485;
+    public long l01486;
+    public long l01487;
+    public long l01488;
+    public long l01489;
+    public long l01490;
+    public long l01491;
+    public long l01492;
+    public long l01493;
+    public long l01494;
+    public long l01495;
+    public long l01496;
+    public long l01497;
+    public long l01498;
+    public long l01499;
+    public long l01500;
+    public long l01501;
+    public long l01502;
+    public long l01503;
+    public long l01504;
+    public long l01505;
+    public long l01506;
+    public long l01507;
+    public long l01508;
+    public long l01509;
+    public long l01510;
+    public long l01511;
+    public long l01512;
+    public long l01513;
+    public long l01514;
+    public long l01515;
+    public long l01516;
+    public long l01517;
+    public long l01518;
+    public long l01519;
+    public long l01520;
+    public long l01521;
+    public long l01522;
+    public long l01523;
+    public long l01524;
+    public long l01525;
+    public long l01526;
+    public long l01527;
+    public long l01528;
+    public long l01529;
+    public long l01530;
+    public long l01531;
+    public long l01532;
+    public long l01533;
+    public long l01534;
+    public long l01535;
+    public long l01536;
+    public long l01537;
+    public long l01538;
+    public long l01539;
+    public long l01540;
+    public long l01541;
+    public long l01542;
+    public long l01543;
+    public long l01544;
+    public long l01545;
+    public long l01546;
+    public long l01547;
+    public long l01548;
+    public long l01549;
+    public long l01550;
+    public long l01551;
+    public long l01552;
+    public long l01553;
+    public long l01554;
+    public long l01555;
+    public long l01556;
+    public long l01557;
+    public long l01558;
+    public long l01559;
+    public long l01560;
+    public long l01561;
+    public long l01562;
+    public long l01563;
+    public long l01564;
+    public long l01565;
+    public long l01566;
+    public long l01567;
+    public long l01568;
+    public long l01569;
+    public long l01570;
+    public long l01571;
+    public long l01572;
+    public long l01573;
+    public long l01574;
+    public long l01575;
+    public long l01576;
+    public long l01577;
+    public long l01578;
+    public long l01579;
+    public long l01580;
+    public long l01581;
+    public long l01582;
+    public long l01583;
+    public long l01584;
+    public long l01585;
+    public long l01586;
+    public long l01587;
+    public long l01588;
+    public long l01589;
+    public long l01590;
+    public long l01591;
+    public long l01592;
+    public long l01593;
+    public long l01594;
+    public long l01595;
+    public long l01596;
+    public long l01597;
+    public long l01598;
+    public long l01599;
+    public long l01600;
+    public long l01601;
+    public long l01602;
+    public long l01603;
+    public long l01604;
+    public long l01605;
+    public long l01606;
+    public long l01607;
+    public long l01608;
+    public long l01609;
+    public long l01610;
+    public long l01611;
+    public long l01612;
+    public long l01613;
+    public long l01614;
+    public long l01615;
+    public long l01616;
+    public long l01617;
+    public long l01618;
+    public long l01619;
+    public long l01620;
+    public long l01621;
+    public long l01622;
+    public long l01623;
+    public long l01624;
+    public long l01625;
+    public long l01626;
+    public long l01627;
+    public long l01628;
+    public long l01629;
+    public long l01630;
+    public long l01631;
+    public long l01632;
+    public long l01633;
+    public long l01634;
+    public long l01635;
+    public long l01636;
+    public long l01637;
+    public long l01638;
+    public long l01639;
+    public long l01640;
+    public long l01641;
+    public long l01642;
+    public long l01643;
+    public long l01644;
+    public long l01645;
+    public long l01646;
+    public long l01647;
+    public long l01648;
+    public long l01649;
+    public long l01650;
+    public long l01651;
+    public long l01652;
+    public long l01653;
+    public long l01654;
+    public long l01655;
+    public long l01656;
+    public long l01657;
+    public long l01658;
+    public long l01659;
+    public long l01660;
+    public long l01661;
+    public long l01662;
+    public long l01663;
+    public long l01664;
+    public long l01665;
+    public long l01666;
+    public long l01667;
+    public long l01668;
+    public long l01669;
+    public long l01670;
+    public long l01671;
+    public long l01672;
+    public long l01673;
+    public long l01674;
+    public long l01675;
+    public long l01676;
+    public long l01677;
+    public long l01678;
+    public long l01679;
+    public long l01680;
+    public long l01681;
+    public long l01682;
+    public long l01683;
+    public long l01684;
+    public long l01685;
+    public long l01686;
+    public long l01687;
+    public long l01688;
+    public long l01689;
+    public long l01690;
+    public long l01691;
+    public long l01692;
+    public long l01693;
+    public long l01694;
+    public long l01695;
+    public long l01696;
+    public long l01697;
+    public long l01698;
+    public long l01699;
+    public long l01700;
+    public long l01701;
+    public long l01702;
+    public long l01703;
+    public long l01704;
+    public long l01705;
+    public long l01706;
+    public long l01707;
+    public long l01708;
+    public long l01709;
+    public long l01710;
+    public long l01711;
+    public long l01712;
+    public long l01713;
+    public long l01714;
+    public long l01715;
+    public long l01716;
+    public long l01717;
+    public long l01718;
+    public long l01719;
+    public long l01720;
+    public long l01721;
+    public long l01722;
+    public long l01723;
+    public long l01724;
+    public long l01725;
+    public long l01726;
+    public long l01727;
+    public long l01728;
+    public long l01729;
+    public long l01730;
+    public long l01731;
+    public long l01732;
+    public long l01733;
+    public long l01734;
+    public long l01735;
+    public long l01736;
+    public long l01737;
+    public long l01738;
+    public long l01739;
+    public long l01740;
+    public long l01741;
+    public long l01742;
+    public long l01743;
+    public long l01744;
+    public long l01745;
+    public long l01746;
+    public long l01747;
+    public long l01748;
+    public long l01749;
+    public long l01750;
+    public long l01751;
+    public long l01752;
+    public long l01753;
+    public long l01754;
+    public long l01755;
+    public long l01756;
+    public long l01757;
+    public long l01758;
+    public long l01759;
+    public long l01760;
+    public long l01761;
+    public long l01762;
+    public long l01763;
+    public long l01764;
+    public long l01765;
+    public long l01766;
+    public long l01767;
+    public long l01768;
+    public long l01769;
+    public long l01770;
+    public long l01771;
+    public long l01772;
+    public long l01773;
+    public long l01774;
+    public long l01775;
+    public long l01776;
+    public long l01777;
+    public long l01778;
+    public long l01779;
+    public long l01780;
+    public long l01781;
+    public long l01782;
+    public long l01783;
+    public long l01784;
+    public long l01785;
+    public long l01786;
+    public long l01787;
+    public long l01788;
+    public long l01789;
+    public long l01790;
+    public long l01791;
+    public long l01792;
+    public long l01793;
+    public long l01794;
+    public long l01795;
+    public long l01796;
+    public long l01797;
+    public long l01798;
+    public long l01799;
+    public long l01800;
+    public long l01801;
+    public long l01802;
+    public long l01803;
+    public long l01804;
+    public long l01805;
+    public long l01806;
+    public long l01807;
+    public long l01808;
+    public long l01809;
+    public long l01810;
+    public long l01811;
+    public long l01812;
+    public long l01813;
+    public long l01814;
+    public long l01815;
+    public long l01816;
+    public long l01817;
+    public long l01818;
+    public long l01819;
+    public long l01820;
+    public long l01821;
+    public long l01822;
+    public long l01823;
+    public long l01824;
+    public long l01825;
+    public long l01826;
+    public long l01827;
+    public long l01828;
+    public long l01829;
+    public long l01830;
+    public long l01831;
+    public long l01832;
+    public long l01833;
+    public long l01834;
+    public long l01835;
+    public long l01836;
+    public long l01837;
+    public long l01838;
+    public long l01839;
+    public long l01840;
+    public long l01841;
+    public long l01842;
+    public long l01843;
+    public long l01844;
+    public long l01845;
+    public long l01846;
+    public long l01847;
+    public long l01848;
+    public long l01849;
+    public long l01850;
+    public long l01851;
+    public long l01852;
+    public long l01853;
+    public long l01854;
+    public long l01855;
+    public long l01856;
+    public long l01857;
+    public long l01858;
+    public long l01859;
+    public long l01860;
+    public long l01861;
+    public long l01862;
+    public long l01863;
+    public long l01864;
+    public long l01865;
+    public long l01866;
+    public long l01867;
+    public long l01868;
+    public long l01869;
+    public long l01870;
+    public long l01871;
+    public long l01872;
+    public long l01873;
+    public long l01874;
+    public long l01875;
+    public long l01876;
+    public long l01877;
+    public long l01878;
+    public long l01879;
+    public long l01880;
+    public long l01881;
+    public long l01882;
+    public long l01883;
+    public long l01884;
+    public long l01885;
+    public long l01886;
+    public long l01887;
+    public long l01888;
+    public long l01889;
+    public long l01890;
+    public long l01891;
+    public long l01892;
+    public long l01893;
+    public long l01894;
+    public long l01895;
+    public long l01896;
+    public long l01897;
+    public long l01898;
+    public long l01899;
+    public long l01900;
+    public long l01901;
+    public long l01902;
+    public long l01903;
+    public long l01904;
+    public long l01905;
+    public long l01906;
+    public long l01907;
+    public long l01908;
+    public long l01909;
+    public long l01910;
+    public long l01911;
+    public long l01912;
+    public long l01913;
+    public long l01914;
+    public long l01915;
+    public long l01916;
+    public long l01917;
+    public long l01918;
+    public long l01919;
+    public long l01920;
+    public long l01921;
+    public long l01922;
+    public long l01923;
+    public long l01924;
+    public long l01925;
+    public long l01926;
+    public long l01927;
+    public long l01928;
+    public long l01929;
+    public long l01930;
+    public long l01931;
+    public long l01932;
+    public long l01933;
+    public long l01934;
+    public long l01935;
+    public long l01936;
+    public long l01937;
+    public long l01938;
+    public long l01939;
+    public long l01940;
+    public long l01941;
+    public long l01942;
+    public long l01943;
+    public long l01944;
+    public long l01945;
+    public long l01946;
+    public long l01947;
+    public long l01948;
+    public long l01949;
+    public long l01950;
+    public long l01951;
+    public long l01952;
+    public long l01953;
+    public long l01954;
+    public long l01955;
+    public long l01956;
+    public long l01957;
+    public long l01958;
+    public long l01959;
+    public long l01960;
+    public long l01961;
+    public long l01962;
+    public long l01963;
+    public long l01964;
+    public long l01965;
+    public long l01966;
+    public long l01967;
+    public long l01968;
+    public long l01969;
+    public long l01970;
+    public long l01971;
+    public long l01972;
+    public long l01973;
+    public long l01974;
+    public long l01975;
+    public long l01976;
+    public long l01977;
+    public long l01978;
+    public long l01979;
+    public long l01980;
+    public long l01981;
+    public long l01982;
+    public long l01983;
+    public long l01984;
+    public long l01985;
+    public long l01986;
+    public long l01987;
+    public long l01988;
+    public long l01989;
+    public long l01990;
+    public long l01991;
+    public long l01992;
+    public long l01993;
+    public long l01994;
+    public long l01995;
+    public long l01996;
+    public long l01997;
+    public long l01998;
+    public long l01999;
+    public long l02000;
+    public long l02001;
+    public long l02002;
+    public long l02003;
+    public long l02004;
+    public long l02005;
+    public long l02006;
+    public long l02007;
+    public long l02008;
+    public long l02009;
+    public long l02010;
+    public long l02011;
+    public long l02012;
+    public long l02013;
+    public long l02014;
+    public long l02015;
+    public long l02016;
+    public long l02017;
+    public long l02018;
+    public long l02019;
+    public long l02020;
+    public long l02021;
+    public long l02022;
+    public long l02023;
+    public long l02024;
+    public long l02025;
+    public long l02026;
+    public long l02027;
+    public long l02028;
+    public long l02029;
+    public long l02030;
+    public long l02031;
+    public long l02032;
+    public long l02033;
+    public long l02034;
+    public long l02035;
+    public long l02036;
+    public long l02037;
+    public long l02038;
+    public long l02039;
+    public long l02040;
+    public long l02041;
+    public long l02042;
+    public long l02043;
+    public long l02044;
+    public long l02045;
+    public long l02046;
+    public long l02047;
+    public long l02048;
+    public long l02049;
+    public long l02050;
+    public long l02051;
+    public long l02052;
+    public long l02053;
+    public long l02054;
+    public long l02055;
+    public long l02056;
+    public long l02057;
+    public long l02058;
+    public long l02059;
+    public long l02060;
+    public long l02061;
+    public long l02062;
+    public long l02063;
+    public long l02064;
+    public long l02065;
+    public long l02066;
+    public long l02067;
+    public long l02068;
+    public long l02069;
+    public long l02070;
+    public long l02071;
+    public long l02072;
+    public long l02073;
+    public long l02074;
+    public long l02075;
+    public long l02076;
+    public long l02077;
+    public long l02078;
+    public long l02079;
+    public long l02080;
+    public long l02081;
+    public long l02082;
+    public long l02083;
+    public long l02084;
+    public long l02085;
+    public long l02086;
+    public long l02087;
+    public long l02088;
+    public long l02089;
+    public long l02090;
+    public long l02091;
+    public long l02092;
+    public long l02093;
+    public long l02094;
+    public long l02095;
+    public long l02096;
+    public long l02097;
+    public long l02098;
+    public long l02099;
+    public long l02100;
+    public long l02101;
+    public long l02102;
+    public long l02103;
+    public long l02104;
+    public long l02105;
+    public long l02106;
+    public long l02107;
+    public long l02108;
+    public long l02109;
+    public long l02110;
+    public long l02111;
+    public long l02112;
+    public long l02113;
+    public long l02114;
+    public long l02115;
+    public long l02116;
+    public long l02117;
+    public long l02118;
+    public long l02119;
+    public long l02120;
+    public long l02121;
+    public long l02122;
+    public long l02123;
+    public long l02124;
+    public long l02125;
+    public long l02126;
+    public long l02127;
+    public long l02128;
+    public long l02129;
+    public long l02130;
+    public long l02131;
+    public long l02132;
+    public long l02133;
+    public long l02134;
+    public long l02135;
+    public long l02136;
+    public long l02137;
+    public long l02138;
+    public long l02139;
+    public long l02140;
+    public long l02141;
+    public long l02142;
+    public long l02143;
+    public long l02144;
+    public long l02145;
+    public long l02146;
+    public long l02147;
+    public long l02148;
+    public long l02149;
+    public long l02150;
+    public long l02151;
+    public long l02152;
+    public long l02153;
+    public long l02154;
+    public long l02155;
+    public long l02156;
+    public long l02157;
+    public long l02158;
+    public long l02159;
+    public long l02160;
+    public long l02161;
+    public long l02162;
+    public long l02163;
+    public long l02164;
+    public long l02165;
+    public long l02166;
+    public long l02167;
+    public long l02168;
+    public long l02169;
+    public long l02170;
+    public long l02171;
+    public long l02172;
+    public long l02173;
+    public long l02174;
+    public long l02175;
+    public long l02176;
+    public long l02177;
+    public long l02178;
+    public long l02179;
+    public long l02180;
+    public long l02181;
+    public long l02182;
+    public long l02183;
+    public long l02184;
+    public long l02185;
+    public long l02186;
+    public long l02187;
+    public long l02188;
+    public long l02189;
+    public long l02190;
+    public long l02191;
+    public long l02192;
+    public long l02193;
+    public long l02194;
+    public long l02195;
+    public long l02196;
+    public long l02197;
+    public long l02198;
+    public long l02199;
+    public long l02200;
+    public long l02201;
+    public long l02202;
+    public long l02203;
+    public long l02204;
+    public long l02205;
+    public long l02206;
+    public long l02207;
+    public long l02208;
+    public long l02209;
+    public long l02210;
+    public long l02211;
+    public long l02212;
+    public long l02213;
+    public long l02214;
+    public long l02215;
+    public long l02216;
+    public long l02217;
+    public long l02218;
+    public long l02219;
+    public long l02220;
+    public long l02221;
+    public long l02222;
+    public long l02223;
+    public long l02224;
+    public long l02225;
+    public long l02226;
+    public long l02227;
+    public long l02228;
+    public long l02229;
+    public long l02230;
+    public long l02231;
+    public long l02232;
+    public long l02233;
+    public long l02234;
+    public long l02235;
+    public long l02236;
+    public long l02237;
+    public long l02238;
+    public long l02239;
+    public long l02240;
+    public long l02241;
+    public long l02242;
+    public long l02243;
+    public long l02244;
+    public long l02245;
+    public long l02246;
+    public long l02247;
+    public long l02248;
+    public long l02249;
+    public long l02250;
+    public long l02251;
+    public long l02252;
+    public long l02253;
+    public long l02254;
+    public long l02255;
+    public long l02256;
+    public long l02257;
+    public long l02258;
+    public long l02259;
+    public long l02260;
+    public long l02261;
+    public long l02262;
+    public long l02263;
+    public long l02264;
+    public long l02265;
+    public long l02266;
+    public long l02267;
+    public long l02268;
+    public long l02269;
+    public long l02270;
+    public long l02271;
+    public long l02272;
+    public long l02273;
+    public long l02274;
+    public long l02275;
+    public long l02276;
+    public long l02277;
+    public long l02278;
+    public long l02279;
+    public long l02280;
+    public long l02281;
+    public long l02282;
+    public long l02283;
+    public long l02284;
+    public long l02285;
+    public long l02286;
+    public long l02287;
+    public long l02288;
+    public long l02289;
+    public long l02290;
+    public long l02291;
+    public long l02292;
+    public long l02293;
+    public long l02294;
+    public long l02295;
+    public long l02296;
+    public long l02297;
+    public long l02298;
+    public long l02299;
+    public long l02300;
+    public long l02301;
+    public long l02302;
+    public long l02303;
+    public long l02304;
+    public long l02305;
+    public long l02306;
+    public long l02307;
+    public long l02308;
+    public long l02309;
+    public long l02310;
+    public long l02311;
+    public long l02312;
+    public long l02313;
+    public long l02314;
+    public long l02315;
+    public long l02316;
+    public long l02317;
+    public long l02318;
+    public long l02319;
+    public long l02320;
+    public long l02321;
+    public long l02322;
+    public long l02323;
+    public long l02324;
+    public long l02325;
+    public long l02326;
+    public long l02327;
+    public long l02328;
+    public long l02329;
+    public long l02330;
+    public long l02331;
+    public long l02332;
+    public long l02333;
+    public long l02334;
+    public long l02335;
+    public long l02336;
+    public long l02337;
+    public long l02338;
+    public long l02339;
+    public long l02340;
+    public long l02341;
+    public long l02342;
+    public long l02343;
+    public long l02344;
+    public long l02345;
+    public long l02346;
+    public long l02347;
+    public long l02348;
+    public long l02349;
+    public long l02350;
+    public long l02351;
+    public long l02352;
+    public long l02353;
+    public long l02354;
+    public long l02355;
+    public long l02356;
+    public long l02357;
+    public long l02358;
+    public long l02359;
+    public long l02360;
+    public long l02361;
+    public long l02362;
+    public long l02363;
+    public long l02364;
+    public long l02365;
+    public long l02366;
+    public long l02367;
+    public long l02368;
+    public long l02369;
+    public long l02370;
+    public long l02371;
+    public long l02372;
+    public long l02373;
+    public long l02374;
+    public long l02375;
+    public long l02376;
+    public long l02377;
+    public long l02378;
+    public long l02379;
+    public long l02380;
+    public long l02381;
+    public long l02382;
+    public long l02383;
+    public long l02384;
+    public long l02385;
+    public long l02386;
+    public long l02387;
+    public long l02388;
+    public long l02389;
+    public long l02390;
+    public long l02391;
+    public long l02392;
+    public long l02393;
+    public long l02394;
+    public long l02395;
+    public long l02396;
+    public long l02397;
+    public long l02398;
+    public long l02399;
+    public long l02400;
+    public long l02401;
+    public long l02402;
+    public long l02403;
+    public long l02404;
+    public long l02405;
+    public long l02406;
+    public long l02407;
+    public long l02408;
+    public long l02409;
+    public long l02410;
+    public long l02411;
+    public long l02412;
+    public long l02413;
+    public long l02414;
+    public long l02415;
+    public long l02416;
+    public long l02417;
+    public long l02418;
+    public long l02419;
+    public long l02420;
+    public long l02421;
+    public long l02422;
+    public long l02423;
+    public long l02424;
+    public long l02425;
+    public long l02426;
+    public long l02427;
+    public long l02428;
+    public long l02429;
+    public long l02430;
+    public long l02431;
+    public long l02432;
+    public long l02433;
+    public long l02434;
+    public long l02435;
+    public long l02436;
+    public long l02437;
+    public long l02438;
+    public long l02439;
+    public long l02440;
+    public long l02441;
+    public long l02442;
+    public long l02443;
+    public long l02444;
+    public long l02445;
+    public long l02446;
+    public long l02447;
+    public long l02448;
+    public long l02449;
+    public long l02450;
+    public long l02451;
+    public long l02452;
+    public long l02453;
+    public long l02454;
+    public long l02455;
+    public long l02456;
+    public long l02457;
+    public long l02458;
+    public long l02459;
+    public long l02460;
+    public long l02461;
+    public long l02462;
+    public long l02463;
+    public long l02464;
+    public long l02465;
+    public long l02466;
+    public long l02467;
+    public long l02468;
+    public long l02469;
+    public long l02470;
+    public long l02471;
+    public long l02472;
+    public long l02473;
+    public long l02474;
+    public long l02475;
+    public long l02476;
+    public long l02477;
+    public long l02478;
+    public long l02479;
+    public long l02480;
+    public long l02481;
+    public long l02482;
+    public long l02483;
+    public long l02484;
+    public long l02485;
+    public long l02486;
+    public long l02487;
+    public long l02488;
+    public long l02489;
+    public long l02490;
+    public long l02491;
+    public long l02492;
+    public long l02493;
+    public long l02494;
+    public long l02495;
+    public long l02496;
+    public long l02497;
+    public long l02498;
+    public long l02499;
+    public long l02500;
+    public long l02501;
+    public long l02502;
+    public long l02503;
+    public long l02504;
+    public long l02505;
+    public long l02506;
+    public long l02507;
+    public long l02508;
+    public long l02509;
+    public long l02510;
+    public long l02511;
+    public long l02512;
+    public long l02513;
+    public long l02514;
+    public long l02515;
+    public long l02516;
+    public long l02517;
+    public long l02518;
+    public long l02519;
+    public long l02520;
+    public long l02521;
+    public long l02522;
+    public long l02523;
+    public long l02524;
+    public long l02525;
+    public long l02526;
+    public long l02527;
+    public long l02528;
+    public long l02529;
+    public long l02530;
+    public long l02531;
+    public long l02532;
+    public long l02533;
+    public long l02534;
+    public long l02535;
+    public long l02536;
+    public long l02537;
+    public long l02538;
+    public long l02539;
+    public long l02540;
+    public long l02541;
+    public long l02542;
+    public long l02543;
+    public long l02544;
+    public long l02545;
+    public long l02546;
+    public long l02547;
+    public long l02548;
+    public long l02549;
+    public long l02550;
+    public long l02551;
+    public long l02552;
+    public long l02553;
+    public long l02554;
+    public long l02555;
+    public long l02556;
+    public long l02557;
+    public long l02558;
+    public long l02559;
+    public long l02560;
+    public long l02561;
+    public long l02562;
+    public long l02563;
+    public long l02564;
+    public long l02565;
+    public long l02566;
+    public long l02567;
+    public long l02568;
+    public long l02569;
+    public long l02570;
+    public long l02571;
+    public long l02572;
+    public long l02573;
+    public long l02574;
+    public long l02575;
+    public long l02576;
+    public long l02577;
+    public long l02578;
+    public long l02579;
+    public long l02580;
+    public long l02581;
+    public long l02582;
+    public long l02583;
+    public long l02584;
+    public long l02585;
+    public long l02586;
+    public long l02587;
+    public long l02588;
+    public long l02589;
+    public long l02590;
+    public long l02591;
+    public long l02592;
+    public long l02593;
+    public long l02594;
+    public long l02595;
+    public long l02596;
+    public long l02597;
+    public long l02598;
+    public long l02599;
+    public long l02600;
+    public long l02601;
+    public long l02602;
+    public long l02603;
+    public long l02604;
+    public long l02605;
+    public long l02606;
+    public long l02607;
+    public long l02608;
+    public long l02609;
+    public long l02610;
+    public long l02611;
+    public long l02612;
+    public long l02613;
+    public long l02614;
+    public long l02615;
+    public long l02616;
+    public long l02617;
+    public long l02618;
+    public long l02619;
+    public long l02620;
+    public long l02621;
+    public long l02622;
+    public long l02623;
+    public long l02624;
+    public long l02625;
+    public long l02626;
+    public long l02627;
+    public long l02628;
+    public long l02629;
+    public long l02630;
+    public long l02631;
+    public long l02632;
+    public long l02633;
+    public long l02634;
+    public long l02635;
+    public long l02636;
+    public long l02637;
+    public long l02638;
+    public long l02639;
+    public long l02640;
+    public long l02641;
+    public long l02642;
+    public long l02643;
+    public long l02644;
+    public long l02645;
+    public long l02646;
+    public long l02647;
+    public long l02648;
+    public long l02649;
+    public long l02650;
+    public long l02651;
+    public long l02652;
+    public long l02653;
+    public long l02654;
+    public long l02655;
+    public long l02656;
+    public long l02657;
+    public long l02658;
+    public long l02659;
+    public long l02660;
+    public long l02661;
+    public long l02662;
+    public long l02663;
+    public long l02664;
+    public long l02665;
+    public long l02666;
+    public long l02667;
+    public long l02668;
+    public long l02669;
+    public long l02670;
+    public long l02671;
+    public long l02672;
+    public long l02673;
+    public long l02674;
+    public long l02675;
+    public long l02676;
+    public long l02677;
+    public long l02678;
+    public long l02679;
+    public long l02680;
+    public long l02681;
+    public long l02682;
+    public long l02683;
+    public long l02684;
+    public long l02685;
+    public long l02686;
+    public long l02687;
+    public long l02688;
+    public long l02689;
+    public long l02690;
+    public long l02691;
+    public long l02692;
+    public long l02693;
+    public long l02694;
+    public long l02695;
+    public long l02696;
+    public long l02697;
+    public long l02698;
+    public long l02699;
+    public long l02700;
+    public long l02701;
+    public long l02702;
+    public long l02703;
+    public long l02704;
+    public long l02705;
+    public long l02706;
+    public long l02707;
+    public long l02708;
+    public long l02709;
+    public long l02710;
+    public long l02711;
+    public long l02712;
+    public long l02713;
+    public long l02714;
+    public long l02715;
+    public long l02716;
+    public long l02717;
+    public long l02718;
+    public long l02719;
+    public long l02720;
+    public long l02721;
+    public long l02722;
+    public long l02723;
+    public long l02724;
+    public long l02725;
+    public long l02726;
+    public long l02727;
+    public long l02728;
+    public long l02729;
+    public long l02730;
+    public long l02731;
+    public long l02732;
+    public long l02733;
+    public long l02734;
+    public long l02735;
+    public long l02736;
+    public long l02737;
+    public long l02738;
+    public long l02739;
+    public long l02740;
+    public long l02741;
+    public long l02742;
+    public long l02743;
+    public long l02744;
+    public long l02745;
+    public long l02746;
+    public long l02747;
+    public long l02748;
+    public long l02749;
+    public long l02750;
+    public long l02751;
+    public long l02752;
+    public long l02753;
+    public long l02754;
+    public long l02755;
+    public long l02756;
+    public long l02757;
+    public long l02758;
+    public long l02759;
+    public long l02760;
+    public long l02761;
+    public long l02762;
+    public long l02763;
+    public long l02764;
+    public long l02765;
+    public long l02766;
+    public long l02767;
+    public long l02768;
+    public long l02769;
+    public long l02770;
+    public long l02771;
+    public long l02772;
+    public long l02773;
+    public long l02774;
+    public long l02775;
+    public long l02776;
+    public long l02777;
+    public long l02778;
+    public long l02779;
+    public long l02780;
+    public long l02781;
+    public long l02782;
+    public long l02783;
+    public long l02784;
+    public long l02785;
+    public long l02786;
+    public long l02787;
+    public long l02788;
+    public long l02789;
+    public long l02790;
+    public long l02791;
+    public long l02792;
+    public long l02793;
+    public long l02794;
+    public long l02795;
+    public long l02796;
+    public long l02797;
+    public long l02798;
+    public long l02799;
+    public long l02800;
+    public long l02801;
+    public long l02802;
+    public long l02803;
+    public long l02804;
+    public long l02805;
+    public long l02806;
+    public long l02807;
+    public long l02808;
+    public long l02809;
+    public long l02810;
+    public long l02811;
+    public long l02812;
+    public long l02813;
+    public long l02814;
+    public long l02815;
+    public long l02816;
+    public long l02817;
+    public long l02818;
+    public long l02819;
+    public long l02820;
+    public long l02821;
+    public long l02822;
+    public long l02823;
+    public long l02824;
+    public long l02825;
+    public long l02826;
+    public long l02827;
+    public long l02828;
+    public long l02829;
+    public long l02830;
+    public long l02831;
+    public long l02832;
+    public long l02833;
+    public long l02834;
+    public long l02835;
+    public long l02836;
+    public long l02837;
+    public long l02838;
+    public long l02839;
+    public long l02840;
+    public long l02841;
+    public long l02842;
+    public long l02843;
+    public long l02844;
+    public long l02845;
+    public long l02846;
+    public long l02847;
+    public long l02848;
+    public long l02849;
+    public long l02850;
+    public long l02851;
+    public long l02852;
+    public long l02853;
+    public long l02854;
+    public long l02855;
+    public long l02856;
+    public long l02857;
+    public long l02858;
+    public long l02859;
+    public long l02860;
+    public long l02861;
+    public long l02862;
+    public long l02863;
+    public long l02864;
+    public long l02865;
+    public long l02866;
+    public long l02867;
+    public long l02868;
+    public long l02869;
+    public long l02870;
+    public long l02871;
+    public long l02872;
+    public long l02873;
+    public long l02874;
+    public long l02875;
+    public long l02876;
+    public long l02877;
+    public long l02878;
+    public long l02879;
+    public long l02880;
+    public long l02881;
+    public long l02882;
+    public long l02883;
+    public long l02884;
+    public long l02885;
+    public long l02886;
+    public long l02887;
+    public long l02888;
+    public long l02889;
+    public long l02890;
+    public long l02891;
+    public long l02892;
+    public long l02893;
+    public long l02894;
+    public long l02895;
+    public long l02896;
+    public long l02897;
+    public long l02898;
+    public long l02899;
+    public long l02900;
+    public long l02901;
+    public long l02902;
+    public long l02903;
+    public long l02904;
+    public long l02905;
+    public long l02906;
+    public long l02907;
+    public long l02908;
+    public long l02909;
+    public long l02910;
+    public long l02911;
+    public long l02912;
+    public long l02913;
+    public long l02914;
+    public long l02915;
+    public long l02916;
+    public long l02917;
+    public long l02918;
+    public long l02919;
+    public long l02920;
+    public long l02921;
+    public long l02922;
+    public long l02923;
+    public long l02924;
+    public long l02925;
+    public long l02926;
+    public long l02927;
+    public long l02928;
+    public long l02929;
+    public long l02930;
+    public long l02931;
+    public long l02932;
+    public long l02933;
+    public long l02934;
+    public long l02935;
+    public long l02936;
+    public long l02937;
+    public long l02938;
+    public long l02939;
+    public long l02940;
+    public long l02941;
+    public long l02942;
+    public long l02943;
+    public long l02944;
+    public long l02945;
+    public long l02946;
+    public long l02947;
+    public long l02948;
+    public long l02949;
+    public long l02950;
+    public long l02951;
+    public long l02952;
+    public long l02953;
+    public long l02954;
+    public long l02955;
+    public long l02956;
+    public long l02957;
+    public long l02958;
+    public long l02959;
+    public long l02960;
+    public long l02961;
+    public long l02962;
+    public long l02963;
+    public long l02964;
+    public long l02965;
+    public long l02966;
+    public long l02967;
+    public long l02968;
+    public long l02969;
+    public long l02970;
+    public long l02971;
+    public long l02972;
+    public long l02973;
+    public long l02974;
+    public long l02975;
+    public long l02976;
+    public long l02977;
+    public long l02978;
+    public long l02979;
+    public long l02980;
+    public long l02981;
+    public long l02982;
+    public long l02983;
+    public long l02984;
+    public long l02985;
+    public long l02986;
+    public long l02987;
+    public long l02988;
+    public long l02989;
+    public long l02990;
+    public long l02991;
+    public long l02992;
+    public long l02993;
+    public long l02994;
+    public long l02995;
+    public long l02996;
+    public long l02997;
+    public long l02998;
+    public long l02999;
+    public long l03000;
+    public long l03001;
+    public long l03002;
+    public long l03003;
+    public long l03004;
+    public long l03005;
+    public long l03006;
+    public long l03007;
+    public long l03008;
+    public long l03009;
+    public long l03010;
+    public long l03011;
+    public long l03012;
+    public long l03013;
+    public long l03014;
+    public long l03015;
+    public long l03016;
+    public long l03017;
+    public long l03018;
+    public long l03019;
+    public long l03020;
+    public long l03021;
+    public long l03022;
+    public long l03023;
+    public long l03024;
+    public long l03025;
+    public long l03026;
+    public long l03027;
+    public long l03028;
+    public long l03029;
+    public long l03030;
+    public long l03031;
+    public long l03032;
+    public long l03033;
+    public long l03034;
+    public long l03035;
+    public long l03036;
+    public long l03037;
+    public long l03038;
+    public long l03039;
+    public long l03040;
+    public long l03041;
+    public long l03042;
+    public long l03043;
+    public long l03044;
+    public long l03045;
+    public long l03046;
+    public long l03047;
+    public long l03048;
+    public long l03049;
+    public long l03050;
+    public long l03051;
+    public long l03052;
+    public long l03053;
+    public long l03054;
+    public long l03055;
+    public long l03056;
+    public long l03057;
+    public long l03058;
+    public long l03059;
+    public long l03060;
+    public long l03061;
+    public long l03062;
+    public long l03063;
+    public long l03064;
+    public long l03065;
+    public long l03066;
+    public long l03067;
+    public long l03068;
+    public long l03069;
+    public long l03070;
+    public long l03071;
+    public long l03072;
+    public long l03073;
+    public long l03074;
+    public long l03075;
+    public long l03076;
+    public long l03077;
+    public long l03078;
+    public long l03079;
+    public long l03080;
+    public long l03081;
+    public long l03082;
+    public long l03083;
+    public long l03084;
+    public long l03085;
+    public long l03086;
+    public long l03087;
+    public long l03088;
+    public long l03089;
+    public long l03090;
+    public long l03091;
+    public long l03092;
+    public long l03093;
+    public long l03094;
+    public long l03095;
+    public long l03096;
+    public long l03097;
+    public long l03098;
+    public long l03099;
+    public long l03100;
+    public long l03101;
+    public long l03102;
+    public long l03103;
+    public long l03104;
+    public long l03105;
+    public long l03106;
+    public long l03107;
+    public long l03108;
+    public long l03109;
+    public long l03110;
+    public long l03111;
+    public long l03112;
+    public long l03113;
+    public long l03114;
+    public long l03115;
+    public long l03116;
+    public long l03117;
+    public long l03118;
+    public long l03119;
+    public long l03120;
+    public long l03121;
+    public long l03122;
+    public long l03123;
+    public long l03124;
+    public long l03125;
+    public long l03126;
+    public long l03127;
+    public long l03128;
+    public long l03129;
+    public long l03130;
+    public long l03131;
+    public long l03132;
+    public long l03133;
+    public long l03134;
+    public long l03135;
+    public long l03136;
+    public long l03137;
+    public long l03138;
+    public long l03139;
+    public long l03140;
+    public long l03141;
+    public long l03142;
+    public long l03143;
+    public long l03144;
+    public long l03145;
+    public long l03146;
+    public long l03147;
+    public long l03148;
+    public long l03149;
+    public long l03150;
+    public long l03151;
+    public long l03152;
+    public long l03153;
+    public long l03154;
+    public long l03155;
+    public long l03156;
+    public long l03157;
+    public long l03158;
+    public long l03159;
+    public long l03160;
+    public long l03161;
+    public long l03162;
+    public long l03163;
+    public long l03164;
+    public long l03165;
+    public long l03166;
+    public long l03167;
+    public long l03168;
+    public long l03169;
+    public long l03170;
+    public long l03171;
+    public long l03172;
+    public long l03173;
+    public long l03174;
+    public long l03175;
+    public long l03176;
+    public long l03177;
+    public long l03178;
+    public long l03179;
+    public long l03180;
+    public long l03181;
+    public long l03182;
+    public long l03183;
+    public long l03184;
+    public long l03185;
+    public long l03186;
+    public long l03187;
+    public long l03188;
+    public long l03189;
+    public long l03190;
+    public long l03191;
+    public long l03192;
+    public long l03193;
+    public long l03194;
+    public long l03195;
+    public long l03196;
+    public long l03197;
+    public long l03198;
+    public long l03199;
+    public long l03200;
+    public long l03201;
+    public long l03202;
+    public long l03203;
+    public long l03204;
+    public long l03205;
+    public long l03206;
+    public long l03207;
+    public long l03208;
+    public long l03209;
+    public long l03210;
+    public long l03211;
+    public long l03212;
+    public long l03213;
+    public long l03214;
+    public long l03215;
+    public long l03216;
+    public long l03217;
+    public long l03218;
+    public long l03219;
+    public long l03220;
+    public long l03221;
+    public long l03222;
+    public long l03223;
+    public long l03224;
+    public long l03225;
+    public long l03226;
+    public long l03227;
+    public long l03228;
+    public long l03229;
+    public long l03230;
+    public long l03231;
+    public long l03232;
+    public long l03233;
+    public long l03234;
+    public long l03235;
+    public long l03236;
+    public long l03237;
+    public long l03238;
+    public long l03239;
+    public long l03240;
+    public long l03241;
+    public long l03242;
+    public long l03243;
+    public long l03244;
+    public long l03245;
+    public long l03246;
+    public long l03247;
+    public long l03248;
+    public long l03249;
+    public long l03250;
+    public long l03251;
+    public long l03252;
+    public long l03253;
+    public long l03254;
+    public long l03255;
+    public long l03256;
+    public long l03257;
+    public long l03258;
+    public long l03259;
+    public long l03260;
+    public long l03261;
+    public long l03262;
+    public long l03263;
+    public long l03264;
+    public long l03265;
+    public long l03266;
+    public long l03267;
+    public long l03268;
+    public long l03269;
+    public long l03270;
+    public long l03271;
+    public long l03272;
+    public long l03273;
+    public long l03274;
+    public long l03275;
+    public long l03276;
+    public long l03277;
+    public long l03278;
+    public long l03279;
+    public long l03280;
+    public long l03281;
+    public long l03282;
+    public long l03283;
+    public long l03284;
+    public long l03285;
+    public long l03286;
+    public long l03287;
+    public long l03288;
+    public long l03289;
+    public long l03290;
+    public long l03291;
+    public long l03292;
+    public long l03293;
+    public long l03294;
+    public long l03295;
+    public long l03296;
+    public long l03297;
+    public long l03298;
+    public long l03299;
+    public long l03300;
+    public long l03301;
+    public long l03302;
+    public long l03303;
+    public long l03304;
+    public long l03305;
+    public long l03306;
+    public long l03307;
+    public long l03308;
+    public long l03309;
+    public long l03310;
+    public long l03311;
+    public long l03312;
+    public long l03313;
+    public long l03314;
+    public long l03315;
+    public long l03316;
+    public long l03317;
+    public long l03318;
+    public long l03319;
+    public long l03320;
+    public long l03321;
+    public long l03322;
+    public long l03323;
+    public long l03324;
+    public long l03325;
+    public long l03326;
+    public long l03327;
+    public long l03328;
+    public long l03329;
+    public long l03330;
+    public long l03331;
+    public long l03332;
+    public long l03333;
+    public long l03334;
+    public long l03335;
+    public long l03336;
+    public long l03337;
+    public long l03338;
+    public long l03339;
+    public long l03340;
+    public long l03341;
+    public long l03342;
+    public long l03343;
+    public long l03344;
+    public long l03345;
+    public long l03346;
+    public long l03347;
+    public long l03348;
+    public long l03349;
+    public long l03350;
+    public long l03351;
+    public long l03352;
+    public long l03353;
+    public long l03354;
+    public long l03355;
+    public long l03356;
+    public long l03357;
+    public long l03358;
+    public long l03359;
+    public long l03360;
+    public long l03361;
+    public long l03362;
+    public long l03363;
+    public long l03364;
+    public long l03365;
+    public long l03366;
+    public long l03367;
+    public long l03368;
+    public long l03369;
+    public long l03370;
+    public long l03371;
+    public long l03372;
+    public long l03373;
+    public long l03374;
+    public long l03375;
+    public long l03376;
+    public long l03377;
+    public long l03378;
+    public long l03379;
+    public long l03380;
+    public long l03381;
+    public long l03382;
+    public long l03383;
+    public long l03384;
+    public long l03385;
+    public long l03386;
+    public long l03387;
+    public long l03388;
+    public long l03389;
+    public long l03390;
+    public long l03391;
+    public long l03392;
+    public long l03393;
+    public long l03394;
+    public long l03395;
+    public long l03396;
+    public long l03397;
+    public long l03398;
+    public long l03399;
+    public long l03400;
+    public long l03401;
+    public long l03402;
+    public long l03403;
+    public long l03404;
+    public long l03405;
+    public long l03406;
+    public long l03407;
+    public long l03408;
+    public long l03409;
+    public long l03410;
+    public long l03411;
+    public long l03412;
+    public long l03413;
+    public long l03414;
+    public long l03415;
+    public long l03416;
+    public long l03417;
+    public long l03418;
+    public long l03419;
+    public long l03420;
+    public long l03421;
+    public long l03422;
+    public long l03423;
+    public long l03424;
+    public long l03425;
+    public long l03426;
+    public long l03427;
+    public long l03428;
+    public long l03429;
+    public long l03430;
+    public long l03431;
+    public long l03432;
+    public long l03433;
+    public long l03434;
+    public long l03435;
+    public long l03436;
+    public long l03437;
+    public long l03438;
+    public long l03439;
+    public long l03440;
+    public long l03441;
+    public long l03442;
+    public long l03443;
+    public long l03444;
+    public long l03445;
+    public long l03446;
+    public long l03447;
+    public long l03448;
+    public long l03449;
+    public long l03450;
+    public long l03451;
+    public long l03452;
+    public long l03453;
+    public long l03454;
+    public long l03455;
+    public long l03456;
+    public long l03457;
+    public long l03458;
+    public long l03459;
+    public long l03460;
+    public long l03461;
+    public long l03462;
+    public long l03463;
+    public long l03464;
+    public long l03465;
+    public long l03466;
+    public long l03467;
+    public long l03468;
+    public long l03469;
+    public long l03470;
+    public long l03471;
+    public long l03472;
+    public long l03473;
+    public long l03474;
+    public long l03475;
+    public long l03476;
+    public long l03477;
+    public long l03478;
+    public long l03479;
+    public long l03480;
+    public long l03481;
+    public long l03482;
+    public long l03483;
+    public long l03484;
+    public long l03485;
+    public long l03486;
+    public long l03487;
+    public long l03488;
+    public long l03489;
+    public long l03490;
+    public long l03491;
+    public long l03492;
+    public long l03493;
+    public long l03494;
+    public long l03495;
+    public long l03496;
+    public long l03497;
+    public long l03498;
+    public long l03499;
+    public long l03500;
+    public long l03501;
+    public long l03502;
+    public long l03503;
+    public long l03504;
+    public long l03505;
+    public long l03506;
+    public long l03507;
+    public long l03508;
+    public long l03509;
+    public long l03510;
+    public long l03511;
+    public long l03512;
+    public long l03513;
+    public long l03514;
+    public long l03515;
+    public long l03516;
+    public long l03517;
+    public long l03518;
+    public long l03519;
+    public long l03520;
+    public long l03521;
+    public long l03522;
+    public long l03523;
+    public long l03524;
+    public long l03525;
+    public long l03526;
+    public long l03527;
+    public long l03528;
+    public long l03529;
+    public long l03530;
+    public long l03531;
+    public long l03532;
+    public long l03533;
+    public long l03534;
+    public long l03535;
+    public long l03536;
+    public long l03537;
+    public long l03538;
+    public long l03539;
+    public long l03540;
+    public long l03541;
+    public long l03542;
+    public long l03543;
+    public long l03544;
+    public long l03545;
+    public long l03546;
+    public long l03547;
+    public long l03548;
+    public long l03549;
+    public long l03550;
+    public long l03551;
+    public long l03552;
+    public long l03553;
+    public long l03554;
+    public long l03555;
+    public long l03556;
+    public long l03557;
+    public long l03558;
+    public long l03559;
+    public long l03560;
+    public long l03561;
+    public long l03562;
+    public long l03563;
+    public long l03564;
+    public long l03565;
+    public long l03566;
+    public long l03567;
+    public long l03568;
+    public long l03569;
+    public long l03570;
+    public long l03571;
+    public long l03572;
+    public long l03573;
+    public long l03574;
+    public long l03575;
+    public long l03576;
+    public long l03577;
+    public long l03578;
+    public long l03579;
+    public long l03580;
+    public long l03581;
+    public long l03582;
+    public long l03583;
+    public long l03584;
+    public long l03585;
+    public long l03586;
+    public long l03587;
+    public long l03588;
+    public long l03589;
+    public long l03590;
+    public long l03591;
+    public long l03592;
+    public long l03593;
+    public long l03594;
+    public long l03595;
+    public long l03596;
+    public long l03597;
+    public long l03598;
+    public long l03599;
+    public long l03600;
+    public long l03601;
+    public long l03602;
+    public long l03603;
+    public long l03604;
+    public long l03605;
+    public long l03606;
+    public long l03607;
+    public long l03608;
+    public long l03609;
+    public long l03610;
+    public long l03611;
+    public long l03612;
+    public long l03613;
+    public long l03614;
+    public long l03615;
+    public long l03616;
+    public long l03617;
+    public long l03618;
+    public long l03619;
+    public long l03620;
+    public long l03621;
+    public long l03622;
+    public long l03623;
+    public long l03624;
+    public long l03625;
+    public long l03626;
+    public long l03627;
+    public long l03628;
+    public long l03629;
+    public long l03630;
+    public long l03631;
+    public long l03632;
+    public long l03633;
+    public long l03634;
+    public long l03635;
+    public long l03636;
+    public long l03637;
+    public long l03638;
+    public long l03639;
+    public long l03640;
+    public long l03641;
+    public long l03642;
+    public long l03643;
+    public long l03644;
+    public long l03645;
+    public long l03646;
+    public long l03647;
+    public long l03648;
+    public long l03649;
+    public long l03650;
+    public long l03651;
+    public long l03652;
+    public long l03653;
+    public long l03654;
+    public long l03655;
+    public long l03656;
+    public long l03657;
+    public long l03658;
+    public long l03659;
+    public long l03660;
+    public long l03661;
+    public long l03662;
+    public long l03663;
+    public long l03664;
+    public long l03665;
+    public long l03666;
+    public long l03667;
+    public long l03668;
+    public long l03669;
+    public long l03670;
+    public long l03671;
+    public long l03672;
+    public long l03673;
+    public long l03674;
+    public long l03675;
+    public long l03676;
+    public long l03677;
+    public long l03678;
+    public long l03679;
+    public long l03680;
+    public long l03681;
+    public long l03682;
+    public long l03683;
+    public long l03684;
+    public long l03685;
+    public long l03686;
+    public long l03687;
+    public long l03688;
+    public long l03689;
+    public long l03690;
+    public long l03691;
+    public long l03692;
+    public long l03693;
+    public long l03694;
+    public long l03695;
+    public long l03696;
+    public long l03697;
+    public long l03698;
+    public long l03699;
+    public long l03700;
+    public long l03701;
+    public long l03702;
+    public long l03703;
+    public long l03704;
+    public long l03705;
+    public long l03706;
+    public long l03707;
+    public long l03708;
+    public long l03709;
+    public long l03710;
+    public long l03711;
+    public long l03712;
+    public long l03713;
+    public long l03714;
+    public long l03715;
+    public long l03716;
+    public long l03717;
+    public long l03718;
+    public long l03719;
+    public long l03720;
+    public long l03721;
+    public long l03722;
+    public long l03723;
+    public long l03724;
+    public long l03725;
+    public long l03726;
+    public long l03727;
+    public long l03728;
+    public long l03729;
+    public long l03730;
+    public long l03731;
+    public long l03732;
+    public long l03733;
+    public long l03734;
+    public long l03735;
+    public long l03736;
+    public long l03737;
+    public long l03738;
+    public long l03739;
+    public long l03740;
+    public long l03741;
+    public long l03742;
+    public long l03743;
+    public long l03744;
+    public long l03745;
+    public long l03746;
+    public long l03747;
+    public long l03748;
+    public long l03749;
+    public long l03750;
+    public long l03751;
+    public long l03752;
+    public long l03753;
+    public long l03754;
+    public long l03755;
+    public long l03756;
+    public long l03757;
+    public long l03758;
+    public long l03759;
+    public long l03760;
+    public long l03761;
+    public long l03762;
+    public long l03763;
+    public long l03764;
+    public long l03765;
+    public long l03766;
+    public long l03767;
+    public long l03768;
+    public long l03769;
+    public long l03770;
+    public long l03771;
+    public long l03772;
+    public long l03773;
+    public long l03774;
+    public long l03775;
+    public long l03776;
+    public long l03777;
+    public long l03778;
+    public long l03779;
+    public long l03780;
+    public long l03781;
+    public long l03782;
+    public long l03783;
+    public long l03784;
+    public long l03785;
+    public long l03786;
+    public long l03787;
+    public long l03788;
+    public long l03789;
+    public long l03790;
+    public long l03791;
+    public long l03792;
+    public long l03793;
+    public long l03794;
+    public long l03795;
+    public long l03796;
+    public long l03797;
+    public long l03798;
+    public long l03799;
+    public long l03800;
+    public long l03801;
+    public long l03802;
+    public long l03803;
+    public long l03804;
+    public long l03805;
+    public long l03806;
+    public long l03807;
+    public long l03808;
+    public long l03809;
+    public long l03810;
+    public long l03811;
+    public long l03812;
+    public long l03813;
+    public long l03814;
+    public long l03815;
+    public long l03816;
+    public long l03817;
+    public long l03818;
+    public long l03819;
+    public long l03820;
+    public long l03821;
+    public long l03822;
+    public long l03823;
+    public long l03824;
+    public long l03825;
+    public long l03826;
+    public long l03827;
+    public long l03828;
+    public long l03829;
+    public long l03830;
+    public long l03831;
+    public long l03832;
+    public long l03833;
+    public long l03834;
+    public long l03835;
+    public long l03836;
+    public long l03837;
+    public long l03838;
+    public long l03839;
+    public long l03840;
+    public long l03841;
+    public long l03842;
+    public long l03843;
+    public long l03844;
+    public long l03845;
+    public long l03846;
+    public long l03847;
+    public long l03848;
+    public long l03849;
+    public long l03850;
+    public long l03851;
+    public long l03852;
+    public long l03853;
+    public long l03854;
+    public long l03855;
+    public long l03856;
+    public long l03857;
+    public long l03858;
+    public long l03859;
+    public long l03860;
+    public long l03861;
+    public long l03862;
+    public long l03863;
+    public long l03864;
+    public long l03865;
+    public long l03866;
+    public long l03867;
+    public long l03868;
+    public long l03869;
+    public long l03870;
+    public long l03871;
+    public long l03872;
+    public long l03873;
+    public long l03874;
+    public long l03875;
+    public long l03876;
+    public long l03877;
+    public long l03878;
+    public long l03879;
+    public long l03880;
+    public long l03881;
+    public long l03882;
+    public long l03883;
+    public long l03884;
+    public long l03885;
+    public long l03886;
+    public long l03887;
+    public long l03888;
+    public long l03889;
+    public long l03890;
+    public long l03891;
+    public long l03892;
+    public long l03893;
+    public long l03894;
+    public long l03895;
+    public long l03896;
+    public long l03897;
+    public long l03898;
+    public long l03899;
+    public long l03900;
+    public long l03901;
+    public long l03902;
+    public long l03903;
+    public long l03904;
+    public long l03905;
+    public long l03906;
+    public long l03907;
+    public long l03908;
+    public long l03909;
+    public long l03910;
+    public long l03911;
+    public long l03912;
+    public long l03913;
+    public long l03914;
+    public long l03915;
+    public long l03916;
+    public long l03917;
+    public long l03918;
+    public long l03919;
+    public long l03920;
+    public long l03921;
+    public long l03922;
+    public long l03923;
+    public long l03924;
+    public long l03925;
+    public long l03926;
+    public long l03927;
+    public long l03928;
+    public long l03929;
+    public long l03930;
+    public long l03931;
+    public long l03932;
+    public long l03933;
+    public long l03934;
+    public long l03935;
+    public long l03936;
+    public long l03937;
+    public long l03938;
+    public long l03939;
+    public long l03940;
+    public long l03941;
+    public long l03942;
+    public long l03943;
+    public long l03944;
+    public long l03945;
+    public long l03946;
+    public long l03947;
+    public long l03948;
+    public long l03949;
+    public long l03950;
+    public long l03951;
+    public long l03952;
+    public long l03953;
+    public long l03954;
+    public long l03955;
+    public long l03956;
+    public long l03957;
+    public long l03958;
+    public long l03959;
+    public long l03960;
+    public long l03961;
+    public long l03962;
+    public long l03963;
+    public long l03964;
+    public long l03965;
+    public long l03966;
+    public long l03967;
+    public long l03968;
+    public long l03969;
+    public long l03970;
+    public long l03971;
+    public long l03972;
+    public long l03973;
+    public long l03974;
+    public long l03975;
+    public long l03976;
+    public long l03977;
+    public long l03978;
+    public long l03979;
+    public long l03980;
+    public long l03981;
+    public long l03982;
+    public long l03983;
+    public long l03984;
+    public long l03985;
+    public long l03986;
+    public long l03987;
+    public long l03988;
+    public long l03989;
+    public long l03990;
+    public long l03991;
+    public long l03992;
+    public long l03993;
+    public long l03994;
+    public long l03995;
+    public long l03996;
+    public long l03997;
+    public long l03998;
+    public long l03999;
+    public long l04000;
+    public long l04001;
+    public long l04002;
+    public long l04003;
+    public long l04004;
+    public long l04005;
+    public long l04006;
+    public long l04007;
+    public long l04008;
+    public long l04009;
+    public long l04010;
+    public long l04011;
+    public long l04012;
+    public long l04013;
+    public long l04014;
+    public long l04015;
+    public long l04016;
+    public long l04017;
+    public long l04018;
+    public long l04019;
+    public long l04020;
+    public long l04021;
+    public long l04022;
+    public long l04023;
+    public long l04024;
+    public long l04025;
+    public long l04026;
+    public long l04027;
+    public long l04028;
+    public long l04029;
+    public long l04030;
+    public long l04031;
+    public long l04032;
+    public long l04033;
+    public long l04034;
+    public long l04035;
+    public long l04036;
+    public long l04037;
+    public long l04038;
+    public long l04039;
+    public long l04040;
+    public long l04041;
+    public long l04042;
+    public long l04043;
+    public long l04044;
+    public long l04045;
+    public long l04046;
+    public long l04047;
+    public long l04048;
+    public long l04049;
+    public long l04050;
+    public long l04051;
+    public long l04052;
+    public long l04053;
+    public long l04054;
+    public long l04055;
+    public long l04056;
+    public long l04057;
+    public long l04058;
+    public long l04059;
+    public long l04060;
+    public long l04061;
+    public long l04062;
+    public long l04063;
+    public long l04064;
+    public long l04065;
+    public long l04066;
+    public long l04067;
+    public long l04068;
+    public long l04069;
+    public long l04070;
+    public long l04071;
+    public long l04072;
+    public long l04073;
+    public long l04074;
+    public long l04075;
+    public long l04076;
+    public long l04077;
+    public long l04078;
+    public long l04079;
+    public long l04080;
+    public long l04081;
+    public long l04082;
+    public long l04083;
+    public long l04084;
+    public long l04085;
+    public long l04086;
+    public long l04087;
+    public long l04088;
+    public long l04089;
+    public long l04090;
+    public long l04091;
+    public long l04092;
+    public long l04093;
+    public long l04094;
+    public long l04095;
+    public long l04096;
+    public long l04097;
+    public long l04098;
+    public long l04099;
+    public long l04100;
+    public long l04101;
+    public long l04102;
+    public long l04103;
+    public long l04104;
+    public long l04105;
+    public long l04106;
+    public long l04107;
+    public long l04108;
+    public long l04109;
+    public long l04110;
+    public long l04111;
+    public long l04112;
+    public long l04113;
+    public long l04114;
+    public long l04115;
+    public long l04116;
+    public long l04117;
+    public long l04118;
+    public long l04119;
+    public long l04120;
+    public long l04121;
+    public long l04122;
+    public long l04123;
+    public long l04124;
+    public long l04125;
+    public long l04126;
+    public long l04127;
+    public long l04128;
+    public long l04129;
+    public long l04130;
+    public long l04131;
+    public long l04132;
+    public long l04133;
+    public long l04134;
+    public long l04135;
+    public long l04136;
+    public long l04137;
+    public long l04138;
+    public long l04139;
+    public long l04140;
+    public long l04141;
+    public long l04142;
+    public long l04143;
+    public long l04144;
+    public long l04145;
+    public long l04146;
+    public long l04147;
+    public long l04148;
+    public long l04149;
+    public long l04150;
+    public long l04151;
+    public long l04152;
+    public long l04153;
+    public long l04154;
+    public long l04155;
+    public long l04156;
+    public long l04157;
+    public long l04158;
+    public long l04159;
+    public long l04160;
+    public long l04161;
+    public long l04162;
+    public long l04163;
+    public long l04164;
+    public long l04165;
+    public long l04166;
+    public long l04167;
+    public long l04168;
+    public long l04169;
+    public long l04170;
+    public long l04171;
+    public long l04172;
+    public long l04173;
+    public long l04174;
+    public long l04175;
+    public long l04176;
+    public long l04177;
+    public long l04178;
+    public long l04179;
+    public long l04180;
+    public long l04181;
+    public long l04182;
+    public long l04183;
+    public long l04184;
+    public long l04185;
+    public long l04186;
+    public long l04187;
+    public long l04188;
+    public long l04189;
+    public long l04190;
+    public long l04191;
+    public long l04192;
+    public long l04193;
+    public long l04194;
+    public long l04195;
+    public long l04196;
+    public long l04197;
+    public long l04198;
+    public long l04199;
+    public long l04200;
+    public long l04201;
+    public long l04202;
+    public long l04203;
+    public long l04204;
+    public long l04205;
+    public long l04206;
+    public long l04207;
+    public long l04208;
+    public long l04209;
+    public long l04210;
+    public long l04211;
+    public long l04212;
+    public long l04213;
+    public long l04214;
+    public long l04215;
+    public long l04216;
+    public long l04217;
+    public long l04218;
+    public long l04219;
+    public long l04220;
+    public long l04221;
+    public long l04222;
+    public long l04223;
+    public long l04224;
+    public long l04225;
+    public long l04226;
+    public long l04227;
+    public long l04228;
+    public long l04229;
+    public long l04230;
+    public long l04231;
+    public long l04232;
+    public long l04233;
+    public long l04234;
+    public long l04235;
+    public long l04236;
+    public long l04237;
+    public long l04238;
+    public long l04239;
+    public long l04240;
+    public long l04241;
+    public long l04242;
+    public long l04243;
+    public long l04244;
+    public long l04245;
+    public long l04246;
+    public long l04247;
+    public long l04248;
+    public long l04249;
+    public long l04250;
+    public long l04251;
+    public long l04252;
+    public long l04253;
+    public long l04254;
+    public long l04255;
+    public long l04256;
+    public long l04257;
+    public long l04258;
+    public long l04259;
+    public long l04260;
+    public long l04261;
+    public long l04262;
+    public long l04263;
+    public long l04264;
+    public long l04265;
+    public long l04266;
+    public long l04267;
+    public long l04268;
+    public long l04269;
+    public long l04270;
+    public long l04271;
+    public long l04272;
+    public long l04273;
+    public long l04274;
+    public long l04275;
+    public long l04276;
+    public long l04277;
+    public long l04278;
+    public long l04279;
+    public long l04280;
+    public long l04281;
+    public long l04282;
+    public long l04283;
+    public long l04284;
+    public long l04285;
+    public long l04286;
+    public long l04287;
+    public long l04288;
+    public long l04289;
+    public long l04290;
+    public long l04291;
+    public long l04292;
+    public long l04293;
+    public long l04294;
+    public long l04295;
+    public long l04296;
+    public long l04297;
+    public long l04298;
+    public long l04299;
+    public long l04300;
+    public long l04301;
+    public long l04302;
+    public long l04303;
+    public long l04304;
+    public long l04305;
+    public long l04306;
+    public long l04307;
+    public long l04308;
+    public long l04309;
+    public long l04310;
+    public long l04311;
+    public long l04312;
+    public long l04313;
+    public long l04314;
+    public long l04315;
+    public long l04316;
+    public long l04317;
+    public long l04318;
+    public long l04319;
+    public long l04320;
+    public long l04321;
+    public long l04322;
+    public long l04323;
+    public long l04324;
+    public long l04325;
+    public long l04326;
+    public long l04327;
+    public long l04328;
+    public long l04329;
+    public long l04330;
+    public long l04331;
+    public long l04332;
+    public long l04333;
+    public long l04334;
+    public long l04335;
+    public long l04336;
+    public long l04337;
+    public long l04338;
+    public long l04339;
+    public long l04340;
+    public long l04341;
+    public long l04342;
+    public long l04343;
+    public long l04344;
+    public long l04345;
+    public long l04346;
+    public long l04347;
+    public long l04348;
+    public long l04349;
+    public long l04350;
+    public long l04351;
+    public long l04352;
+    public long l04353;
+    public long l04354;
+    public long l04355;
+    public long l04356;
+    public long l04357;
+    public long l04358;
+    public long l04359;
+    public long l04360;
+    public long l04361;
+    public long l04362;
+    public long l04363;
+    public long l04364;
+    public long l04365;
+    public long l04366;
+    public long l04367;
+    public long l04368;
+    public long l04369;
+    public long l04370;
+    public long l04371;
+    public long l04372;
+    public long l04373;
+    public long l04374;
+    public long l04375;
+    public long l04376;
+    public long l04377;
+    public long l04378;
+    public long l04379;
+    public long l04380;
+    public long l04381;
+    public long l04382;
+    public long l04383;
+    public long l04384;
+    public long l04385;
+    public long l04386;
+    public long l04387;
+    public long l04388;
+    public long l04389;
+    public long l04390;
+    public long l04391;
+    public long l04392;
+    public long l04393;
+    public long l04394;
+    public long l04395;
+    public long l04396;
+    public long l04397;
+    public long l04398;
+    public long l04399;
+    public long l04400;
+    public long l04401;
+    public long l04402;
+    public long l04403;
+    public long l04404;
+    public long l04405;
+    public long l04406;
+    public long l04407;
+    public long l04408;
+    public long l04409;
+    public long l04410;
+    public long l04411;
+    public long l04412;
+    public long l04413;
+    public long l04414;
+    public long l04415;
+    public long l04416;
+    public long l04417;
+    public long l04418;
+    public long l04419;
+    public long l04420;
+    public long l04421;
+    public long l04422;
+    public long l04423;
+    public long l04424;
+    public long l04425;
+    public long l04426;
+    public long l04427;
+    public long l04428;
+    public long l04429;
+    public long l04430;
+    public long l04431;
+    public long l04432;
+    public long l04433;
+    public long l04434;
+    public long l04435;
+    public long l04436;
+    public long l04437;
+    public long l04438;
+    public long l04439;
+    public long l04440;
+    public long l04441;
+    public long l04442;
+    public long l04443;
+    public long l04444;
+    public long l04445;
+    public long l04446;
+    public long l04447;
+    public long l04448;
+    public long l04449;
+    public long l04450;
+    public long l04451;
+    public long l04452;
+    public long l04453;
+    public long l04454;
+    public long l04455;
+    public long l04456;
+    public long l04457;
+    public long l04458;
+    public long l04459;
+    public long l04460;
+    public long l04461;
+    public long l04462;
+    public long l04463;
+    public long l04464;
+    public long l04465;
+    public long l04466;
+    public long l04467;
+    public long l04468;
+    public long l04469;
+    public long l04470;
+    public long l04471;
+    public long l04472;
+    public long l04473;
+    public long l04474;
+    public long l04475;
+    public long l04476;
+    public long l04477;
+    public long l04478;
+    public long l04479;
+    public long l04480;
+    public long l04481;
+    public long l04482;
+    public long l04483;
+    public long l04484;
+    public long l04485;
+    public long l04486;
+    public long l04487;
+    public long l04488;
+    public long l04489;
+    public long l04490;
+    public long l04491;
+    public long l04492;
+    public long l04493;
+    public long l04494;
+    public long l04495;
+    public long l04496;
+    public long l04497;
+    public long l04498;
+    public long l04499;
+    public long l04500;
+    public long l04501;
+    public long l04502;
+    public long l04503;
+    public long l04504;
+    public long l04505;
+    public long l04506;
+    public long l04507;
+    public long l04508;
+    public long l04509;
+    public long l04510;
+    public long l04511;
+    public long l04512;
+    public long l04513;
+    public long l04514;
+    public long l04515;
+    public long l04516;
+    public long l04517;
+    public long l04518;
+    public long l04519;
+    public long l04520;
+    public long l04521;
+    public long l04522;
+    public long l04523;
+    public long l04524;
+    public long l04525;
+    public long l04526;
+    public long l04527;
+    public long l04528;
+    public long l04529;
+    public long l04530;
+    public long l04531;
+    public long l04532;
+    public long l04533;
+    public long l04534;
+    public long l04535;
+    public long l04536;
+    public long l04537;
+    public long l04538;
+    public long l04539;
+    public long l04540;
+    public long l04541;
+    public long l04542;
+    public long l04543;
+    public long l04544;
+    public long l04545;
+    public long l04546;
+    public long l04547;
+    public long l04548;
+    public long l04549;
+    public long l04550;
+    public long l04551;
+    public long l04552;
+    public long l04553;
+    public long l04554;
+    public long l04555;
+    public long l04556;
+    public long l04557;
+    public long l04558;
+    public long l04559;
+    public long l04560;
+    public long l04561;
+    public long l04562;
+    public long l04563;
+    public long l04564;
+    public long l04565;
+    public long l04566;
+    public long l04567;
+    public long l04568;
+    public long l04569;
+    public long l04570;
+    public long l04571;
+    public long l04572;
+    public long l04573;
+    public long l04574;
+    public long l04575;
+    public long l04576;
+    public long l04577;
+    public long l04578;
+    public long l04579;
+    public long l04580;
+    public long l04581;
+    public long l04582;
+    public long l04583;
+    public long l04584;
+    public long l04585;
+    public long l04586;
+    public long l04587;
+    public long l04588;
+    public long l04589;
+    public long l04590;
+    public long l04591;
+    public long l04592;
+    public long l04593;
+    public long l04594;
+    public long l04595;
+    public long l04596;
+    public long l04597;
+    public long l04598;
+    public long l04599;
+    public long l04600;
+    public long l04601;
+    public long l04602;
+    public long l04603;
+    public long l04604;
+    public long l04605;
+    public long l04606;
+    public long l04607;
+    public long l04608;
+    public long l04609;
+    public long l04610;
+    public long l04611;
+    public long l04612;
+    public long l04613;
+    public long l04614;
+    public long l04615;
+    public long l04616;
+    public long l04617;
+    public long l04618;
+    public long l04619;
+    public long l04620;
+    public long l04621;
+    public long l04622;
+    public long l04623;
+    public long l04624;
+    public long l04625;
+    public long l04626;
+    public long l04627;
+    public long l04628;
+    public long l04629;
+    public long l04630;
+    public long l04631;
+    public long l04632;
+    public long l04633;
+    public long l04634;
+    public long l04635;
+    public long l04636;
+    public long l04637;
+    public long l04638;
+    public long l04639;
+    public long l04640;
+    public long l04641;
+    public long l04642;
+    public long l04643;
+    public long l04644;
+    public long l04645;
+    public long l04646;
+    public long l04647;
+    public long l04648;
+    public long l04649;
+    public long l04650;
+    public long l04651;
+    public long l04652;
+    public long l04653;
+    public long l04654;
+    public long l04655;
+    public long l04656;
+    public long l04657;
+    public long l04658;
+    public long l04659;
+    public long l04660;
+    public long l04661;
+    public long l04662;
+    public long l04663;
+    public long l04664;
+    public long l04665;
+    public long l04666;
+    public long l04667;
+    public long l04668;
+    public long l04669;
+    public long l04670;
+    public long l04671;
+    public long l04672;
+    public long l04673;
+    public long l04674;
+    public long l04675;
+    public long l04676;
+    public long l04677;
+    public long l04678;
+    public long l04679;
+    public long l04680;
+    public long l04681;
+    public long l04682;
+    public long l04683;
+    public long l04684;
+    public long l04685;
+    public long l04686;
+    public long l04687;
+    public long l04688;
+    public long l04689;
+    public long l04690;
+    public long l04691;
+    public long l04692;
+    public long l04693;
+    public long l04694;
+    public long l04695;
+    public long l04696;
+    public long l04697;
+    public long l04698;
+    public long l04699;
+    public long l04700;
+    public long l04701;
+    public long l04702;
+    public long l04703;
+    public long l04704;
+    public long l04705;
+    public long l04706;
+    public long l04707;
+    public long l04708;
+    public long l04709;
+    public long l04710;
+    public long l04711;
+    public long l04712;
+    public long l04713;
+    public long l04714;
+    public long l04715;
+    public long l04716;
+    public long l04717;
+    public long l04718;
+    public long l04719;
+    public long l04720;
+    public long l04721;
+    public long l04722;
+    public long l04723;
+    public long l04724;
+    public long l04725;
+    public long l04726;
+    public long l04727;
+    public long l04728;
+    public long l04729;
+    public long l04730;
+    public long l04731;
+    public long l04732;
+    public long l04733;
+    public long l04734;
+    public long l04735;
+    public long l04736;
+    public long l04737;
+    public long l04738;
+    public long l04739;
+    public long l04740;
+    public long l04741;
+    public long l04742;
+    public long l04743;
+    public long l04744;
+    public long l04745;
+    public long l04746;
+    public long l04747;
+    public long l04748;
+    public long l04749;
+    public long l04750;
+    public long l04751;
+    public long l04752;
+    public long l04753;
+    public long l04754;
+    public long l04755;
+    public long l04756;
+    public long l04757;
+    public long l04758;
+    public long l04759;
+    public long l04760;
+    public long l04761;
+    public long l04762;
+    public long l04763;
+    public long l04764;
+    public long l04765;
+    public long l04766;
+    public long l04767;
+    public long l04768;
+    public long l04769;
+    public long l04770;
+    public long l04771;
+    public long l04772;
+    public long l04773;
+    public long l04774;
+    public long l04775;
+    public long l04776;
+    public long l04777;
+    public long l04778;
+    public long l04779;
+    public long l04780;
+    public long l04781;
+    public long l04782;
+    public long l04783;
+    public long l04784;
+    public long l04785;
+    public long l04786;
+    public long l04787;
+    public long l04788;
+    public long l04789;
+    public long l04790;
+    public long l04791;
+    public long l04792;
+    public long l04793;
+    public long l04794;
+    public long l04795;
+    public long l04796;
+    public long l04797;
+    public long l04798;
+    public long l04799;
+    public long l04800;
+    public long l04801;
+    public long l04802;
+    public long l04803;
+    public long l04804;
+    public long l04805;
+    public long l04806;
+    public long l04807;
+    public long l04808;
+    public long l04809;
+    public long l04810;
+    public long l04811;
+    public long l04812;
+    public long l04813;
+    public long l04814;
+    public long l04815;
+    public long l04816;
+    public long l04817;
+    public long l04818;
+    public long l04819;
+    public long l04820;
+    public long l04821;
+    public long l04822;
+    public long l04823;
+    public long l04824;
+    public long l04825;
+    public long l04826;
+    public long l04827;
+    public long l04828;
+    public long l04829;
+    public long l04830;
+    public long l04831;
+    public long l04832;
+    public long l04833;
+    public long l04834;
+    public long l04835;
+    public long l04836;
+    public long l04837;
+    public long l04838;
+    public long l04839;
+    public long l04840;
+    public long l04841;
+    public long l04842;
+    public long l04843;
+    public long l04844;
+    public long l04845;
+    public long l04846;
+    public long l04847;
+    public long l04848;
+    public long l04849;
+    public long l04850;
+    public long l04851;
+    public long l04852;
+    public long l04853;
+    public long l04854;
+    public long l04855;
+    public long l04856;
+    public long l04857;
+    public long l04858;
+    public long l04859;
+    public long l04860;
+    public long l04861;
+    public long l04862;
+    public long l04863;
+    public long l04864;
+    public long l04865;
+    public long l04866;
+    public long l04867;
+    public long l04868;
+    public long l04869;
+    public long l04870;
+    public long l04871;
+    public long l04872;
+    public long l04873;
+    public long l04874;
+    public long l04875;
+    public long l04876;
+    public long l04877;
+    public long l04878;
+    public long l04879;
+    public long l04880;
+    public long l04881;
+    public long l04882;
+    public long l04883;
+    public long l04884;
+    public long l04885;
+    public long l04886;
+    public long l04887;
+    public long l04888;
+    public long l04889;
+    public long l04890;
+    public long l04891;
+    public long l04892;
+    public long l04893;
+    public long l04894;
+    public long l04895;
+    public long l04896;
+    public long l04897;
+    public long l04898;
+    public long l04899;
+    public long l04900;
+    public long l04901;
+    public long l04902;
+    public long l04903;
+    public long l04904;
+    public long l04905;
+    public long l04906;
+    public long l04907;
+    public long l04908;
+    public long l04909;
+    public long l04910;
+    public long l04911;
+    public long l04912;
+    public long l04913;
+    public long l04914;
+    public long l04915;
+    public long l04916;
+    public long l04917;
+    public long l04918;
+    public long l04919;
+    public long l04920;
+    public long l04921;
+    public long l04922;
+    public long l04923;
+    public long l04924;
+    public long l04925;
+    public long l04926;
+    public long l04927;
+    public long l04928;
+    public long l04929;
+    public long l04930;
+    public long l04931;
+    public long l04932;
+    public long l04933;
+    public long l04934;
+    public long l04935;
+    public long l04936;
+    public long l04937;
+    public long l04938;
+    public long l04939;
+    public long l04940;
+    public long l04941;
+    public long l04942;
+    public long l04943;
+    public long l04944;
+    public long l04945;
+    public long l04946;
+    public long l04947;
+    public long l04948;
+    public long l04949;
+    public long l04950;
+    public long l04951;
+    public long l04952;
+    public long l04953;
+    public long l04954;
+    public long l04955;
+    public long l04956;
+    public long l04957;
+    public long l04958;
+    public long l04959;
+    public long l04960;
+    public long l04961;
+    public long l04962;
+    public long l04963;
+    public long l04964;
+    public long l04965;
+    public long l04966;
+    public long l04967;
+    public long l04968;
+    public long l04969;
+    public long l04970;
+    public long l04971;
+    public long l04972;
+    public long l04973;
+    public long l04974;
+    public long l04975;
+    public long l04976;
+    public long l04977;
+    public long l04978;
+    public long l04979;
+    public long l04980;
+    public long l04981;
+    public long l04982;
+    public long l04983;
+    public long l04984;
+    public long l04985;
+    public long l04986;
+    public long l04987;
+    public long l04988;
+    public long l04989;
+    public long l04990;
+    public long l04991;
+    public long l04992;
+    public long l04993;
+    public long l04994;
+    public long l04995;
+    public long l04996;
+    public long l04997;
+    public long l04998;
+    public long l04999;
+    public long l05000;
+    public long l05001;
+    public long l05002;
+    public long l05003;
+    public long l05004;
+    public long l05005;
+    public long l05006;
+    public long l05007;
+    public long l05008;
+    public long l05009;
+    public long l05010;
+    public long l05011;
+    public long l05012;
+    public long l05013;
+    public long l05014;
+    public long l05015;
+    public long l05016;
+    public long l05017;
+    public long l05018;
+    public long l05019;
+    public long l05020;
+    public long l05021;
+    public long l05022;
+    public long l05023;
+    public long l05024;
+    public long l05025;
+    public long l05026;
+    public long l05027;
+    public long l05028;
+    public long l05029;
+    public long l05030;
+    public long l05031;
+    public long l05032;
+    public long l05033;
+    public long l05034;
+    public long l05035;
+    public long l05036;
+    public long l05037;
+    public long l05038;
+    public long l05039;
+    public long l05040;
+    public long l05041;
+    public long l05042;
+    public long l05043;
+    public long l05044;
+    public long l05045;
+    public long l05046;
+    public long l05047;
+    public long l05048;
+    public long l05049;
+    public long l05050;
+    public long l05051;
+    public long l05052;
+    public long l05053;
+    public long l05054;
+    public long l05055;
+    public long l05056;
+    public long l05057;
+    public long l05058;
+    public long l05059;
+    public long l05060;
+    public long l05061;
+    public long l05062;
+    public long l05063;
+    public long l05064;
+    public long l05065;
+    public long l05066;
+    public long l05067;
+    public long l05068;
+    public long l05069;
+    public long l05070;
+    public long l05071;
+    public long l05072;
+    public long l05073;
+    public long l05074;
+    public long l05075;
+    public long l05076;
+    public long l05077;
+    public long l05078;
+    public long l05079;
+    public long l05080;
+    public long l05081;
+    public long l05082;
+    public long l05083;
+    public long l05084;
+    public long l05085;
+    public long l05086;
+    public long l05087;
+    public long l05088;
+    public long l05089;
+    public long l05090;
+    public long l05091;
+    public long l05092;
+    public long l05093;
+    public long l05094;
+    public long l05095;
+    public long l05096;
+    public long l05097;
+    public long l05098;
+    public long l05099;
+    public long l05100;
+    public long l05101;
+    public long l05102;
+    public long l05103;
+    public long l05104;
+    public long l05105;
+    public long l05106;
+    public long l05107;
+    public long l05108;
+    public long l05109;
+    public long l05110;
+    public long l05111;
+    public long l05112;
+    public long l05113;
+    public long l05114;
+    public long l05115;
+    public long l05116;
+    public long l05117;
+    public long l05118;
+    public long l05119;
+    public long l05120;
+    public long l05121;
+    public long l05122;
+    public long l05123;
+    public long l05124;
+    public long l05125;
+    public long l05126;
+    public long l05127;
+    public long l05128;
+    public long l05129;
+    public long l05130;
+    public long l05131;
+    public long l05132;
+    public long l05133;
+    public long l05134;
+    public long l05135;
+    public long l05136;
+    public long l05137;
+    public long l05138;
+    public long l05139;
+    public long l05140;
+    public long l05141;
+    public long l05142;
+    public long l05143;
+    public long l05144;
+    public long l05145;
+    public long l05146;
+    public long l05147;
+    public long l05148;
+    public long l05149;
+    public long l05150;
+    public long l05151;
+    public long l05152;
+    public long l05153;
+    public long l05154;
+    public long l05155;
+    public long l05156;
+    public long l05157;
+    public long l05158;
+    public long l05159;
+    public long l05160;
+    public long l05161;
+    public long l05162;
+    public long l05163;
+    public long l05164;
+    public long l05165;
+    public long l05166;
+    public long l05167;
+    public long l05168;
+    public long l05169;
+    public long l05170;
+    public long l05171;
+    public long l05172;
+    public long l05173;
+    public long l05174;
+    public long l05175;
+    public long l05176;
+    public long l05177;
+    public long l05178;
+    public long l05179;
+    public long l05180;
+    public long l05181;
+    public long l05182;
+    public long l05183;
+    public long l05184;
+    public long l05185;
+    public long l05186;
+    public long l05187;
+    public long l05188;
+    public long l05189;
+    public long l05190;
+    public long l05191;
+    public long l05192;
+    public long l05193;
+    public long l05194;
+    public long l05195;
+    public long l05196;
+    public long l05197;
+    public long l05198;
+    public long l05199;
+    public long l05200;
+    public long l05201;
+    public long l05202;
+    public long l05203;
+    public long l05204;
+    public long l05205;
+    public long l05206;
+    public long l05207;
+    public long l05208;
+    public long l05209;
+    public long l05210;
+    public long l05211;
+    public long l05212;
+    public long l05213;
+    public long l05214;
+    public long l05215;
+    public long l05216;
+    public long l05217;
+    public long l05218;
+    public long l05219;
+    public long l05220;
+    public long l05221;
+    public long l05222;
+    public long l05223;
+    public long l05224;
+    public long l05225;
+    public long l05226;
+    public long l05227;
+    public long l05228;
+    public long l05229;
+    public long l05230;
+    public long l05231;
+    public long l05232;
+    public long l05233;
+    public long l05234;
+    public long l05235;
+    public long l05236;
+    public long l05237;
+    public long l05238;
+    public long l05239;
+    public long l05240;
+    public long l05241;
+    public long l05242;
+    public long l05243;
+    public long l05244;
+    public long l05245;
+    public long l05246;
+    public long l05247;
+    public long l05248;
+    public long l05249;
+    public long l05250;
+    public long l05251;
+    public long l05252;
+    public long l05253;
+    public long l05254;
+    public long l05255;
+    public long l05256;
+    public long l05257;
+    public long l05258;
+    public long l05259;
+    public long l05260;
+    public long l05261;
+    public long l05262;
+    public long l05263;
+    public long l05264;
+    public long l05265;
+    public long l05266;
+    public long l05267;
+    public long l05268;
+    public long l05269;
+    public long l05270;
+    public long l05271;
+    public long l05272;
+    public long l05273;
+    public long l05274;
+    public long l05275;
+    public long l05276;
+    public long l05277;
+    public long l05278;
+    public long l05279;
+    public long l05280;
+    public long l05281;
+    public long l05282;
+    public long l05283;
+    public long l05284;
+    public long l05285;
+    public long l05286;
+    public long l05287;
+    public long l05288;
+    public long l05289;
+    public long l05290;
+    public long l05291;
+    public long l05292;
+    public long l05293;
+    public long l05294;
+    public long l05295;
+    public long l05296;
+    public long l05297;
+    public long l05298;
+    public long l05299;
+    public long l05300;
+    public long l05301;
+    public long l05302;
+    public long l05303;
+    public long l05304;
+    public long l05305;
+    public long l05306;
+    public long l05307;
+    public long l05308;
+    public long l05309;
+    public long l05310;
+    public long l05311;
+    public long l05312;
+    public long l05313;
+    public long l05314;
+    public long l05315;
+    public long l05316;
+    public long l05317;
+    public long l05318;
+    public long l05319;
+    public long l05320;
+    public long l05321;
+    public long l05322;
+    public long l05323;
+    public long l05324;
+    public long l05325;
+    public long l05326;
+    public long l05327;
+    public long l05328;
+    public long l05329;
+    public long l05330;
+    public long l05331;
+    public long l05332;
+    public long l05333;
+    public long l05334;
+    public long l05335;
+    public long l05336;
+    public long l05337;
+    public long l05338;
+    public long l05339;
+    public long l05340;
+    public long l05341;
+    public long l05342;
+    public long l05343;
+    public long l05344;
+    public long l05345;
+    public long l05346;
+    public long l05347;
+    public long l05348;
+    public long l05349;
+    public long l05350;
+    public long l05351;
+    public long l05352;
+    public long l05353;
+    public long l05354;
+    public long l05355;
+    public long l05356;
+    public long l05357;
+    public long l05358;
+    public long l05359;
+    public long l05360;
+    public long l05361;
+    public long l05362;
+    public long l05363;
+    public long l05364;
+    public long l05365;
+    public long l05366;
+    public long l05367;
+    public long l05368;
+    public long l05369;
+    public long l05370;
+    public long l05371;
+    public long l05372;
+    public long l05373;
+    public long l05374;
+    public long l05375;
+    public long l05376;
+    public long l05377;
+    public long l05378;
+    public long l05379;
+    public long l05380;
+    public long l05381;
+    public long l05382;
+    public long l05383;
+    public long l05384;
+    public long l05385;
+    public long l05386;
+    public long l05387;
+    public long l05388;
+    public long l05389;
+    public long l05390;
+    public long l05391;
+    public long l05392;
+    public long l05393;
+    public long l05394;
+    public long l05395;
+    public long l05396;
+    public long l05397;
+    public long l05398;
+    public long l05399;
+    public long l05400;
+    public long l05401;
+    public long l05402;
+    public long l05403;
+    public long l05404;
+    public long l05405;
+    public long l05406;
+    public long l05407;
+    public long l05408;
+    public long l05409;
+    public long l05410;
+    public long l05411;
+    public long l05412;
+    public long l05413;
+    public long l05414;
+    public long l05415;
+    public long l05416;
+    public long l05417;
+    public long l05418;
+    public long l05419;
+    public long l05420;
+    public long l05421;
+    public long l05422;
+    public long l05423;
+    public long l05424;
+    public long l05425;
+    public long l05426;
+    public long l05427;
+    public long l05428;
+    public long l05429;
+    public long l05430;
+    public long l05431;
+    public long l05432;
+    public long l05433;
+    public long l05434;
+    public long l05435;
+    public long l05436;
+    public long l05437;
+    public long l05438;
+    public long l05439;
+    public long l05440;
+    public long l05441;
+    public long l05442;
+    public long l05443;
+    public long l05444;
+    public long l05445;
+    public long l05446;
+    public long l05447;
+    public long l05448;
+    public long l05449;
+    public long l05450;
+    public long l05451;
+    public long l05452;
+    public long l05453;
+    public long l05454;
+    public long l05455;
+    public long l05456;
+    public long l05457;
+    public long l05458;
+    public long l05459;
+    public long l05460;
+    public long l05461;
+    public long l05462;
+    public long l05463;
+    public long l05464;
+    public long l05465;
+    public long l05466;
+    public long l05467;
+    public long l05468;
+    public long l05469;
+    public long l05470;
+    public long l05471;
+    public long l05472;
+    public long l05473;
+    public long l05474;
+    public long l05475;
+    public long l05476;
+    public long l05477;
+    public long l05478;
+    public long l05479;
+    public long l05480;
+    public long l05481;
+    public long l05482;
+    public long l05483;
+    public long l05484;
+    public long l05485;
+    public long l05486;
+    public long l05487;
+    public long l05488;
+    public long l05489;
+    public long l05490;
+    public long l05491;
+    public long l05492;
+    public long l05493;
+    public long l05494;
+    public long l05495;
+    public long l05496;
+    public long l05497;
+    public long l05498;
+    public long l05499;
+    public long l05500;
+    public long l05501;
+    public long l05502;
+    public long l05503;
+    public long l05504;
+    public long l05505;
+    public long l05506;
+    public long l05507;
+    public long l05508;
+    public long l05509;
+    public long l05510;
+    public long l05511;
+    public long l05512;
+    public long l05513;
+    public long l05514;
+    public long l05515;
+    public long l05516;
+    public long l05517;
+    public long l05518;
+    public long l05519;
+    public long l05520;
+    public long l05521;
+    public long l05522;
+    public long l05523;
+    public long l05524;
+    public long l05525;
+    public long l05526;
+    public long l05527;
+    public long l05528;
+    public long l05529;
+    public long l05530;
+    public long l05531;
+    public long l05532;
+    public long l05533;
+    public long l05534;
+    public long l05535;
+    public long l05536;
+    public long l05537;
+    public long l05538;
+    public long l05539;
+    public long l05540;
+    public long l05541;
+    public long l05542;
+    public long l05543;
+    public long l05544;
+    public long l05545;
+    public long l05546;
+    public long l05547;
+    public long l05548;
+    public long l05549;
+    public long l05550;
+    public long l05551;
+    public long l05552;
+    public long l05553;
+    public long l05554;
+    public long l05555;
+    public long l05556;
+    public long l05557;
+    public long l05558;
+    public long l05559;
+    public long l05560;
+    public long l05561;
+    public long l05562;
+    public long l05563;
+    public long l05564;
+    public long l05565;
+    public long l05566;
+    public long l05567;
+    public long l05568;
+    public long l05569;
+    public long l05570;
+    public long l05571;
+    public long l05572;
+    public long l05573;
+    public long l05574;
+    public long l05575;
+    public long l05576;
+    public long l05577;
+    public long l05578;
+    public long l05579;
+    public long l05580;
+    public long l05581;
+    public long l05582;
+    public long l05583;
+    public long l05584;
+    public long l05585;
+    public long l05586;
+    public long l05587;
+    public long l05588;
+    public long l05589;
+    public long l05590;
+    public long l05591;
+    public long l05592;
+    public long l05593;
+    public long l05594;
+    public long l05595;
+    public long l05596;
+    public long l05597;
+    public long l05598;
+    public long l05599;
+    public long l05600;
+    public long l05601;
+    public long l05602;
+    public long l05603;
+    public long l05604;
+    public long l05605;
+    public long l05606;
+    public long l05607;
+    public long l05608;
+    public long l05609;
+    public long l05610;
+    public long l05611;
+    public long l05612;
+    public long l05613;
+    public long l05614;
+    public long l05615;
+    public long l05616;
+    public long l05617;
+    public long l05618;
+    public long l05619;
+    public long l05620;
+    public long l05621;
+    public long l05622;
+    public long l05623;
+    public long l05624;
+    public long l05625;
+    public long l05626;
+    public long l05627;
+    public long l05628;
+    public long l05629;
+    public long l05630;
+    public long l05631;
+    public long l05632;
+    public long l05633;
+    public long l05634;
+    public long l05635;
+    public long l05636;
+    public long l05637;
+    public long l05638;
+    public long l05639;
+    public long l05640;
+    public long l05641;
+    public long l05642;
+    public long l05643;
+    public long l05644;
+    public long l05645;
+    public long l05646;
+    public long l05647;
+    public long l05648;
+    public long l05649;
+    public long l05650;
+    public long l05651;
+    public long l05652;
+    public long l05653;
+    public long l05654;
+    public long l05655;
+    public long l05656;
+    public long l05657;
+    public long l05658;
+    public long l05659;
+    public long l05660;
+    public long l05661;
+    public long l05662;
+    public long l05663;
+    public long l05664;
+    public long l05665;
+    public long l05666;
+    public long l05667;
+    public long l05668;
+    public long l05669;
+    public long l05670;
+    public long l05671;
+    public long l05672;
+    public long l05673;
+    public long l05674;
+    public long l05675;
+    public long l05676;
+    public long l05677;
+    public long l05678;
+    public long l05679;
+    public long l05680;
+    public long l05681;
+    public long l05682;
+    public long l05683;
+    public long l05684;
+    public long l05685;
+    public long l05686;
+    public long l05687;
+    public long l05688;
+    public long l05689;
+    public long l05690;
+    public long l05691;
+    public long l05692;
+    public long l05693;
+    public long l05694;
+    public long l05695;
+    public long l05696;
+    public long l05697;
+    public long l05698;
+    public long l05699;
+    public long l05700;
+    public long l05701;
+    public long l05702;
+    public long l05703;
+    public long l05704;
+    public long l05705;
+    public long l05706;
+    public long l05707;
+    public long l05708;
+    public long l05709;
+    public long l05710;
+    public long l05711;
+    public long l05712;
+    public long l05713;
+    public long l05714;
+    public long l05715;
+    public long l05716;
+    public long l05717;
+    public long l05718;
+    public long l05719;
+    public long l05720;
+    public long l05721;
+    public long l05722;
+    public long l05723;
+    public long l05724;
+    public long l05725;
+    public long l05726;
+    public long l05727;
+    public long l05728;
+    public long l05729;
+    public long l05730;
+    public long l05731;
+    public long l05732;
+    public long l05733;
+    public long l05734;
+    public long l05735;
+    public long l05736;
+    public long l05737;
+    public long l05738;
+    public long l05739;
+    public long l05740;
+    public long l05741;
+    public long l05742;
+    public long l05743;
+    public long l05744;
+    public long l05745;
+    public long l05746;
+    public long l05747;
+    public long l05748;
+    public long l05749;
+    public long l05750;
+    public long l05751;
+    public long l05752;
+    public long l05753;
+    public long l05754;
+    public long l05755;
+    public long l05756;
+    public long l05757;
+    public long l05758;
+    public long l05759;
+    public long l05760;
+    public long l05761;
+    public long l05762;
+    public long l05763;
+    public long l05764;
+    public long l05765;
+    public long l05766;
+    public long l05767;
+    public long l05768;
+    public long l05769;
+    public long l05770;
+    public long l05771;
+    public long l05772;
+    public long l05773;
+    public long l05774;
+    public long l05775;
+    public long l05776;
+    public long l05777;
+    public long l05778;
+    public long l05779;
+    public long l05780;
+    public long l05781;
+    public long l05782;
+    public long l05783;
+    public long l05784;
+    public long l05785;
+    public long l05786;
+    public long l05787;
+    public long l05788;
+    public long l05789;
+    public long l05790;
+    public long l05791;
+    public long l05792;
+    public long l05793;
+    public long l05794;
+    public long l05795;
+    public long l05796;
+    public long l05797;
+    public long l05798;
+    public long l05799;
+    public long l05800;
+    public long l05801;
+    public long l05802;
+    public long l05803;
+    public long l05804;
+    public long l05805;
+    public long l05806;
+    public long l05807;
+    public long l05808;
+    public long l05809;
+    public long l05810;
+    public long l05811;
+    public long l05812;
+    public long l05813;
+    public long l05814;
+    public long l05815;
+    public long l05816;
+    public long l05817;
+    public long l05818;
+    public long l05819;
+    public long l05820;
+    public long l05821;
+    public long l05822;
+    public long l05823;
+    public long l05824;
+    public long l05825;
+    public long l05826;
+    public long l05827;
+    public long l05828;
+    public long l05829;
+    public long l05830;
+    public long l05831;
+    public long l05832;
+    public long l05833;
+    public long l05834;
+    public long l05835;
+    public long l05836;
+    public long l05837;
+    public long l05838;
+    public long l05839;
+    public long l05840;
+    public long l05841;
+    public long l05842;
+    public long l05843;
+    public long l05844;
+    public long l05845;
+    public long l05846;
+    public long l05847;
+    public long l05848;
+    public long l05849;
+    public long l05850;
+    public long l05851;
+    public long l05852;
+    public long l05853;
+    public long l05854;
+    public long l05855;
+    public long l05856;
+    public long l05857;
+    public long l05858;
+    public long l05859;
+    public long l05860;
+    public long l05861;
+    public long l05862;
+    public long l05863;
+    public long l05864;
+    public long l05865;
+    public long l05866;
+    public long l05867;
+    public long l05868;
+    public long l05869;
+    public long l05870;
+    public long l05871;
+    public long l05872;
+    public long l05873;
+    public long l05874;
+    public long l05875;
+    public long l05876;
+    public long l05877;
+    public long l05878;
+    public long l05879;
+    public long l05880;
+    public long l05881;
+    public long l05882;
+    public long l05883;
+    public long l05884;
+    public long l05885;
+    public long l05886;
+    public long l05887;
+    public long l05888;
+    public long l05889;
+    public long l05890;
+    public long l05891;
+    public long l05892;
+    public long l05893;
+    public long l05894;
+    public long l05895;
+    public long l05896;
+    public long l05897;
+    public long l05898;
+    public long l05899;
+    public long l05900;
+    public long l05901;
+    public long l05902;
+    public long l05903;
+    public long l05904;
+    public long l05905;
+    public long l05906;
+    public long l05907;
+    public long l05908;
+    public long l05909;
+    public long l05910;
+    public long l05911;
+    public long l05912;
+    public long l05913;
+    public long l05914;
+    public long l05915;
+    public long l05916;
+    public long l05917;
+    public long l05918;
+    public long l05919;
+    public long l05920;
+    public long l05921;
+    public long l05922;
+    public long l05923;
+    public long l05924;
+    public long l05925;
+    public long l05926;
+    public long l05927;
+    public long l05928;
+    public long l05929;
+    public long l05930;
+    public long l05931;
+    public long l05932;
+    public long l05933;
+    public long l05934;
+    public long l05935;
+    public long l05936;
+    public long l05937;
+    public long l05938;
+    public long l05939;
+    public long l05940;
+    public long l05941;
+    public long l05942;
+    public long l05943;
+    public long l05944;
+    public long l05945;
+    public long l05946;
+    public long l05947;
+    public long l05948;
+    public long l05949;
+    public long l05950;
+    public long l05951;
+    public long l05952;
+    public long l05953;
+    public long l05954;
+    public long l05955;
+    public long l05956;
+    public long l05957;
+    public long l05958;
+    public long l05959;
+    public long l05960;
+    public long l05961;
+    public long l05962;
+    public long l05963;
+    public long l05964;
+    public long l05965;
+    public long l05966;
+    public long l05967;
+    public long l05968;
+    public long l05969;
+    public long l05970;
+    public long l05971;
+    public long l05972;
+    public long l05973;
+    public long l05974;
+    public long l05975;
+    public long l05976;
+    public long l05977;
+    public long l05978;
+    public long l05979;
+    public long l05980;
+    public long l05981;
+    public long l05982;
+    public long l05983;
+    public long l05984;
+    public long l05985;
+    public long l05986;
+    public long l05987;
+    public long l05988;
+    public long l05989;
+    public long l05990;
+    public long l05991;
+    public long l05992;
+    public long l05993;
+    public long l05994;
+    public long l05995;
+    public long l05996;
+    public long l05997;
+    public long l05998;
+    public long l05999;
+    public long l06000;
+    public long l06001;
+    public long l06002;
+    public long l06003;
+    public long l06004;
+    public long l06005;
+    public long l06006;
+    public long l06007;
+    public long l06008;
+    public long l06009;
+    public long l06010;
+    public long l06011;
+    public long l06012;
+    public long l06013;
+    public long l06014;
+    public long l06015;
+    public long l06016;
+    public long l06017;
+    public long l06018;
+    public long l06019;
+    public long l06020;
+    public long l06021;
+    public long l06022;
+    public long l06023;
+    public long l06024;
+    public long l06025;
+    public long l06026;
+    public long l06027;
+    public long l06028;
+    public long l06029;
+    public long l06030;
+    public long l06031;
+    public long l06032;
+    public long l06033;
+    public long l06034;
+    public long l06035;
+    public long l06036;
+    public long l06037;
+    public long l06038;
+    public long l06039;
+    public long l06040;
+    public long l06041;
+    public long l06042;
+    public long l06043;
+    public long l06044;
+    public long l06045;
+    public long l06046;
+    public long l06047;
+    public long l06048;
+    public long l06049;
+    public long l06050;
+    public long l06051;
+    public long l06052;
+    public long l06053;
+    public long l06054;
+    public long l06055;
+    public long l06056;
+    public long l06057;
+    public long l06058;
+    public long l06059;
+    public long l06060;
+    public long l06061;
+    public long l06062;
+    public long l06063;
+    public long l06064;
+    public long l06065;
+    public long l06066;
+    public long l06067;
+    public long l06068;
+    public long l06069;
+    public long l06070;
+    public long l06071;
+    public long l06072;
+    public long l06073;
+    public long l06074;
+    public long l06075;
+    public long l06076;
+    public long l06077;
+    public long l06078;
+    public long l06079;
+    public long l06080;
+    public long l06081;
+    public long l06082;
+    public long l06083;
+    public long l06084;
+    public long l06085;
+    public long l06086;
+    public long l06087;
+    public long l06088;
+    public long l06089;
+    public long l06090;
+    public long l06091;
+    public long l06092;
+    public long l06093;
+    public long l06094;
+    public long l06095;
+    public long l06096;
+    public long l06097;
+    public long l06098;
+    public long l06099;
+    public long l06100;
+    public long l06101;
+    public long l06102;
+    public long l06103;
+    public long l06104;
+    public long l06105;
+    public long l06106;
+    public long l06107;
+    public long l06108;
+    public long l06109;
+    public long l06110;
+    public long l06111;
+    public long l06112;
+    public long l06113;
+    public long l06114;
+    public long l06115;
+    public long l06116;
+    public long l06117;
+    public long l06118;
+    public long l06119;
+    public long l06120;
+    public long l06121;
+    public long l06122;
+    public long l06123;
+    public long l06124;
+    public long l06125;
+    public long l06126;
+    public long l06127;
+    public long l06128;
+    public long l06129;
+    public long l06130;
+    public long l06131;
+    public long l06132;
+    public long l06133;
+    public long l06134;
+    public long l06135;
+    public long l06136;
+    public long l06137;
+    public long l06138;
+    public long l06139;
+    public long l06140;
+    public long l06141;
+    public long l06142;
+    public long l06143;
+    public long l06144;
+    public long l06145;
+    public long l06146;
+    public long l06147;
+    public long l06148;
+    public long l06149;
+    public long l06150;
+    public long l06151;
+    public long l06152;
+    public long l06153;
+    public long l06154;
+    public long l06155;
+    public long l06156;
+    public long l06157;
+    public long l06158;
+    public long l06159;
+    public long l06160;
+    public long l06161;
+    public long l06162;
+    public long l06163;
+    public long l06164;
+    public long l06165;
+    public long l06166;
+    public long l06167;
+    public long l06168;
+    public long l06169;
+    public long l06170;
+    public long l06171;
+    public long l06172;
+    public long l06173;
+    public long l06174;
+    public long l06175;
+    public long l06176;
+    public long l06177;
+    public long l06178;
+    public long l06179;
+    public long l06180;
+    public long l06181;
+    public long l06182;
+    public long l06183;
+    public long l06184;
+    public long l06185;
+    public long l06186;
+    public long l06187;
+    public long l06188;
+    public long l06189;
+    public long l06190;
+    public long l06191;
+    public long l06192;
+    public long l06193;
+    public long l06194;
+    public long l06195;
+    public long l06196;
+    public long l06197;
+    public long l06198;
+    public long l06199;
+    public long l06200;
+    public long l06201;
+    public long l06202;
+    public long l06203;
+    public long l06204;
+    public long l06205;
+    public long l06206;
+    public long l06207;
+    public long l06208;
+    public long l06209;
+    public long l06210;
+    public long l06211;
+    public long l06212;
+    public long l06213;
+    public long l06214;
+    public long l06215;
+    public long l06216;
+    public long l06217;
+    public long l06218;
+    public long l06219;
+    public long l06220;
+    public long l06221;
+    public long l06222;
+    public long l06223;
+    public long l06224;
+    public long l06225;
+    public long l06226;
+    public long l06227;
+    public long l06228;
+    public long l06229;
+    public long l06230;
+    public long l06231;
+    public long l06232;
+    public long l06233;
+    public long l06234;
+    public long l06235;
+    public long l06236;
+    public long l06237;
+    public long l06238;
+    public long l06239;
+    public long l06240;
+    public long l06241;
+    public long l06242;
+    public long l06243;
+    public long l06244;
+    public long l06245;
+    public long l06246;
+    public long l06247;
+    public long l06248;
+    public long l06249;
+    public long l06250;
+    public long l06251;
+    public long l06252;
+    public long l06253;
+    public long l06254;
+    public long l06255;
+    public long l06256;
+    public long l06257;
+    public long l06258;
+    public long l06259;
+    public long l06260;
+    public long l06261;
+    public long l06262;
+    public long l06263;
+    public long l06264;
+    public long l06265;
+    public long l06266;
+    public long l06267;
+    public long l06268;
+    public long l06269;
+    public long l06270;
+    public long l06271;
+    public long l06272;
+    public long l06273;
+    public long l06274;
+    public long l06275;
+    public long l06276;
+    public long l06277;
+    public long l06278;
+    public long l06279;
+    public long l06280;
+    public long l06281;
+    public long l06282;
+    public long l06283;
+    public long l06284;
+    public long l06285;
+    public long l06286;
+    public long l06287;
+    public long l06288;
+    public long l06289;
+    public long l06290;
+    public long l06291;
+    public long l06292;
+    public long l06293;
+    public long l06294;
+    public long l06295;
+    public long l06296;
+    public long l06297;
+    public long l06298;
+    public long l06299;
+    public long l06300;
+    public long l06301;
+    public long l06302;
+    public long l06303;
+    public long l06304;
+    public long l06305;
+    public long l06306;
+    public long l06307;
+    public long l06308;
+    public long l06309;
+    public long l06310;
+    public long l06311;
+    public long l06312;
+    public long l06313;
+    public long l06314;
+    public long l06315;
+    public long l06316;
+    public long l06317;
+    public long l06318;
+    public long l06319;
+    public long l06320;
+    public long l06321;
+    public long l06322;
+    public long l06323;
+    public long l06324;
+    public long l06325;
+    public long l06326;
+    public long l06327;
+    public long l06328;
+    public long l06329;
+    public long l06330;
+    public long l06331;
+    public long l06332;
+    public long l06333;
+    public long l06334;
+    public long l06335;
+    public long l06336;
+    public long l06337;
+    public long l06338;
+    public long l06339;
+    public long l06340;
+    public long l06341;
+    public long l06342;
+    public long l06343;
+    public long l06344;
+    public long l06345;
+    public long l06346;
+    public long l06347;
+    public long l06348;
+    public long l06349;
+    public long l06350;
+    public long l06351;
+    public long l06352;
+    public long l06353;
+    public long l06354;
+    public long l06355;
+    public long l06356;
+    public long l06357;
+    public long l06358;
+    public long l06359;
+    public long l06360;
+    public long l06361;
+    public long l06362;
+    public long l06363;
+    public long l06364;
+    public long l06365;
+    public long l06366;
+    public long l06367;
+    public long l06368;
+    public long l06369;
+    public long l06370;
+    public long l06371;
+    public long l06372;
+    public long l06373;
+    public long l06374;
+    public long l06375;
+    public long l06376;
+    public long l06377;
+    public long l06378;
+    public long l06379;
+    public long l06380;
+    public long l06381;
+    public long l06382;
+    public long l06383;
+    public long l06384;
+    public long l06385;
+    public long l06386;
+    public long l06387;
+    public long l06388;
+    public long l06389;
+    public long l06390;
+    public long l06391;
+    public long l06392;
+    public long l06393;
+    public long l06394;
+    public long l06395;
+    public long l06396;
+    public long l06397;
+    public long l06398;
+    public long l06399;
+    public long l06400;
+    public long l06401;
+    public long l06402;
+    public long l06403;
+    public long l06404;
+    public long l06405;
+    public long l06406;
+    public long l06407;
+    public long l06408;
+    public long l06409;
+    public long l06410;
+    public long l06411;
+    public long l06412;
+    public long l06413;
+    public long l06414;
+    public long l06415;
+    public long l06416;
+    public long l06417;
+    public long l06418;
+    public long l06419;
+    public long l06420;
+    public long l06421;
+    public long l06422;
+    public long l06423;
+    public long l06424;
+    public long l06425;
+    public long l06426;
+    public long l06427;
+    public long l06428;
+    public long l06429;
+    public long l06430;
+    public long l06431;
+    public long l06432;
+    public long l06433;
+    public long l06434;
+    public long l06435;
+    public long l06436;
+    public long l06437;
+    public long l06438;
+    public long l06439;
+    public long l06440;
+    public long l06441;
+    public long l06442;
+    public long l06443;
+    public long l06444;
+    public long l06445;
+    public long l06446;
+    public long l06447;
+    public long l06448;
+    public long l06449;
+    public long l06450;
+    public long l06451;
+    public long l06452;
+    public long l06453;
+    public long l06454;
+    public long l06455;
+    public long l06456;
+    public long l06457;
+    public long l06458;
+    public long l06459;
+    public long l06460;
+    public long l06461;
+    public long l06462;
+    public long l06463;
+    public long l06464;
+    public long l06465;
+    public long l06466;
+    public long l06467;
+    public long l06468;
+    public long l06469;
+    public long l06470;
+    public long l06471;
+    public long l06472;
+    public long l06473;
+    public long l06474;
+    public long l06475;
+    public long l06476;
+    public long l06477;
+    public long l06478;
+    public long l06479;
+    public long l06480;
+    public long l06481;
+    public long l06482;
+    public long l06483;
+    public long l06484;
+    public long l06485;
+    public long l06486;
+    public long l06487;
+    public long l06488;
+    public long l06489;
+    public long l06490;
+    public long l06491;
+    public long l06492;
+    public long l06493;
+    public long l06494;
+    public long l06495;
+    public long l06496;
+    public long l06497;
+    public long l06498;
+    public long l06499;
+    public long l06500;
+    public long l06501;
+    public long l06502;
+    public long l06503;
+    public long l06504;
+    public long l06505;
+    public long l06506;
+    public long l06507;
+    public long l06508;
+    public long l06509;
+    public long l06510;
+    public long l06511;
+    public long l06512;
+    public long l06513;
+    public long l06514;
+    public long l06515;
+    public long l06516;
+    public long l06517;
+    public long l06518;
+    public long l06519;
+    public long l06520;
+    public long l06521;
+    public long l06522;
+    public long l06523;
+    public long l06524;
+    public long l06525;
+    public long l06526;
+    public long l06527;
+    public long l06528;
+    public long l06529;
+    public long l06530;
+    public long l06531;
+    public long l06532;
+    public long l06533;
+    public long l06534;
+    public long l06535;
+    public long l06536;
+    public long l06537;
+    public long l06538;
+    public long l06539;
+    public long l06540;
+    public long l06541;
+    public long l06542;
+    public long l06543;
+    public long l06544;
+    public long l06545;
+    public long l06546;
+    public long l06547;
+    public long l06548;
+    public long l06549;
+    public long l06550;
+    public long l06551;
+    public long l06552;
+    public long l06553;
+    public long l06554;
+    public long l06555;
+    public long l06556;
+    public long l06557;
+    public long l06558;
+    public long l06559;
+    public long l06560;
+    public long l06561;
+    public long l06562;
+    public long l06563;
+    public long l06564;
+    public long l06565;
+    public long l06566;
+    public long l06567;
+    public long l06568;
+    public long l06569;
+    public long l06570;
+    public long l06571;
+    public long l06572;
+    public long l06573;
+    public long l06574;
+    public long l06575;
+    public long l06576;
+    public long l06577;
+    public long l06578;
+    public long l06579;
+    public long l06580;
+    public long l06581;
+    public long l06582;
+    public long l06583;
+    public long l06584;
+    public long l06585;
+    public long l06586;
+    public long l06587;
+    public long l06588;
+    public long l06589;
+    public long l06590;
+    public long l06591;
+    public long l06592;
+    public long l06593;
+    public long l06594;
+    public long l06595;
+    public long l06596;
+    public long l06597;
+    public long l06598;
+    public long l06599;
+    public long l06600;
+    public long l06601;
+    public long l06602;
+    public long l06603;
+    public long l06604;
+    public long l06605;
+    public long l06606;
+    public long l06607;
+    public long l06608;
+    public long l06609;
+    public long l06610;
+    public long l06611;
+    public long l06612;
+    public long l06613;
+    public long l06614;
+    public long l06615;
+    public long l06616;
+    public long l06617;
+    public long l06618;
+    public long l06619;
+    public long l06620;
+    public long l06621;
+    public long l06622;
+    public long l06623;
+    public long l06624;
+    public long l06625;
+    public long l06626;
+    public long l06627;
+    public long l06628;
+    public long l06629;
+    public long l06630;
+    public long l06631;
+    public long l06632;
+    public long l06633;
+    public long l06634;
+    public long l06635;
+    public long l06636;
+    public long l06637;
+    public long l06638;
+    public long l06639;
+    public long l06640;
+    public long l06641;
+    public long l06642;
+    public long l06643;
+    public long l06644;
+    public long l06645;
+    public long l06646;
+    public long l06647;
+    public long l06648;
+    public long l06649;
+    public long l06650;
+    public long l06651;
+    public long l06652;
+    public long l06653;
+    public long l06654;
+    public long l06655;
+    public long l06656;
+    public long l06657;
+    public long l06658;
+    public long l06659;
+    public long l06660;
+    public long l06661;
+    public long l06662;
+    public long l06663;
+    public long l06664;
+    public long l06665;
+    public long l06666;
+    public long l06667;
+    public long l06668;
+    public long l06669;
+    public long l06670;
+    public long l06671;
+    public long l06672;
+    public long l06673;
+    public long l06674;
+    public long l06675;
+    public long l06676;
+    public long l06677;
+    public long l06678;
+    public long l06679;
+    public long l06680;
+    public long l06681;
+    public long l06682;
+    public long l06683;
+    public long l06684;
+    public long l06685;
+    public long l06686;
+    public long l06687;
+    public long l06688;
+    public long l06689;
+    public long l06690;
+    public long l06691;
+    public long l06692;
+    public long l06693;
+    public long l06694;
+    public long l06695;
+    public long l06696;
+    public long l06697;
+    public long l06698;
+    public long l06699;
+    public long l06700;
+    public long l06701;
+    public long l06702;
+    public long l06703;
+    public long l06704;
+    public long l06705;
+    public long l06706;
+    public long l06707;
+    public long l06708;
+    public long l06709;
+    public long l06710;
+    public long l06711;
+    public long l06712;
+    public long l06713;
+    public long l06714;
+    public long l06715;
+    public long l06716;
+    public long l06717;
+    public long l06718;
+    public long l06719;
+    public long l06720;
+    public long l06721;
+    public long l06722;
+    public long l06723;
+    public long l06724;
+    public long l06725;
+    public long l06726;
+    public long l06727;
+    public long l06728;
+    public long l06729;
+    public long l06730;
+    public long l06731;
+    public long l06732;
+    public long l06733;
+    public long l06734;
+    public long l06735;
+    public long l06736;
+    public long l06737;
+    public long l06738;
+    public long l06739;
+    public long l06740;
+    public long l06741;
+    public long l06742;
+    public long l06743;
+    public long l06744;
+    public long l06745;
+    public long l06746;
+    public long l06747;
+    public long l06748;
+    public long l06749;
+    public long l06750;
+    public long l06751;
+    public long l06752;
+    public long l06753;
+    public long l06754;
+    public long l06755;
+    public long l06756;
+    public long l06757;
+    public long l06758;
+    public long l06759;
+    public long l06760;
+    public long l06761;
+    public long l06762;
+    public long l06763;
+    public long l06764;
+    public long l06765;
+    public long l06766;
+    public long l06767;
+    public long l06768;
+    public long l06769;
+    public long l06770;
+    public long l06771;
+    public long l06772;
+    public long l06773;
+    public long l06774;
+    public long l06775;
+    public long l06776;
+    public long l06777;
+    public long l06778;
+    public long l06779;
+    public long l06780;
+    public long l06781;
+    public long l06782;
+    public long l06783;
+    public long l06784;
+    public long l06785;
+    public long l06786;
+    public long l06787;
+    public long l06788;
+    public long l06789;
+    public long l06790;
+    public long l06791;
+    public long l06792;
+    public long l06793;
+    public long l06794;
+    public long l06795;
+    public long l06796;
+    public long l06797;
+    public long l06798;
+    public long l06799;
+    public long l06800;
+    public long l06801;
+    public long l06802;
+    public long l06803;
+    public long l06804;
+    public long l06805;
+    public long l06806;
+    public long l06807;
+    public long l06808;
+    public long l06809;
+    public long l06810;
+    public long l06811;
+    public long l06812;
+    public long l06813;
+    public long l06814;
+    public long l06815;
+    public long l06816;
+    public long l06817;
+    public long l06818;
+    public long l06819;
+    public long l06820;
+    public long l06821;
+    public long l06822;
+    public long l06823;
+    public long l06824;
+    public long l06825;
+    public long l06826;
+    public long l06827;
+    public long l06828;
+    public long l06829;
+    public long l06830;
+    public long l06831;
+    public long l06832;
+    public long l06833;
+    public long l06834;
+    public long l06835;
+    public long l06836;
+    public long l06837;
+    public long l06838;
+    public long l06839;
+    public long l06840;
+    public long l06841;
+    public long l06842;
+    public long l06843;
+    public long l06844;
+    public long l06845;
+    public long l06846;
+    public long l06847;
+    public long l06848;
+    public long l06849;
+    public long l06850;
+    public long l06851;
+    public long l06852;
+    public long l06853;
+    public long l06854;
+    public long l06855;
+    public long l06856;
+    public long l06857;
+    public long l06858;
+    public long l06859;
+    public long l06860;
+    public long l06861;
+    public long l06862;
+    public long l06863;
+    public long l06864;
+    public long l06865;
+    public long l06866;
+    public long l06867;
+    public long l06868;
+    public long l06869;
+    public long l06870;
+    public long l06871;
+    public long l06872;
+    public long l06873;
+    public long l06874;
+    public long l06875;
+    public long l06876;
+    public long l06877;
+    public long l06878;
+    public long l06879;
+    public long l06880;
+    public long l06881;
+    public long l06882;
+    public long l06883;
+    public long l06884;
+    public long l06885;
+    public long l06886;
+    public long l06887;
+    public long l06888;
+    public long l06889;
+    public long l06890;
+    public long l06891;
+    public long l06892;
+    public long l06893;
+    public long l06894;
+    public long l06895;
+    public long l06896;
+    public long l06897;
+    public long l06898;
+    public long l06899;
+    public long l06900;
+    public long l06901;
+    public long l06902;
+    public long l06903;
+    public long l06904;
+    public long l06905;
+    public long l06906;
+    public long l06907;
+    public long l06908;
+    public long l06909;
+    public long l06910;
+    public long l06911;
+    public long l06912;
+    public long l06913;
+    public long l06914;
+    public long l06915;
+    public long l06916;
+    public long l06917;
+    public long l06918;
+    public long l06919;
+    public long l06920;
+    public long l06921;
+    public long l06922;
+    public long l06923;
+    public long l06924;
+    public long l06925;
+    public long l06926;
+    public long l06927;
+    public long l06928;
+    public long l06929;
+    public long l06930;
+    public long l06931;
+    public long l06932;
+    public long l06933;
+    public long l06934;
+    public long l06935;
+    public long l06936;
+    public long l06937;
+    public long l06938;
+    public long l06939;
+    public long l06940;
+    public long l06941;
+    public long l06942;
+    public long l06943;
+    public long l06944;
+    public long l06945;
+    public long l06946;
+    public long l06947;
+    public long l06948;
+    public long l06949;
+    public long l06950;
+    public long l06951;
+    public long l06952;
+    public long l06953;
+    public long l06954;
+    public long l06955;
+    public long l06956;
+    public long l06957;
+    public long l06958;
+    public long l06959;
+    public long l06960;
+    public long l06961;
+    public long l06962;
+    public long l06963;
+    public long l06964;
+    public long l06965;
+    public long l06966;
+    public long l06967;
+    public long l06968;
+    public long l06969;
+    public long l06970;
+    public long l06971;
+    public long l06972;
+    public long l06973;
+    public long l06974;
+    public long l06975;
+    public long l06976;
+    public long l06977;
+    public long l06978;
+    public long l06979;
+    public long l06980;
+    public long l06981;
+    public long l06982;
+    public long l06983;
+    public long l06984;
+    public long l06985;
+    public long l06986;
+    public long l06987;
+    public long l06988;
+    public long l06989;
+    public long l06990;
+    public long l06991;
+    public long l06992;
+    public long l06993;
+    public long l06994;
+    public long l06995;
+    public long l06996;
+    public long l06997;
+    public long l06998;
+    public long l06999;
+    public long l07000;
+    public long l07001;
+    public long l07002;
+    public long l07003;
+    public long l07004;
+    public long l07005;
+    public long l07006;
+    public long l07007;
+    public long l07008;
+    public long l07009;
+    public long l07010;
+    public long l07011;
+    public long l07012;
+    public long l07013;
+    public long l07014;
+    public long l07015;
+    public long l07016;
+    public long l07017;
+    public long l07018;
+    public long l07019;
+    public long l07020;
+    public long l07021;
+    public long l07022;
+    public long l07023;
+    public long l07024;
+    public long l07025;
+    public long l07026;
+    public long l07027;
+    public long l07028;
+    public long l07029;
+    public long l07030;
+    public long l07031;
+    public long l07032;
+    public long l07033;
+    public long l07034;
+    public long l07035;
+    public long l07036;
+    public long l07037;
+    public long l07038;
+    public long l07039;
+    public long l07040;
+    public long l07041;
+    public long l07042;
+    public long l07043;
+    public long l07044;
+    public long l07045;
+    public long l07046;
+    public long l07047;
+    public long l07048;
+    public long l07049;
+    public long l07050;
+    public long l07051;
+    public long l07052;
+    public long l07053;
+    public long l07054;
+    public long l07055;
+    public long l07056;
+    public long l07057;
+    public long l07058;
+    public long l07059;
+    public long l07060;
+    public long l07061;
+    public long l07062;
+    public long l07063;
+    public long l07064;
+    public long l07065;
+    public long l07066;
+    public long l07067;
+    public long l07068;
+    public long l07069;
+    public long l07070;
+    public long l07071;
+    public long l07072;
+    public long l07073;
+    public long l07074;
+    public long l07075;
+    public long l07076;
+    public long l07077;
+    public long l07078;
+    public long l07079;
+    public long l07080;
+    public long l07081;
+    public long l07082;
+    public long l07083;
+    public long l07084;
+    public long l07085;
+    public long l07086;
+    public long l07087;
+    public long l07088;
+    public long l07089;
+    public long l07090;
+    public long l07091;
+    public long l07092;
+    public long l07093;
+    public long l07094;
+    public long l07095;
+    public long l07096;
+    public long l07097;
+    public long l07098;
+    public long l07099;
+    public long l07100;
+    public long l07101;
+    public long l07102;
+    public long l07103;
+    public long l07104;
+    public long l07105;
+    public long l07106;
+    public long l07107;
+    public long l07108;
+    public long l07109;
+    public long l07110;
+    public long l07111;
+    public long l07112;
+    public long l07113;
+    public long l07114;
+    public long l07115;
+    public long l07116;
+    public long l07117;
+    public long l07118;
+    public long l07119;
+    public long l07120;
+    public long l07121;
+    public long l07122;
+    public long l07123;
+    public long l07124;
+    public long l07125;
+    public long l07126;
+    public long l07127;
+    public long l07128;
+    public long l07129;
+    public long l07130;
+    public long l07131;
+    public long l07132;
+    public long l07133;
+    public long l07134;
+    public long l07135;
+    public long l07136;
+    public long l07137;
+    public long l07138;
+    public long l07139;
+    public long l07140;
+    public long l07141;
+    public long l07142;
+    public long l07143;
+    public long l07144;
+    public long l07145;
+    public long l07146;
+    public long l07147;
+    public long l07148;
+    public long l07149;
+    public long l07150;
+    public long l07151;
+    public long l07152;
+    public long l07153;
+    public long l07154;
+    public long l07155;
+    public long l07156;
+    public long l07157;
+    public long l07158;
+    public long l07159;
+    public long l07160;
+    public long l07161;
+    public long l07162;
+    public long l07163;
+    public long l07164;
+    public long l07165;
+    public long l07166;
+    public long l07167;
+    public long l07168;
+    public long l07169;
+    public long l07170;
+    public long l07171;
+    public long l07172;
+    public long l07173;
+    public long l07174;
+    public long l07175;
+    public long l07176;
+    public long l07177;
+    public long l07178;
+    public long l07179;
+    public long l07180;
+    public long l07181;
+    public long l07182;
+    public long l07183;
+    public long l07184;
+    public long l07185;
+    public long l07186;
+    public long l07187;
+    public long l07188;
+    public long l07189;
+    public long l07190;
+    public long l07191;
+    public long l07192;
+    public long l07193;
+    public long l07194;
+    public long l07195;
+    public long l07196;
+    public long l07197;
+    public long l07198;
+    public long l07199;
+    public long l07200;
+    public long l07201;
+    public long l07202;
+    public long l07203;
+    public long l07204;
+    public long l07205;
+    public long l07206;
+    public long l07207;
+    public long l07208;
+    public long l07209;
+    public long l07210;
+    public long l07211;
+    public long l07212;
+    public long l07213;
+    public long l07214;
+    public long l07215;
+    public long l07216;
+    public long l07217;
+    public long l07218;
+    public long l07219;
+    public long l07220;
+    public long l07221;
+    public long l07222;
+    public long l07223;
+    public long l07224;
+    public long l07225;
+    public long l07226;
+    public long l07227;
+    public long l07228;
+    public long l07229;
+    public long l07230;
+    public long l07231;
+    public long l07232;
+    public long l07233;
+    public long l07234;
+    public long l07235;
+    public long l07236;
+    public long l07237;
+    public long l07238;
+    public long l07239;
+    public long l07240;
+    public long l07241;
+    public long l07242;
+    public long l07243;
+    public long l07244;
+    public long l07245;
+    public long l07246;
+    public long l07247;
+    public long l07248;
+    public long l07249;
+    public long l07250;
+    public long l07251;
+    public long l07252;
+    public long l07253;
+    public long l07254;
+    public long l07255;
+    public long l07256;
+    public long l07257;
+    public long l07258;
+    public long l07259;
+    public long l07260;
+    public long l07261;
+    public long l07262;
+    public long l07263;
+    public long l07264;
+    public long l07265;
+    public long l07266;
+    public long l07267;
+    public long l07268;
+    public long l07269;
+    public long l07270;
+    public long l07271;
+    public long l07272;
+    public long l07273;
+    public long l07274;
+    public long l07275;
+    public long l07276;
+    public long l07277;
+    public long l07278;
+    public long l07279;
+    public long l07280;
+    public long l07281;
+    public long l07282;
+    public long l07283;
+    public long l07284;
+    public long l07285;
+    public long l07286;
+    public long l07287;
+    public long l07288;
+    public long l07289;
+    public long l07290;
+    public long l07291;
+    public long l07292;
+    public long l07293;
+    public long l07294;
+    public long l07295;
+    public long l07296;
+    public long l07297;
+    public long l07298;
+    public long l07299;
+    public long l07300;
+    public long l07301;
+    public long l07302;
+    public long l07303;
+    public long l07304;
+    public long l07305;
+    public long l07306;
+    public long l07307;
+    public long l07308;
+    public long l07309;
+    public long l07310;
+    public long l07311;
+    public long l07312;
+    public long l07313;
+    public long l07314;
+    public long l07315;
+    public long l07316;
+    public long l07317;
+    public long l07318;
+    public long l07319;
+    public long l07320;
+    public long l07321;
+    public long l07322;
+    public long l07323;
+    public long l07324;
+    public long l07325;
+    public long l07326;
+    public long l07327;
+    public long l07328;
+    public long l07329;
+    public long l07330;
+    public long l07331;
+    public long l07332;
+    public long l07333;
+    public long l07334;
+    public long l07335;
+    public long l07336;
+    public long l07337;
+    public long l07338;
+    public long l07339;
+    public long l07340;
+    public long l07341;
+    public long l07342;
+    public long l07343;
+    public long l07344;
+    public long l07345;
+    public long l07346;
+    public long l07347;
+    public long l07348;
+    public long l07349;
+    public long l07350;
+    public long l07351;
+    public long l07352;
+    public long l07353;
+    public long l07354;
+    public long l07355;
+    public long l07356;
+    public long l07357;
+    public long l07358;
+    public long l07359;
+    public long l07360;
+    public long l07361;
+    public long l07362;
+    public long l07363;
+    public long l07364;
+    public long l07365;
+    public long l07366;
+    public long l07367;
+    public long l07368;
+    public long l07369;
+    public long l07370;
+    public long l07371;
+    public long l07372;
+    public long l07373;
+    public long l07374;
+    public long l07375;
+    public long l07376;
+    public long l07377;
+    public long l07378;
+    public long l07379;
+    public long l07380;
+    public long l07381;
+    public long l07382;
+    public long l07383;
+    public long l07384;
+    public long l07385;
+    public long l07386;
+    public long l07387;
+    public long l07388;
+    public long l07389;
+    public long l07390;
+    public long l07391;
+    public long l07392;
+    public long l07393;
+    public long l07394;
+    public long l07395;
+    public long l07396;
+    public long l07397;
+    public long l07398;
+    public long l07399;
+    public long l07400;
+    public long l07401;
+    public long l07402;
+    public long l07403;
+    public long l07404;
+    public long l07405;
+    public long l07406;
+    public long l07407;
+    public long l07408;
+    public long l07409;
+    public long l07410;
+    public long l07411;
+    public long l07412;
+    public long l07413;
+    public long l07414;
+    public long l07415;
+    public long l07416;
+    public long l07417;
+    public long l07418;
+    public long l07419;
+    public long l07420;
+    public long l07421;
+    public long l07422;
+    public long l07423;
+    public long l07424;
+    public long l07425;
+    public long l07426;
+    public long l07427;
+    public long l07428;
+    public long l07429;
+    public long l07430;
+    public long l07431;
+    public long l07432;
+    public long l07433;
+    public long l07434;
+    public long l07435;
+    public long l07436;
+    public long l07437;
+    public long l07438;
+    public long l07439;
+    public long l07440;
+    public long l07441;
+    public long l07442;
+    public long l07443;
+    public long l07444;
+    public long l07445;
+    public long l07446;
+    public long l07447;
+    public long l07448;
+    public long l07449;
+    public long l07450;
+    public long l07451;
+    public long l07452;
+    public long l07453;
+    public long l07454;
+    public long l07455;
+    public long l07456;
+    public long l07457;
+    public long l07458;
+    public long l07459;
+    public long l07460;
+    public long l07461;
+    public long l07462;
+    public long l07463;
+    public long l07464;
+    public long l07465;
+    public long l07466;
+    public long l07467;
+    public long l07468;
+    public long l07469;
+    public long l07470;
+    public long l07471;
+    public long l07472;
+    public long l07473;
+    public long l07474;
+    public long l07475;
+    public long l07476;
+    public long l07477;
+    public long l07478;
+    public long l07479;
+    public long l07480;
+    public long l07481;
+    public long l07482;
+    public long l07483;
+    public long l07484;
+    public long l07485;
+    public long l07486;
+    public long l07487;
+    public long l07488;
+    public long l07489;
+    public long l07490;
+    public long l07491;
+    public long l07492;
+    public long l07493;
+    public long l07494;
+    public long l07495;
+    public long l07496;
+    public long l07497;
+    public long l07498;
+    public long l07499;
+    public long l07500;
+    public long l07501;
+    public long l07502;
+    public long l07503;
+    public long l07504;
+    public long l07505;
+    public long l07506;
+    public long l07507;
+    public long l07508;
+    public long l07509;
+    public long l07510;
+    public long l07511;
+    public long l07512;
+    public long l07513;
+    public long l07514;
+    public long l07515;
+    public long l07516;
+    public long l07517;
+    public long l07518;
+    public long l07519;
+    public long l07520;
+    public long l07521;
+    public long l07522;
+    public long l07523;
+    public long l07524;
+    public long l07525;
+    public long l07526;
+    public long l07527;
+    public long l07528;
+    public long l07529;
+    public long l07530;
+    public long l07531;
+    public long l07532;
+    public long l07533;
+    public long l07534;
+    public long l07535;
+    public long l07536;
+    public long l07537;
+    public long l07538;
+    public long l07539;
+    public long l07540;
+    public long l07541;
+    public long l07542;
+    public long l07543;
+    public long l07544;
+    public long l07545;
+    public long l07546;
+    public long l07547;
+    public long l07548;
+    public long l07549;
+    public long l07550;
+    public long l07551;
+    public long l07552;
+    public long l07553;
+    public long l07554;
+    public long l07555;
+    public long l07556;
+    public long l07557;
+    public long l07558;
+    public long l07559;
+    public long l07560;
+    public long l07561;
+    public long l07562;
+    public long l07563;
+    public long l07564;
+    public long l07565;
+    public long l07566;
+    public long l07567;
+    public long l07568;
+    public long l07569;
+    public long l07570;
+    public long l07571;
+    public long l07572;
+    public long l07573;
+    public long l07574;
+    public long l07575;
+    public long l07576;
+    public long l07577;
+    public long l07578;
+    public long l07579;
+    public long l07580;
+    public long l07581;
+    public long l07582;
+    public long l07583;
+    public long l07584;
+    public long l07585;
+    public long l07586;
+    public long l07587;
+    public long l07588;
+    public long l07589;
+    public long l07590;
+    public long l07591;
+    public long l07592;
+    public long l07593;
+    public long l07594;
+    public long l07595;
+    public long l07596;
+    public long l07597;
+    public long l07598;
+    public long l07599;
+    public long l07600;
+    public long l07601;
+    public long l07602;
+    public long l07603;
+    public long l07604;
+    public long l07605;
+    public long l07606;
+    public long l07607;
+    public long l07608;
+    public long l07609;
+    public long l07610;
+    public long l07611;
+    public long l07612;
+    public long l07613;
+    public long l07614;
+    public long l07615;
+    public long l07616;
+    public long l07617;
+    public long l07618;
+    public long l07619;
+    public long l07620;
+    public long l07621;
+    public long l07622;
+    public long l07623;
+    public long l07624;
+    public long l07625;
+    public long l07626;
+    public long l07627;
+    public long l07628;
+    public long l07629;
+    public long l07630;
+    public long l07631;
+    public long l07632;
+    public long l07633;
+    public long l07634;
+    public long l07635;
+    public long l07636;
+    public long l07637;
+    public long l07638;
+    public long l07639;
+    public long l07640;
+    public long l07641;
+    public long l07642;
+    public long l07643;
+    public long l07644;
+    public long l07645;
+    public long l07646;
+    public long l07647;
+    public long l07648;
+    public long l07649;
+    public long l07650;
+    public long l07651;
+    public long l07652;
+    public long l07653;
+    public long l07654;
+    public long l07655;
+    public long l07656;
+    public long l07657;
+    public long l07658;
+    public long l07659;
+    public long l07660;
+    public long l07661;
+    public long l07662;
+    public long l07663;
+    public long l07664;
+    public long l07665;
+    public long l07666;
+    public long l07667;
+    public long l07668;
+    public long l07669;
+    public long l07670;
+    public long l07671;
+    public long l07672;
+    public long l07673;
+    public long l07674;
+    public long l07675;
+    public long l07676;
+    public long l07677;
+    public long l07678;
+    public long l07679;
+    public long l07680;
+    public long l07681;
+    public long l07682;
+    public long l07683;
+    public long l07684;
+    public long l07685;
+    public long l07686;
+    public long l07687;
+    public long l07688;
+    public long l07689;
+    public long l07690;
+    public long l07691;
+    public long l07692;
+    public long l07693;
+    public long l07694;
+    public long l07695;
+    public long l07696;
+    public long l07697;
+    public long l07698;
+    public long l07699;
+    public long l07700;
+    public long l07701;
+    public long l07702;
+    public long l07703;
+    public long l07704;
+    public long l07705;
+    public long l07706;
+    public long l07707;
+    public long l07708;
+    public long l07709;
+    public long l07710;
+    public long l07711;
+    public long l07712;
+    public long l07713;
+    public long l07714;
+    public long l07715;
+    public long l07716;
+    public long l07717;
+    public long l07718;
+    public long l07719;
+    public long l07720;
+    public long l07721;
+    public long l07722;
+    public long l07723;
+    public long l07724;
+    public long l07725;
+    public long l07726;
+    public long l07727;
+    public long l07728;
+    public long l07729;
+    public long l07730;
+    public long l07731;
+    public long l07732;
+    public long l07733;
+    public long l07734;
+    public long l07735;
+    public long l07736;
+    public long l07737;
+    public long l07738;
+    public long l07739;
+    public long l07740;
+    public long l07741;
+    public long l07742;
+    public long l07743;
+    public long l07744;
+    public long l07745;
+    public long l07746;
+    public long l07747;
+    public long l07748;
+    public long l07749;
+    public long l07750;
+    public long l07751;
+    public long l07752;
+    public long l07753;
+    public long l07754;
+    public long l07755;
+    public long l07756;
+    public long l07757;
+    public long l07758;
+    public long l07759;
+    public long l07760;
+    public long l07761;
+    public long l07762;
+    public long l07763;
+    public long l07764;
+    public long l07765;
+    public long l07766;
+    public long l07767;
+    public long l07768;
+    public long l07769;
+    public long l07770;
+    public long l07771;
+    public long l07772;
+    public long l07773;
+    public long l07774;
+    public long l07775;
+    public long l07776;
+    public long l07777;
+    public long l07778;
+    public long l07779;
+    public long l07780;
+    public long l07781;
+    public long l07782;
+    public long l07783;
+    public long l07784;
+    public long l07785;
+    public long l07786;
+    public long l07787;
+    public long l07788;
+    public long l07789;
+    public long l07790;
+    public long l07791;
+    public long l07792;
+    public long l07793;
+    public long l07794;
+    public long l07795;
+    public long l07796;
+    public long l07797;
+    public long l07798;
+    public long l07799;
+    public long l07800;
+    public long l07801;
+    public long l07802;
+    public long l07803;
+    public long l07804;
+    public long l07805;
+    public long l07806;
+    public long l07807;
+    public long l07808;
+    public long l07809;
+    public long l07810;
+    public long l07811;
+    public long l07812;
+    public long l07813;
+    public long l07814;
+    public long l07815;
+    public long l07816;
+    public long l07817;
+    public long l07818;
+    public long l07819;
+    public long l07820;
+    public long l07821;
+    public long l07822;
+    public long l07823;
+    public long l07824;
+    public long l07825;
+    public long l07826;
+    public long l07827;
+    public long l07828;
+    public long l07829;
+    public long l07830;
+    public long l07831;
+    public long l07832;
+    public long l07833;
+    public long l07834;
+    public long l07835;
+    public long l07836;
+    public long l07837;
+    public long l07838;
+    public long l07839;
+    public long l07840;
+    public long l07841;
+    public long l07842;
+    public long l07843;
+    public long l07844;
+    public long l07845;
+    public long l07846;
+    public long l07847;
+    public long l07848;
+    public long l07849;
+    public long l07850;
+    public long l07851;
+    public long l07852;
+    public long l07853;
+    public long l07854;
+    public long l07855;
+    public long l07856;
+    public long l07857;
+    public long l07858;
+    public long l07859;
+    public long l07860;
+    public long l07861;
+    public long l07862;
+    public long l07863;
+    public long l07864;
+    public long l07865;
+    public long l07866;
+    public long l07867;
+    public long l07868;
+    public long l07869;
+    public long l07870;
+    public long l07871;
+    public long l07872;
+    public long l07873;
+    public long l07874;
+    public long l07875;
+    public long l07876;
+    public long l07877;
+    public long l07878;
+    public long l07879;
+    public long l07880;
+    public long l07881;
+    public long l07882;
+    public long l07883;
+    public long l07884;
+    public long l07885;
+    public long l07886;
+    public long l07887;
+    public long l07888;
+    public long l07889;
+    public long l07890;
+    public long l07891;
+    public long l07892;
+    public long l07893;
+    public long l07894;
+    public long l07895;
+    public long l07896;
+    public long l07897;
+    public long l07898;
+    public long l07899;
+    public long l07900;
+    public long l07901;
+    public long l07902;
+    public long l07903;
+    public long l07904;
+    public long l07905;
+    public long l07906;
+    public long l07907;
+    public long l07908;
+    public long l07909;
+    public long l07910;
+    public long l07911;
+    public long l07912;
+    public long l07913;
+    public long l07914;
+    public long l07915;
+    public long l07916;
+    public long l07917;
+    public long l07918;
+    public long l07919;
+    public long l07920;
+    public long l07921;
+    public long l07922;
+    public long l07923;
+    public long l07924;
+    public long l07925;
+    public long l07926;
+    public long l07927;
+    public long l07928;
+    public long l07929;
+    public long l07930;
+    public long l07931;
+    public long l07932;
+    public long l07933;
+    public long l07934;
+    public long l07935;
+    public long l07936;
+    public long l07937;
+    public long l07938;
+    public long l07939;
+    public long l07940;
+    public long l07941;
+    public long l07942;
+    public long l07943;
+    public long l07944;
+    public long l07945;
+    public long l07946;
+    public long l07947;
+    public long l07948;
+    public long l07949;
+    public long l07950;
+    public long l07951;
+    public long l07952;
+    public long l07953;
+    public long l07954;
+    public long l07955;
+    public long l07956;
+    public long l07957;
+    public long l07958;
+    public long l07959;
+    public long l07960;
+    public long l07961;
+    public long l07962;
+    public long l07963;
+    public long l07964;
+    public long l07965;
+    public long l07966;
+    public long l07967;
+    public long l07968;
+    public long l07969;
+    public long l07970;
+    public long l07971;
+    public long l07972;
+    public long l07973;
+    public long l07974;
+    public long l07975;
+    public long l07976;
+    public long l07977;
+    public long l07978;
+    public long l07979;
+    public long l07980;
+    public long l07981;
+    public long l07982;
+    public long l07983;
+    public long l07984;
+    public long l07985;
+    public long l07986;
+    public long l07987;
+    public long l07988;
+    public long l07989;
+    public long l07990;
+    public long l07991;
+    public long l07992;
+    public long l07993;
+    public long l07994;
+    public long l07995;
+    public long l07996;
+    public long l07997;
+    public long l07998;
+    public long l07999;
+    public long l08000;
+    public long l08001;
+    public long l08002;
+    public long l08003;
+    public long l08004;
+    public long l08005;
+    public long l08006;
+    public long l08007;
+    public long l08008;
+    public long l08009;
+    public long l08010;
+    public long l08011;
+    public long l08012;
+    public long l08013;
+    public long l08014;
+    public long l08015;
+    public long l08016;
+    public long l08017;
+    public long l08018;
+    public long l08019;
+    public long l08020;
+    public long l08021;
+    public long l08022;
+    public long l08023;
+    public long l08024;
+    public long l08025;
+    public long l08026;
+    public long l08027;
+    public long l08028;
+    public long l08029;
+    public long l08030;
+    public long l08031;
+    public long l08032;
+    public long l08033;
+    public long l08034;
+    public long l08035;
+    public long l08036;
+    public long l08037;
+    public long l08038;
+    public long l08039;
+    public long l08040;
+    public long l08041;
+    public long l08042;
+    public long l08043;
+    public long l08044;
+    public long l08045;
+    public long l08046;
+    public long l08047;
+    public long l08048;
+    public long l08049;
+    public long l08050;
+    public long l08051;
+    public long l08052;
+    public long l08053;
+    public long l08054;
+    public long l08055;
+    public long l08056;
+    public long l08057;
+    public long l08058;
+    public long l08059;
+    public long l08060;
+    public long l08061;
+    public long l08062;
+    public long l08063;
+    public long l08064;
+    public long l08065;
+    public long l08066;
+    public long l08067;
+    public long l08068;
+    public long l08069;
+    public long l08070;
+    public long l08071;
+    public long l08072;
+    public long l08073;
+    public long l08074;
+    public long l08075;
+    public long l08076;
+    public long l08077;
+    public long l08078;
+    public long l08079;
+    public long l08080;
+    public long l08081;
+    public long l08082;
+    public long l08083;
+    public long l08084;
+    public long l08085;
+    public long l08086;
+    public long l08087;
+    public long l08088;
+    public long l08089;
+    public long l08090;
+    public long l08091;
+    public long l08092;
+    public long l08093;
+    public long l08094;
+    public long l08095;
+    public long l08096;
+    public long l08097;
+    public long l08098;
+    public long l08099;
+    public long l08100;
+    public long l08101;
+    public long l08102;
+    public long l08103;
+    public long l08104;
+    public long l08105;
+    public long l08106;
+    public long l08107;
+    public long l08108;
+    public long l08109;
+    public long l08110;
+    public long l08111;
+    public long l08112;
+    public long l08113;
+    public long l08114;
+    public long l08115;
+    public long l08116;
+    public long l08117;
+    public long l08118;
+    public long l08119;
+    public long l08120;
+    public long l08121;
+    public long l08122;
+    public long l08123;
+    public long l08124;
+    public long l08125;
+    public long l08126;
+    public long l08127;
+    public long l08128;
+    public long l08129;
+    public long l08130;
+    public long l08131;
+    public long l08132;
+    public long l08133;
+    public long l08134;
+    public long l08135;
+    public long l08136;
+    public long l08137;
+    public long l08138;
+    public long l08139;
+    public long l08140;
+    public long l08141;
+    public long l08142;
+    public long l08143;
+    public long l08144;
+    public long l08145;
+    public long l08146;
+    public long l08147;
+    public long l08148;
+    public long l08149;
+    public long l08150;
+    public long l08151;
+    public long l08152;
+    public long l08153;
+    public long l08154;
+    public long l08155;
+    public long l08156;
+    public long l08157;
+    public long l08158;
+    public long l08159;
+    public long l08160;
+    public long l08161;
+    public long l08162;
+    public long l08163;
+    public long l08164;
+    public long l08165;
+    public long l08166;
+    public long l08167;
+    public long l08168;
+    public long l08169;
+    public long l08170;
+    public long l08171;
+    public long l08172;
+    public long l08173;
+    public long l08174;
+    public long l08175;
+    public long l08176;
+    public long l08177;
+    public long l08178;
+    public long l08179;
+    public long l08180;
+    public long l08181;
+    public long l08182;
+    public long l08183;
+    public long l08184;
+    public long l08185;
+    public long l08186;
+    public long l08187;
+    public long l08188;
+    public long l08189;
+    public long l08190;
+    public long l08191;
+    public long l08192;
+    public long l08193;
+    public long l08194;
+    public long l08195;
+    public long l08196;
+    public long l08197;
+    public long l08198;
+    public long l08199;
+    public long l08200;
+    public long l08201;
+    public long l08202;
+    public long l08203;
+    public long l08204;
+    public long l08205;
+    public long l08206;
+    public long l08207;
+    public long l08208;
+    public long l08209;
+    public long l08210;
+    public long l08211;
+    public long l08212;
+    public long l08213;
+    public long l08214;
+    public long l08215;
+    public long l08216;
+    public long l08217;
+    public long l08218;
+    public long l08219;
+    public long l08220;
+    public long l08221;
+    public long l08222;
+    public long l08223;
+    public long l08224;
+    public long l08225;
+    public long l08226;
+    public long l08227;
+    public long l08228;
+    public long l08229;
+    public long l08230;
+    public long l08231;
+    public long l08232;
+    public long l08233;
+    public long l08234;
+    public long l08235;
+    public long l08236;
+    public long l08237;
+    public long l08238;
+    public long l08239;
+    public long l08240;
+    public long l08241;
+    public long l08242;
+    public long l08243;
+    public long l08244;
+    public long l08245;
+    public long l08246;
+    public long l08247;
+    public long l08248;
+    public long l08249;
+    public long l08250;
+    public long l08251;
+    public long l08252;
+    public long l08253;
+    public long l08254;
+    public long l08255;
+    public long l08256;
+    public long l08257;
+    public long l08258;
+    public long l08259;
+    public long l08260;
+    public long l08261;
+    public long l08262;
+    public long l08263;
+    public long l08264;
+    public long l08265;
+    public long l08266;
+    public long l08267;
+    public long l08268;
+    public long l08269;
+    public long l08270;
+    public long l08271;
+    public long l08272;
+    public long l08273;
+    public long l08274;
+    public long l08275;
+    public long l08276;
+    public long l08277;
+    public long l08278;
+    public long l08279;
+    public long l08280;
+    public long l08281;
+    public long l08282;
+    public long l08283;
+    public long l08284;
+    public long l08285;
+    public long l08286;
+    public long l08287;
+    public long l08288;
+    public long l08289;
+    public long l08290;
+    public long l08291;
+    public long l08292;
+    public long l08293;
+    public long l08294;
+    public long l08295;
+    public long l08296;
+    public long l08297;
+    public long l08298;
+    public long l08299;
+    public long l08300;
+    public long l08301;
+    public long l08302;
+    public long l08303;
+    public long l08304;
+    public long l08305;
+    public long l08306;
+    public long l08307;
+    public long l08308;
+    public long l08309;
+    public long l08310;
+    public long l08311;
+    public long l08312;
+    public long l08313;
+    public long l08314;
+    public long l08315;
+    public long l08316;
+    public long l08317;
+    public long l08318;
+    public long l08319;
+    public long l08320;
+    public long l08321;
+    public long l08322;
+    public long l08323;
+    public long l08324;
+    public long l08325;
+    public long l08326;
+    public long l08327;
+    public long l08328;
+    public long l08329;
+    public long l08330;
+    public long l08331;
+    public long l08332;
+    public long l08333;
+    public long l08334;
+    public long l08335;
+    public long l08336;
+    public long l08337;
+    public long l08338;
+    public long l08339;
+    public long l08340;
+    public long l08341;
+    public long l08342;
+    public long l08343;
+    public long l08344;
+    public long l08345;
+    public long l08346;
+    public long l08347;
+    public long l08348;
+    public long l08349;
+    public long l08350;
+    public long l08351;
+    public long l08352;
+    public long l08353;
+    public long l08354;
+    public long l08355;
+    public long l08356;
+    public long l08357;
+    public long l08358;
+    public long l08359;
+    public long l08360;
+    public long l08361;
+    public long l08362;
+    public long l08363;
+    public long l08364;
+    public long l08365;
+    public long l08366;
+    public long l08367;
+    public long l08368;
+    public long l08369;
+    public long l08370;
+    public long l08371;
+    public long l08372;
+    public long l08373;
+    public long l08374;
+    public long l08375;
+    public long l08376;
+    public long l08377;
+    public long l08378;
+    public long l08379;
+    public long l08380;
+    public long l08381;
+    public long l08382;
+    public long l08383;
+    public long l08384;
+    public long l08385;
+    public long l08386;
+    public long l08387;
+    public long l08388;
+    public long l08389;
+    public long l08390;
+    public long l08391;
+    public long l08392;
+    public long l08393;
+    public long l08394;
+    public long l08395;
+    public long l08396;
+    public long l08397;
+    public long l08398;
+    public long l08399;
+    public long l08400;
+    public long l08401;
+    public long l08402;
+    public long l08403;
+    public long l08404;
+    public long l08405;
+    public long l08406;
+    public long l08407;
+    public long l08408;
+    public long l08409;
+    public long l08410;
+    public long l08411;
+    public long l08412;
+    public long l08413;
+    public long l08414;
+    public long l08415;
+    public long l08416;
+    public long l08417;
+    public long l08418;
+    public long l08419;
+    public long l08420;
+    public long l08421;
+    public long l08422;
+    public long l08423;
+    public long l08424;
+    public long l08425;
+    public long l08426;
+    public long l08427;
+    public long l08428;
+    public long l08429;
+    public long l08430;
+    public long l08431;
+    public long l08432;
+    public long l08433;
+    public long l08434;
+    public long l08435;
+    public long l08436;
+    public long l08437;
+    public long l08438;
+    public long l08439;
+    public long l08440;
+    public long l08441;
+    public long l08442;
+    public long l08443;
+    public long l08444;
+    public long l08445;
+    public long l08446;
+    public long l08447;
+    public long l08448;
+    public long l08449;
+    public long l08450;
+    public long l08451;
+    public long l08452;
+    public long l08453;
+    public long l08454;
+    public long l08455;
+    public long l08456;
+    public long l08457;
+    public long l08458;
+    public long l08459;
+    public long l08460;
+    public long l08461;
+    public long l08462;
+    public long l08463;
+    public long l08464;
+    public long l08465;
+    public long l08466;
+    public long l08467;
+    public long l08468;
+    public long l08469;
+    public long l08470;
+    public long l08471;
+    public long l08472;
+    public long l08473;
+    public long l08474;
+    public long l08475;
+    public long l08476;
+    public long l08477;
+    public long l08478;
+    public long l08479;
+    public long l08480;
+    public long l08481;
+    public long l08482;
+    public long l08483;
+    public long l08484;
+    public long l08485;
+    public long l08486;
+    public long l08487;
+    public long l08488;
+    public long l08489;
+    public long l08490;
+    public long l08491;
+    public long l08492;
+    public long l08493;
+    public long l08494;
+    public long l08495;
+    public long l08496;
+    public long l08497;
+    public long l08498;
+    public long l08499;
+    public long l08500;
+    public long l08501;
+    public long l08502;
+    public long l08503;
+    public long l08504;
+    public long l08505;
+    public long l08506;
+    public long l08507;
+    public long l08508;
+    public long l08509;
+    public long l08510;
+    public long l08511;
+    public long l08512;
+    public long l08513;
+    public long l08514;
+    public long l08515;
+    public long l08516;
+    public long l08517;
+    public long l08518;
+    public long l08519;
+    public long l08520;
+    public long l08521;
+    public long l08522;
+    public long l08523;
+    public long l08524;
+    public long l08525;
+    public long l08526;
+    public long l08527;
+    public long l08528;
+    public long l08529;
+    public long l08530;
+    public long l08531;
+    public long l08532;
+    public long l08533;
+    public long l08534;
+    public long l08535;
+    public long l08536;
+    public long l08537;
+    public long l08538;
+    public long l08539;
+    public long l08540;
+    public long l08541;
+    public long l08542;
+    public long l08543;
+    public long l08544;
+    public long l08545;
+    public long l08546;
+    public long l08547;
+    public long l08548;
+    public long l08549;
+    public long l08550;
+    public long l08551;
+    public long l08552;
+    public long l08553;
+    public long l08554;
+    public long l08555;
+    public long l08556;
+    public long l08557;
+    public long l08558;
+    public long l08559;
+    public long l08560;
+    public long l08561;
+    public long l08562;
+    public long l08563;
+    public long l08564;
+    public long l08565;
+    public long l08566;
+    public long l08567;
+    public long l08568;
+    public long l08569;
+    public long l08570;
+    public long l08571;
+    public long l08572;
+    public long l08573;
+    public long l08574;
+    public long l08575;
+    public long l08576;
+    public long l08577;
+    public long l08578;
+    public long l08579;
+    public long l08580;
+    public long l08581;
+    public long l08582;
+    public long l08583;
+    public long l08584;
+    public long l08585;
+    public long l08586;
+    public long l08587;
+    public long l08588;
+    public long l08589;
+    public long l08590;
+    public long l08591;
+    public long l08592;
+    public long l08593;
+    public long l08594;
+    public long l08595;
+    public long l08596;
+    public long l08597;
+    public long l08598;
+    public long l08599;
+    public long l08600;
+    public long l08601;
+    public long l08602;
+    public long l08603;
+    public long l08604;
+    public long l08605;
+    public long l08606;
+    public long l08607;
+    public long l08608;
+    public long l08609;
+    public long l08610;
+    public long l08611;
+    public long l08612;
+    public long l08613;
+    public long l08614;
+    public long l08615;
+    public long l08616;
+    public long l08617;
+    public long l08618;
+    public long l08619;
+    public long l08620;
+    public long l08621;
+    public long l08622;
+    public long l08623;
+    public long l08624;
+    public long l08625;
+    public long l08626;
+    public long l08627;
+    public long l08628;
+    public long l08629;
+    public long l08630;
+    public long l08631;
+    public long l08632;
+    public long l08633;
+    public long l08634;
+    public long l08635;
+    public long l08636;
+    public long l08637;
+    public long l08638;
+    public long l08639;
+    public long l08640;
+    public long l08641;
+    public long l08642;
+    public long l08643;
+    public long l08644;
+    public long l08645;
+    public long l08646;
+    public long l08647;
+    public long l08648;
+    public long l08649;
+    public long l08650;
+    public long l08651;
+    public long l08652;
+    public long l08653;
+    public long l08654;
+    public long l08655;
+    public long l08656;
+    public long l08657;
+    public long l08658;
+    public long l08659;
+    public long l08660;
+    public long l08661;
+    public long l08662;
+    public long l08663;
+    public long l08664;
+    public long l08665;
+    public long l08666;
+    public long l08667;
+    public long l08668;
+    public long l08669;
+    public long l08670;
+    public long l08671;
+    public long l08672;
+    public long l08673;
+    public long l08674;
+    public long l08675;
+    public long l08676;
+    public long l08677;
+    public long l08678;
+    public long l08679;
+    public long l08680;
+    public long l08681;
+    public long l08682;
+    public long l08683;
+    public long l08684;
+    public long l08685;
+    public long l08686;
+    public long l08687;
+    public long l08688;
+    public long l08689;
+    public long l08690;
+    public long l08691;
+    public long l08692;
+    public long l08693;
+    public long l08694;
+    public long l08695;
+    public long l08696;
+    public long l08697;
+    public long l08698;
+    public long l08699;
+    public long l08700;
+    public long l08701;
+    public long l08702;
+    public long l08703;
+    public long l08704;
+    public long l08705;
+    public long l08706;
+    public long l08707;
+    public long l08708;
+    public long l08709;
+    public long l08710;
+    public long l08711;
+    public long l08712;
+    public long l08713;
+    public long l08714;
+    public long l08715;
+    public long l08716;
+    public long l08717;
+    public long l08718;
+    public long l08719;
+    public long l08720;
+    public long l08721;
+    public long l08722;
+    public long l08723;
+    public long l08724;
+    public long l08725;
+    public long l08726;
+    public long l08727;
+    public long l08728;
+    public long l08729;
+    public long l08730;
+    public long l08731;
+    public long l08732;
+    public long l08733;
+    public long l08734;
+    public long l08735;
+    public long l08736;
+    public long l08737;
+    public long l08738;
+    public long l08739;
+    public long l08740;
+    public long l08741;
+    public long l08742;
+    public long l08743;
+    public long l08744;
+    public long l08745;
+    public long l08746;
+    public long l08747;
+    public long l08748;
+    public long l08749;
+    public long l08750;
+    public long l08751;
+    public long l08752;
+    public long l08753;
+    public long l08754;
+    public long l08755;
+    public long l08756;
+    public long l08757;
+    public long l08758;
+    public long l08759;
+    public long l08760;
+    public long l08761;
+    public long l08762;
+    public long l08763;
+    public long l08764;
+    public long l08765;
+    public long l08766;
+    public long l08767;
+    public long l08768;
+    public long l08769;
+    public long l08770;
+    public long l08771;
+    public long l08772;
+    public long l08773;
+    public long l08774;
+    public long l08775;
+    public long l08776;
+    public long l08777;
+    public long l08778;
+    public long l08779;
+    public long l08780;
+    public long l08781;
+    public long l08782;
+    public long l08783;
+    public long l08784;
+    public long l08785;
+    public long l08786;
+    public long l08787;
+    public long l08788;
+    public long l08789;
+    public long l08790;
+    public long l08791;
+    public long l08792;
+    public long l08793;
+    public long l08794;
+    public long l08795;
+    public long l08796;
+    public long l08797;
+    public long l08798;
+    public long l08799;
+    public long l08800;
+    public long l08801;
+    public long l08802;
+    public long l08803;
+    public long l08804;
+    public long l08805;
+    public long l08806;
+    public long l08807;
+    public long l08808;
+    public long l08809;
+    public long l08810;
+    public long l08811;
+    public long l08812;
+    public long l08813;
+    public long l08814;
+    public long l08815;
+    public long l08816;
+    public long l08817;
+    public long l08818;
+    public long l08819;
+    public long l08820;
+    public long l08821;
+    public long l08822;
+    public long l08823;
+    public long l08824;
+    public long l08825;
+    public long l08826;
+    public long l08827;
+    public long l08828;
+    public long l08829;
+    public long l08830;
+    public long l08831;
+    public long l08832;
+    public long l08833;
+    public long l08834;
+    public long l08835;
+    public long l08836;
+    public long l08837;
+    public long l08838;
+    public long l08839;
+    public long l08840;
+    public long l08841;
+    public long l08842;
+    public long l08843;
+    public long l08844;
+    public long l08845;
+    public long l08846;
+    public long l08847;
+    public long l08848;
+    public long l08849;
+    public long l08850;
+    public long l08851;
+    public long l08852;
+    public long l08853;
+    public long l08854;
+    public long l08855;
+    public long l08856;
+    public long l08857;
+    public long l08858;
+    public long l08859;
+    public long l08860;
+    public long l08861;
+    public long l08862;
+    public long l08863;
+    public long l08864;
+    public long l08865;
+    public long l08866;
+    public long l08867;
+    public long l08868;
+    public long l08869;
+    public long l08870;
+    public long l08871;
+    public long l08872;
+    public long l08873;
+    public long l08874;
+    public long l08875;
+    public long l08876;
+    public long l08877;
+    public long l08878;
+    public long l08879;
+    public long l08880;
+    public long l08881;
+    public long l08882;
+    public long l08883;
+    public long l08884;
+    public long l08885;
+    public long l08886;
+    public long l08887;
+    public long l08888;
+    public long l08889;
+    public long l08890;
+    public long l08891;
+    public long l08892;
+    public long l08893;
+    public long l08894;
+    public long l08895;
+    public long l08896;
+    public long l08897;
+    public long l08898;
+    public long l08899;
+    public long l08900;
+    public long l08901;
+    public long l08902;
+    public long l08903;
+    public long l08904;
+    public long l08905;
+    public long l08906;
+    public long l08907;
+    public long l08908;
+    public long l08909;
+    public long l08910;
+    public long l08911;
+    public long l08912;
+    public long l08913;
+    public long l08914;
+    public long l08915;
+    public long l08916;
+    public long l08917;
+    public long l08918;
+    public long l08919;
+    public long l08920;
+    public long l08921;
+    public long l08922;
+    public long l08923;
+    public long l08924;
+    public long l08925;
+    public long l08926;
+    public long l08927;
+    public long l08928;
+    public long l08929;
+    public long l08930;
+    public long l08931;
+    public long l08932;
+    public long l08933;
+    public long l08934;
+    public long l08935;
+    public long l08936;
+    public long l08937;
+    public long l08938;
+    public long l08939;
+    public long l08940;
+    public long l08941;
+    public long l08942;
+    public long l08943;
+    public long l08944;
+    public long l08945;
+    public long l08946;
+    public long l08947;
+    public long l08948;
+    public long l08949;
+    public long l08950;
+    public long l08951;
+    public long l08952;
+    public long l08953;
+    public long l08954;
+    public long l08955;
+    public long l08956;
+    public long l08957;
+    public long l08958;
+    public long l08959;
+    public long l08960;
+    public long l08961;
+    public long l08962;
+    public long l08963;
+    public long l08964;
+    public long l08965;
+    public long l08966;
+    public long l08967;
+    public long l08968;
+    public long l08969;
+    public long l08970;
+    public long l08971;
+    public long l08972;
+    public long l08973;
+    public long l08974;
+    public long l08975;
+    public long l08976;
+    public long l08977;
+    public long l08978;
+    public long l08979;
+    public long l08980;
+    public long l08981;
+    public long l08982;
+    public long l08983;
+    public long l08984;
+    public long l08985;
+    public long l08986;
+    public long l08987;
+    public long l08988;
+    public long l08989;
+    public long l08990;
+    public long l08991;
+    public long l08992;
+    public long l08993;
+    public long l08994;
+    public long l08995;
+    public long l08996;
+    public long l08997;
+    public long l08998;
+    public long l08999;
+    public long l09000;
+    public long l09001;
+    public long l09002;
+    public long l09003;
+    public long l09004;
+    public long l09005;
+    public long l09006;
+    public long l09007;
+    public long l09008;
+    public long l09009;
+    public long l09010;
+    public long l09011;
+    public long l09012;
+    public long l09013;
+    public long l09014;
+    public long l09015;
+    public long l09016;
+    public long l09017;
+    public long l09018;
+    public long l09019;
+    public long l09020;
+    public long l09021;
+    public long l09022;
+    public long l09023;
+    public long l09024;
+    public long l09025;
+    public long l09026;
+    public long l09027;
+    public long l09028;
+    public long l09029;
+    public long l09030;
+    public long l09031;
+    public long l09032;
+    public long l09033;
+    public long l09034;
+    public long l09035;
+    public long l09036;
+    public long l09037;
+    public long l09038;
+    public long l09039;
+    public long l09040;
+    public long l09041;
+    public long l09042;
+    public long l09043;
+    public long l09044;
+    public long l09045;
+    public long l09046;
+    public long l09047;
+    public long l09048;
+    public long l09049;
+    public long l09050;
+    public long l09051;
+    public long l09052;
+    public long l09053;
+    public long l09054;
+    public long l09055;
+    public long l09056;
+    public long l09057;
+    public long l09058;
+    public long l09059;
+    public long l09060;
+    public long l09061;
+    public long l09062;
+    public long l09063;
+    public long l09064;
+    public long l09065;
+    public long l09066;
+    public long l09067;
+    public long l09068;
+    public long l09069;
+    public long l09070;
+    public long l09071;
+    public long l09072;
+    public long l09073;
+    public long l09074;
+    public long l09075;
+    public long l09076;
+    public long l09077;
+    public long l09078;
+    public long l09079;
+    public long l09080;
+    public long l09081;
+    public long l09082;
+    public long l09083;
+    public long l09084;
+    public long l09085;
+    public long l09086;
+    public long l09087;
+    public long l09088;
+    public long l09089;
+    public long l09090;
+    public long l09091;
+    public long l09092;
+    public long l09093;
+    public long l09094;
+    public long l09095;
+    public long l09096;
+    public long l09097;
+    public long l09098;
+    public long l09099;
+    public long l09100;
+    public long l09101;
+    public long l09102;
+    public long l09103;
+    public long l09104;
+    public long l09105;
+    public long l09106;
+    public long l09107;
+    public long l09108;
+    public long l09109;
+    public long l09110;
+    public long l09111;
+    public long l09112;
+    public long l09113;
+    public long l09114;
+    public long l09115;
+    public long l09116;
+    public long l09117;
+    public long l09118;
+    public long l09119;
+    public long l09120;
+    public long l09121;
+    public long l09122;
+    public long l09123;
+    public long l09124;
+    public long l09125;
+    public long l09126;
+    public long l09127;
+    public long l09128;
+    public long l09129;
+    public long l09130;
+    public long l09131;
+    public long l09132;
+    public long l09133;
+    public long l09134;
+    public long l09135;
+    public long l09136;
+    public long l09137;
+    public long l09138;
+    public long l09139;
+    public long l09140;
+    public long l09141;
+    public long l09142;
+    public long l09143;
+    public long l09144;
+    public long l09145;
+    public long l09146;
+    public long l09147;
+    public long l09148;
+    public long l09149;
+    public long l09150;
+    public long l09151;
+    public long l09152;
+    public long l09153;
+    public long l09154;
+    public long l09155;
+    public long l09156;
+    public long l09157;
+    public long l09158;
+    public long l09159;
+    public long l09160;
+    public long l09161;
+    public long l09162;
+    public long l09163;
+    public long l09164;
+    public long l09165;
+    public long l09166;
+    public long l09167;
+    public long l09168;
+    public long l09169;
+    public long l09170;
+    public long l09171;
+    public long l09172;
+    public long l09173;
+    public long l09174;
+    public long l09175;
+    public long l09176;
+    public long l09177;
+    public long l09178;
+    public long l09179;
+    public long l09180;
+    public long l09181;
+    public long l09182;
+    public long l09183;
+    public long l09184;
+    public long l09185;
+    public long l09186;
+    public long l09187;
+    public long l09188;
+    public long l09189;
+    public long l09190;
+    public long l09191;
+    public long l09192;
+    public long l09193;
+    public long l09194;
+    public long l09195;
+    public long l09196;
+    public long l09197;
+    public long l09198;
+    public long l09199;
+    public long l09200;
+    public long l09201;
+    public long l09202;
+    public long l09203;
+    public long l09204;
+    public long l09205;
+    public long l09206;
+    public long l09207;
+    public long l09208;
+    public long l09209;
+    public long l09210;
+    public long l09211;
+    public long l09212;
+    public long l09213;
+    public long l09214;
+    public long l09215;
+    public long l09216;
+    public long l09217;
+    public long l09218;
+    public long l09219;
+    public long l09220;
+    public long l09221;
+    public long l09222;
+    public long l09223;
+    public long l09224;
+    public long l09225;
+    public long l09226;
+    public long l09227;
+    public long l09228;
+    public long l09229;
+    public long l09230;
+    public long l09231;
+    public long l09232;
+    public long l09233;
+    public long l09234;
+    public long l09235;
+    public long l09236;
+    public long l09237;
+    public long l09238;
+    public long l09239;
+    public long l09240;
+    public long l09241;
+    public long l09242;
+    public long l09243;
+    public long l09244;
+    public long l09245;
+    public long l09246;
+    public long l09247;
+    public long l09248;
+    public long l09249;
+    public long l09250;
+    public long l09251;
+    public long l09252;
+    public long l09253;
+    public long l09254;
+    public long l09255;
+    public long l09256;
+    public long l09257;
+    public long l09258;
+    public long l09259;
+    public long l09260;
+    public long l09261;
+    public long l09262;
+    public long l09263;
+    public long l09264;
+    public long l09265;
+    public long l09266;
+    public long l09267;
+    public long l09268;
+    public long l09269;
+    public long l09270;
+    public long l09271;
+    public long l09272;
+    public long l09273;
+    public long l09274;
+    public long l09275;
+    public long l09276;
+    public long l09277;
+    public long l09278;
+    public long l09279;
+    public long l09280;
+    public long l09281;
+    public long l09282;
+    public long l09283;
+    public long l09284;
+    public long l09285;
+    public long l09286;
+    public long l09287;
+    public long l09288;
+    public long l09289;
+    public long l09290;
+    public long l09291;
+    public long l09292;
+    public long l09293;
+    public long l09294;
+    public long l09295;
+    public long l09296;
+    public long l09297;
+    public long l09298;
+    public long l09299;
+    public long l09300;
+    public long l09301;
+    public long l09302;
+    public long l09303;
+    public long l09304;
+    public long l09305;
+    public long l09306;
+    public long l09307;
+    public long l09308;
+    public long l09309;
+    public long l09310;
+    public long l09311;
+    public long l09312;
+    public long l09313;
+    public long l09314;
+    public long l09315;
+    public long l09316;
+    public long l09317;
+    public long l09318;
+    public long l09319;
+    public long l09320;
+    public long l09321;
+    public long l09322;
+    public long l09323;
+    public long l09324;
+    public long l09325;
+    public long l09326;
+    public long l09327;
+    public long l09328;
+    public long l09329;
+    public long l09330;
+    public long l09331;
+    public long l09332;
+    public long l09333;
+    public long l09334;
+    public long l09335;
+    public long l09336;
+    public long l09337;
+    public long l09338;
+    public long l09339;
+    public long l09340;
+    public long l09341;
+    public long l09342;
+    public long l09343;
+    public long l09344;
+    public long l09345;
+    public long l09346;
+    public long l09347;
+    public long l09348;
+    public long l09349;
+    public long l09350;
+    public long l09351;
+    public long l09352;
+    public long l09353;
+    public long l09354;
+    public long l09355;
+    public long l09356;
+    public long l09357;
+    public long l09358;
+    public long l09359;
+    public long l09360;
+    public long l09361;
+    public long l09362;
+    public long l09363;
+    public long l09364;
+    public long l09365;
+    public long l09366;
+    public long l09367;
+    public long l09368;
+    public long l09369;
+    public long l09370;
+    public long l09371;
+    public long l09372;
+    public long l09373;
+    public long l09374;
+    public long l09375;
+    public long l09376;
+    public long l09377;
+    public long l09378;
+    public long l09379;
+    public long l09380;
+    public long l09381;
+    public long l09382;
+    public long l09383;
+    public long l09384;
+    public long l09385;
+    public long l09386;
+    public long l09387;
+    public long l09388;
+    public long l09389;
+    public long l09390;
+    public long l09391;
+    public long l09392;
+    public long l09393;
+    public long l09394;
+    public long l09395;
+    public long l09396;
+    public long l09397;
+    public long l09398;
+    public long l09399;
+    public long l09400;
+    public long l09401;
+    public long l09402;
+    public long l09403;
+    public long l09404;
+    public long l09405;
+    public long l09406;
+    public long l09407;
+    public long l09408;
+    public long l09409;
+    public long l09410;
+    public long l09411;
+    public long l09412;
+    public long l09413;
+    public long l09414;
+    public long l09415;
+    public long l09416;
+    public long l09417;
+    public long l09418;
+    public long l09419;
+    public long l09420;
+    public long l09421;
+    public long l09422;
+    public long l09423;
+    public long l09424;
+    public long l09425;
+    public long l09426;
+    public long l09427;
+    public long l09428;
+    public long l09429;
+    public long l09430;
+    public long l09431;
+    public long l09432;
+    public long l09433;
+    public long l09434;
+    public long l09435;
+    public long l09436;
+    public long l09437;
+    public long l09438;
+    public long l09439;
+    public long l09440;
+    public long l09441;
+    public long l09442;
+    public long l09443;
+    public long l09444;
+    public long l09445;
+    public long l09446;
+    public long l09447;
+    public long l09448;
+    public long l09449;
+    public long l09450;
+    public long l09451;
+    public long l09452;
+    public long l09453;
+    public long l09454;
+    public long l09455;
+    public long l09456;
+    public long l09457;
+    public long l09458;
+    public long l09459;
+    public long l09460;
+    public long l09461;
+    public long l09462;
+    public long l09463;
+    public long l09464;
+    public long l09465;
+    public long l09466;
+    public long l09467;
+    public long l09468;
+    public long l09469;
+    public long l09470;
+    public long l09471;
+    public long l09472;
+    public long l09473;
+    public long l09474;
+    public long l09475;
+    public long l09476;
+    public long l09477;
+    public long l09478;
+    public long l09479;
+    public long l09480;
+    public long l09481;
+    public long l09482;
+    public long l09483;
+    public long l09484;
+    public long l09485;
+    public long l09486;
+    public long l09487;
+    public long l09488;
+    public long l09489;
+    public long l09490;
+    public long l09491;
+    public long l09492;
+    public long l09493;
+    public long l09494;
+    public long l09495;
+    public long l09496;
+    public long l09497;
+    public long l09498;
+    public long l09499;
+    public long l09500;
+    public long l09501;
+    public long l09502;
+    public long l09503;
+    public long l09504;
+    public long l09505;
+    public long l09506;
+    public long l09507;
+    public long l09508;
+    public long l09509;
+    public long l09510;
+    public long l09511;
+    public long l09512;
+    public long l09513;
+    public long l09514;
+    public long l09515;
+    public long l09516;
+    public long l09517;
+    public long l09518;
+    public long l09519;
+    public long l09520;
+    public long l09521;
+    public long l09522;
+    public long l09523;
+    public long l09524;
+    public long l09525;
+    public long l09526;
+    public long l09527;
+    public long l09528;
+    public long l09529;
+    public long l09530;
+    public long l09531;
+    public long l09532;
+    public long l09533;
+    public long l09534;
+    public long l09535;
+    public long l09536;
+    public long l09537;
+    public long l09538;
+    public long l09539;
+    public long l09540;
+    public long l09541;
+    public long l09542;
+    public long l09543;
+    public long l09544;
+    public long l09545;
+    public long l09546;
+    public long l09547;
+    public long l09548;
+    public long l09549;
+    public long l09550;
+    public long l09551;
+    public long l09552;
+    public long l09553;
+    public long l09554;
+    public long l09555;
+    public long l09556;
+    public long l09557;
+    public long l09558;
+    public long l09559;
+    public long l09560;
+    public long l09561;
+    public long l09562;
+    public long l09563;
+    public long l09564;
+    public long l09565;
+    public long l09566;
+    public long l09567;
+    public long l09568;
+    public long l09569;
+    public long l09570;
+    public long l09571;
+    public long l09572;
+    public long l09573;
+    public long l09574;
+    public long l09575;
+    public long l09576;
+    public long l09577;
+    public long l09578;
+    public long l09579;
+    public long l09580;
+    public long l09581;
+    public long l09582;
+    public long l09583;
+    public long l09584;
+    public long l09585;
+    public long l09586;
+    public long l09587;
+    public long l09588;
+    public long l09589;
+    public long l09590;
+    public long l09591;
+    public long l09592;
+    public long l09593;
+    public long l09594;
+    public long l09595;
+    public long l09596;
+    public long l09597;
+    public long l09598;
+    public long l09599;
+    public long l09600;
+    public long l09601;
+    public long l09602;
+    public long l09603;
+    public long l09604;
+    public long l09605;
+    public long l09606;
+    public long l09607;
+    public long l09608;
+    public long l09609;
+    public long l09610;
+    public long l09611;
+    public long l09612;
+    public long l09613;
+    public long l09614;
+    public long l09615;
+    public long l09616;
+    public long l09617;
+    public long l09618;
+    public long l09619;
+    public long l09620;
+    public long l09621;
+    public long l09622;
+    public long l09623;
+    public long l09624;
+    public long l09625;
+    public long l09626;
+    public long l09627;
+    public long l09628;
+    public long l09629;
+    public long l09630;
+    public long l09631;
+    public long l09632;
+    public long l09633;
+    public long l09634;
+    public long l09635;
+    public long l09636;
+    public long l09637;
+    public long l09638;
+    public long l09639;
+    public long l09640;
+    public long l09641;
+    public long l09642;
+    public long l09643;
+    public long l09644;
+    public long l09645;
+    public long l09646;
+    public long l09647;
+    public long l09648;
+    public long l09649;
+    public long l09650;
+    public long l09651;
+    public long l09652;
+    public long l09653;
+    public long l09654;
+    public long l09655;
+    public long l09656;
+    public long l09657;
+    public long l09658;
+    public long l09659;
+    public long l09660;
+    public long l09661;
+    public long l09662;
+    public long l09663;
+    public long l09664;
+    public long l09665;
+    public long l09666;
+    public long l09667;
+    public long l09668;
+    public long l09669;
+    public long l09670;
+    public long l09671;
+    public long l09672;
+    public long l09673;
+    public long l09674;
+    public long l09675;
+    public long l09676;
+    public long l09677;
+    public long l09678;
+    public long l09679;
+    public long l09680;
+    public long l09681;
+    public long l09682;
+    public long l09683;
+    public long l09684;
+    public long l09685;
+    public long l09686;
+    public long l09687;
+    public long l09688;
+    public long l09689;
+    public long l09690;
+    public long l09691;
+    public long l09692;
+    public long l09693;
+    public long l09694;
+    public long l09695;
+    public long l09696;
+    public long l09697;
+    public long l09698;
+    public long l09699;
+    public long l09700;
+    public long l09701;
+    public long l09702;
+    public long l09703;
+    public long l09704;
+    public long l09705;
+    public long l09706;
+    public long l09707;
+    public long l09708;
+    public long l09709;
+    public long l09710;
+    public long l09711;
+    public long l09712;
+    public long l09713;
+    public long l09714;
+    public long l09715;
+    public long l09716;
+    public long l09717;
+    public long l09718;
+    public long l09719;
+    public long l09720;
+    public long l09721;
+    public long l09722;
+    public long l09723;
+    public long l09724;
+    public long l09725;
+    public long l09726;
+    public long l09727;
+    public long l09728;
+    public long l09729;
+    public long l09730;
+    public long l09731;
+    public long l09732;
+    public long l09733;
+    public long l09734;
+    public long l09735;
+    public long l09736;
+    public long l09737;
+    public long l09738;
+    public long l09739;
+    public long l09740;
+    public long l09741;
+    public long l09742;
+    public long l09743;
+    public long l09744;
+    public long l09745;
+    public long l09746;
+    public long l09747;
+    public long l09748;
+    public long l09749;
+    public long l09750;
+    public long l09751;
+    public long l09752;
+    public long l09753;
+    public long l09754;
+    public long l09755;
+    public long l09756;
+    public long l09757;
+    public long l09758;
+    public long l09759;
+    public long l09760;
+    public long l09761;
+    public long l09762;
+    public long l09763;
+    public long l09764;
+    public long l09765;
+    public long l09766;
+    public long l09767;
+    public long l09768;
+    public long l09769;
+    public long l09770;
+    public long l09771;
+    public long l09772;
+    public long l09773;
+    public long l09774;
+    public long l09775;
+    public long l09776;
+    public long l09777;
+    public long l09778;
+    public long l09779;
+    public long l09780;
+    public long l09781;
+    public long l09782;
+    public long l09783;
+    public long l09784;
+    public long l09785;
+    public long l09786;
+    public long l09787;
+    public long l09788;
+    public long l09789;
+    public long l09790;
+    public long l09791;
+    public long l09792;
+    public long l09793;
+    public long l09794;
+    public long l09795;
+    public long l09796;
+    public long l09797;
+    public long l09798;
+    public long l09799;
+    public long l09800;
+    public long l09801;
+    public long l09802;
+    public long l09803;
+    public long l09804;
+    public long l09805;
+    public long l09806;
+    public long l09807;
+    public long l09808;
+    public long l09809;
+    public long l09810;
+    public long l09811;
+    public long l09812;
+    public long l09813;
+    public long l09814;
+    public long l09815;
+    public long l09816;
+    public long l09817;
+    public long l09818;
+    public long l09819;
+    public long l09820;
+    public long l09821;
+    public long l09822;
+    public long l09823;
+    public long l09824;
+    public long l09825;
+    public long l09826;
+    public long l09827;
+    public long l09828;
+    public long l09829;
+    public long l09830;
+    public long l09831;
+    public long l09832;
+    public long l09833;
+    public long l09834;
+    public long l09835;
+    public long l09836;
+    public long l09837;
+    public long l09838;
+    public long l09839;
+    public long l09840;
+    public long l09841;
+    public long l09842;
+    public long l09843;
+    public long l09844;
+    public long l09845;
+    public long l09846;
+    public long l09847;
+    public long l09848;
+    public long l09849;
+    public long l09850;
+    public long l09851;
+    public long l09852;
+    public long l09853;
+    public long l09854;
+    public long l09855;
+    public long l09856;
+    public long l09857;
+    public long l09858;
+    public long l09859;
+    public long l09860;
+    public long l09861;
+    public long l09862;
+    public long l09863;
+    public long l09864;
+    public long l09865;
+    public long l09866;
+    public long l09867;
+    public long l09868;
+    public long l09869;
+    public long l09870;
+    public long l09871;
+    public long l09872;
+    public long l09873;
+    public long l09874;
+    public long l09875;
+    public long l09876;
+    public long l09877;
+    public long l09878;
+    public long l09879;
+    public long l09880;
+    public long l09881;
+    public long l09882;
+    public long l09883;
+    public long l09884;
+    public long l09885;
+    public long l09886;
+    public long l09887;
+    public long l09888;
+    public long l09889;
+    public long l09890;
+    public long l09891;
+    public long l09892;
+    public long l09893;
+    public long l09894;
+    public long l09895;
+    public long l09896;
+    public long l09897;
+    public long l09898;
+    public long l09899;
+    public long l09900;
+    public long l09901;
+    public long l09902;
+    public long l09903;
+    public long l09904;
+    public long l09905;
+    public long l09906;
+    public long l09907;
+    public long l09908;
+    public long l09909;
+    public long l09910;
+    public long l09911;
+    public long l09912;
+    public long l09913;
+    public long l09914;
+    public long l09915;
+    public long l09916;
+    public long l09917;
+    public long l09918;
+    public long l09919;
+    public long l09920;
+    public long l09921;
+    public long l09922;
+    public long l09923;
+    public long l09924;
+    public long l09925;
+    public long l09926;
+    public long l09927;
+    public long l09928;
+    public long l09929;
+    public long l09930;
+    public long l09931;
+    public long l09932;
+    public long l09933;
+    public long l09934;
+    public long l09935;
+    public long l09936;
+    public long l09937;
+    public long l09938;
+    public long l09939;
+    public long l09940;
+    public long l09941;
+    public long l09942;
+    public long l09943;
+    public long l09944;
+    public long l09945;
+    public long l09946;
+    public long l09947;
+    public long l09948;
+    public long l09949;
+    public long l09950;
+    public long l09951;
+    public long l09952;
+    public long l09953;
+    public long l09954;
+    public long l09955;
+    public long l09956;
+    public long l09957;
+    public long l09958;
+    public long l09959;
+    public long l09960;
+    public long l09961;
+    public long l09962;
+    public long l09963;
+    public long l09964;
+    public long l09965;
+    public long l09966;
+    public long l09967;
+    public long l09968;
+    public long l09969;
+    public long l09970;
+    public long l09971;
+    public long l09972;
+    public long l09973;
+    public long l09974;
+    public long l09975;
+    public long l09976;
+    public long l09977;
+    public long l09978;
+    public long l09979;
+    public long l09980;
+    public long l09981;
+    public long l09982;
+    public long l09983;
+    public long l09984;
+    public long l09985;
+    public long l09986;
+    public long l09987;
+    public long l09988;
+    public long l09989;
+    public long l09990;
+    public long l09991;
+    public long l09992;
+    public long l09993;
+    public long l09994;
+    public long l09995;
+    public long l09996;
+    public long l09997;
+    public long l09998;
+    public long l09999;
+    public long l10000;
+    public long l10001;
+    public long l10002;
+    public long l10003;
+    public long l10004;
+    public long l10005;
+    public long l10006;
+    public long l10007;
+    public long l10008;
+    public long l10009;
+    public long l10010;
+    public long l10011;
+    public long l10012;
+    public long l10013;
+    public long l10014;
+    public long l10015;
+    public long l10016;
+    public long l10017;
+    public long l10018;
+    public long l10019;
+    public long l10020;
+    public long l10021;
+    public long l10022;
+    public long l10023;
+    public long l10024;
+    public long l10025;
+    public long l10026;
+    public long l10027;
+    public long l10028;
+    public long l10029;
+    public long l10030;
+    public long l10031;
+    public long l10032;
+    public long l10033;
+    public long l10034;
+    public long l10035;
+    public long l10036;
+    public long l10037;
+    public long l10038;
+    public long l10039;
+    public long l10040;
+    public long l10041;
+    public long l10042;
+    public long l10043;
+    public long l10044;
+    public long l10045;
+    public long l10046;
+    public long l10047;
+    public long l10048;
+    public long l10049;
+    public long l10050;
+    public long l10051;
+    public long l10052;
+    public long l10053;
+    public long l10054;
+    public long l10055;
+    public long l10056;
+    public long l10057;
+    public long l10058;
+    public long l10059;
+    public long l10060;
+    public long l10061;
+    public long l10062;
+    public long l10063;
+    public long l10064;
+    public long l10065;
+    public long l10066;
+    public long l10067;
+    public long l10068;
+    public long l10069;
+    public long l10070;
+    public long l10071;
+    public long l10072;
+    public long l10073;
+    public long l10074;
+    public long l10075;
+    public long l10076;
+    public long l10077;
+    public long l10078;
+    public long l10079;
+    public long l10080;
+    public long l10081;
+    public long l10082;
+    public long l10083;
+    public long l10084;
+    public long l10085;
+    public long l10086;
+    public long l10087;
+    public long l10088;
+    public long l10089;
+    public long l10090;
+    public long l10091;
+    public long l10092;
+    public long l10093;
+    public long l10094;
+    public long l10095;
+    public long l10096;
+    public long l10097;
+    public long l10098;
+    public long l10099;
+    public long l10100;
+    public long l10101;
+    public long l10102;
+    public long l10103;
+    public long l10104;
+    public long l10105;
+    public long l10106;
+    public long l10107;
+    public long l10108;
+    public long l10109;
+    public long l10110;
+    public long l10111;
+    public long l10112;
+    public long l10113;
+    public long l10114;
+    public long l10115;
+    public long l10116;
+    public long l10117;
+    public long l10118;
+    public long l10119;
+    public long l10120;
+    public long l10121;
+    public long l10122;
+    public long l10123;
+    public long l10124;
+    public long l10125;
+    public long l10126;
+    public long l10127;
+    public long l10128;
+    public long l10129;
+    public long l10130;
+    public long l10131;
+    public long l10132;
+    public long l10133;
+    public long l10134;
+    public long l10135;
+    public long l10136;
+    public long l10137;
+    public long l10138;
+    public long l10139;
+    public long l10140;
+    public long l10141;
+    public long l10142;
+    public long l10143;
+    public long l10144;
+    public long l10145;
+    public long l10146;
+    public long l10147;
+    public long l10148;
+    public long l10149;
+    public long l10150;
+    public long l10151;
+    public long l10152;
+    public long l10153;
+    public long l10154;
+    public long l10155;
+    public long l10156;
+    public long l10157;
+    public long l10158;
+    public long l10159;
+    public long l10160;
+    public long l10161;
+    public long l10162;
+    public long l10163;
+    public long l10164;
+    public long l10165;
+    public long l10166;
+    public long l10167;
+    public long l10168;
+    public long l10169;
+    public long l10170;
+    public long l10171;
+    public long l10172;
+    public long l10173;
+    public long l10174;
+    public long l10175;
+    public long l10176;
+    public long l10177;
+    public long l10178;
+    public long l10179;
+    public long l10180;
+    public long l10181;
+    public long l10182;
+    public long l10183;
+    public long l10184;
+    public long l10185;
+    public long l10186;
+    public long l10187;
+    public long l10188;
+    public long l10189;
+    public long l10190;
+    public long l10191;
+    public long l10192;
+    public long l10193;
+    public long l10194;
+    public long l10195;
+    public long l10196;
+    public long l10197;
+    public long l10198;
+    public long l10199;
+    public long l10200;
+    public long l10201;
+    public long l10202;
+    public long l10203;
+    public long l10204;
+    public long l10205;
+    public long l10206;
+    public long l10207;
+    public long l10208;
+    public long l10209;
+    public long l10210;
+    public long l10211;
+    public long l10212;
+    public long l10213;
+    public long l10214;
+    public long l10215;
+    public long l10216;
+    public long l10217;
+    public long l10218;
+    public long l10219;
+    public long l10220;
+    public long l10221;
+    public long l10222;
+    public long l10223;
+    public long l10224;
+    public long l10225;
+    public long l10226;
+    public long l10227;
+    public long l10228;
+    public long l10229;
+    public long l10230;
+    public long l10231;
+    public long l10232;
+    public long l10233;
+    public long l10234;
+    public long l10235;
+    public long l10236;
+    public long l10237;
+    public long l10238;
+    public long l10239;
+    public long l10240;
+    public long l10241;
+    public long l10242;
+    public long l10243;
+    public long l10244;
+    public long l10245;
+    public long l10246;
+    public long l10247;
+    public long l10248;
+    public long l10249;
+    public long l10250;
+    public long l10251;
+    public long l10252;
+    public long l10253;
+    public long l10254;
+    public long l10255;
+    public long l10256;
+    public long l10257;
+    public long l10258;
+    public long l10259;
+    public long l10260;
+    public long l10261;
+    public long l10262;
+    public long l10263;
+    public long l10264;
+    public long l10265;
+    public long l10266;
+    public long l10267;
+    public long l10268;
+    public long l10269;
+    public long l10270;
+    public long l10271;
+    public long l10272;
+    public long l10273;
+    public long l10274;
+    public long l10275;
+    public long l10276;
+    public long l10277;
+    public long l10278;
+    public long l10279;
+    public long l10280;
+    public long l10281;
+    public long l10282;
+    public long l10283;
+    public long l10284;
+    public long l10285;
+    public long l10286;
+    public long l10287;
+    public long l10288;
+    public long l10289;
+    public long l10290;
+    public long l10291;
+    public long l10292;
+    public long l10293;
+    public long l10294;
+    public long l10295;
+    public long l10296;
+    public long l10297;
+    public long l10298;
+    public long l10299;
+    public long l10300;
+    public long l10301;
+    public long l10302;
+    public long l10303;
+    public long l10304;
+    public long l10305;
+    public long l10306;
+    public long l10307;
+    public long l10308;
+    public long l10309;
+    public long l10310;
+    public long l10311;
+    public long l10312;
+    public long l10313;
+    public long l10314;
+    public long l10315;
+    public long l10316;
+    public long l10317;
+    public long l10318;
+    public long l10319;
+    public long l10320;
+    public long l10321;
+    public long l10322;
+    public long l10323;
+    public long l10324;
+    public long l10325;
+    public long l10326;
+    public long l10327;
+    public long l10328;
+    public long l10329;
+    public long l10330;
+    public long l10331;
+    public long l10332;
+    public long l10333;
+    public long l10334;
+    public long l10335;
+    public long l10336;
+    public long l10337;
+    public long l10338;
+    public long l10339;
+    public long l10340;
+    public long l10341;
+    public long l10342;
+    public long l10343;
+    public long l10344;
+    public long l10345;
+    public long l10346;
+    public long l10347;
+    public long l10348;
+    public long l10349;
+    public long l10350;
+    public long l10351;
+    public long l10352;
+    public long l10353;
+    public long l10354;
+    public long l10355;
+    public long l10356;
+    public long l10357;
+    public long l10358;
+    public long l10359;
+    public long l10360;
+    public long l10361;
+    public long l10362;
+    public long l10363;
+    public long l10364;
+    public long l10365;
+    public long l10366;
+    public long l10367;
+    public long l10368;
+    public long l10369;
+    public long l10370;
+    public long l10371;
+    public long l10372;
+    public long l10373;
+    public long l10374;
+    public long l10375;
+    public long l10376;
+    public long l10377;
+    public long l10378;
+    public long l10379;
+    public long l10380;
+    public long l10381;
+    public long l10382;
+    public long l10383;
+    public long l10384;
+    public long l10385;
+    public long l10386;
+    public long l10387;
+    public long l10388;
+    public long l10389;
+    public long l10390;
+    public long l10391;
+    public long l10392;
+    public long l10393;
+    public long l10394;
+    public long l10395;
+    public long l10396;
+    public long l10397;
+    public long l10398;
+    public long l10399;
+    public long l10400;
+    public long l10401;
+    public long l10402;
+    public long l10403;
+    public long l10404;
+    public long l10405;
+    public long l10406;
+    public long l10407;
+    public long l10408;
+    public long l10409;
+    public long l10410;
+    public long l10411;
+    public long l10412;
+    public long l10413;
+    public long l10414;
+    public long l10415;
+    public long l10416;
+    public long l10417;
+    public long l10418;
+    public long l10419;
+    public long l10420;
+    public long l10421;
+    public long l10422;
+    public long l10423;
+    public long l10424;
+    public long l10425;
+    public long l10426;
+    public long l10427;
+    public long l10428;
+    public long l10429;
+    public long l10430;
+    public long l10431;
+    public long l10432;
+    public long l10433;
+    public long l10434;
+    public long l10435;
+    public long l10436;
+    public long l10437;
+    public long l10438;
+    public long l10439;
+    public long l10440;
+    public long l10441;
+    public long l10442;
+    public long l10443;
+    public long l10444;
+    public long l10445;
+    public long l10446;
+    public long l10447;
+    public long l10448;
+    public long l10449;
+    public long l10450;
+    public long l10451;
+    public long l10452;
+    public long l10453;
+    public long l10454;
+    public long l10455;
+    public long l10456;
+    public long l10457;
+    public long l10458;
+    public long l10459;
+    public long l10460;
+    public long l10461;
+    public long l10462;
+    public long l10463;
+    public long l10464;
+    public long l10465;
+    public long l10466;
+    public long l10467;
+    public long l10468;
+    public long l10469;
+    public long l10470;
+    public long l10471;
+    public long l10472;
+    public long l10473;
+    public long l10474;
+    public long l10475;
+    public long l10476;
+    public long l10477;
+    public long l10478;
+    public long l10479;
+    public long l10480;
+    public long l10481;
+    public long l10482;
+    public long l10483;
+    public long l10484;
+    public long l10485;
+    public long l10486;
+    public long l10487;
+    public long l10488;
+    public long l10489;
+    public long l10490;
+    public long l10491;
+    public long l10492;
+    public long l10493;
+    public long l10494;
+    public long l10495;
+    public long l10496;
+    public long l10497;
+    public long l10498;
+    public long l10499;
+    public long l10500;
+    public long l10501;
+    public long l10502;
+    public long l10503;
+    public long l10504;
+    public long l10505;
+    public long l10506;
+    public long l10507;
+    public long l10508;
+    public long l10509;
+    public long l10510;
+    public long l10511;
+    public long l10512;
+    public long l10513;
+    public long l10514;
+    public long l10515;
+    public long l10516;
+    public long l10517;
+    public long l10518;
+    public long l10519;
+    public long l10520;
+    public long l10521;
+    public long l10522;
+    public long l10523;
+    public long l10524;
+    public long l10525;
+    public long l10526;
+    public long l10527;
+    public long l10528;
+    public long l10529;
+    public long l10530;
+    public long l10531;
+    public long l10532;
+    public long l10533;
+    public long l10534;
+    public long l10535;
+    public long l10536;
+    public long l10537;
+    public long l10538;
+    public long l10539;
+    public long l10540;
+    public long l10541;
+    public long l10542;
+    public long l10543;
+    public long l10544;
+    public long l10545;
+    public long l10546;
+    public long l10547;
+    public long l10548;
+    public long l10549;
+    public long l10550;
+    public long l10551;
+    public long l10552;
+    public long l10553;
+    public long l10554;
+    public long l10555;
+    public long l10556;
+    public long l10557;
+    public long l10558;
+    public long l10559;
+    public long l10560;
+    public long l10561;
+    public long l10562;
+    public long l10563;
+    public long l10564;
+    public long l10565;
+    public long l10566;
+    public long l10567;
+    public long l10568;
+    public long l10569;
+    public long l10570;
+    public long l10571;
+    public long l10572;
+    public long l10573;
+    public long l10574;
+    public long l10575;
+    public long l10576;
+    public long l10577;
+    public long l10578;
+    public long l10579;
+    public long l10580;
+    public long l10581;
+    public long l10582;
+    public long l10583;
+    public long l10584;
+    public long l10585;
+    public long l10586;
+    public long l10587;
+    public long l10588;
+    public long l10589;
+    public long l10590;
+    public long l10591;
+    public long l10592;
+    public long l10593;
+    public long l10594;
+    public long l10595;
+    public long l10596;
+    public long l10597;
+    public long l10598;
+    public long l10599;
+    public long l10600;
+    public long l10601;
+    public long l10602;
+    public long l10603;
+    public long l10604;
+    public long l10605;
+    public long l10606;
+    public long l10607;
+    public long l10608;
+    public long l10609;
+    public long l10610;
+    public long l10611;
+    public long l10612;
+    public long l10613;
+    public long l10614;
+    public long l10615;
+    public long l10616;
+    public long l10617;
+    public long l10618;
+    public long l10619;
+    public long l10620;
+    public long l10621;
+    public long l10622;
+    public long l10623;
+    public long l10624;
+    public long l10625;
+    public long l10626;
+    public long l10627;
+    public long l10628;
+    public long l10629;
+    public long l10630;
+    public long l10631;
+    public long l10632;
+    public long l10633;
+    public long l10634;
+    public long l10635;
+    public long l10636;
+    public long l10637;
+    public long l10638;
+    public long l10639;
+    public long l10640;
+    public long l10641;
+    public long l10642;
+    public long l10643;
+    public long l10644;
+    public long l10645;
+    public long l10646;
+    public long l10647;
+    public long l10648;
+    public long l10649;
+    public long l10650;
+    public long l10651;
+    public long l10652;
+    public long l10653;
+    public long l10654;
+    public long l10655;
+    public long l10656;
+    public long l10657;
+    public long l10658;
+    public long l10659;
+    public long l10660;
+    public long l10661;
+    public long l10662;
+    public long l10663;
+    public long l10664;
+    public long l10665;
+    public long l10666;
+    public long l10667;
+    public long l10668;
+    public long l10669;
+    public long l10670;
+    public long l10671;
+    public long l10672;
+    public long l10673;
+    public long l10674;
+    public long l10675;
+    public long l10676;
+    public long l10677;
+    public long l10678;
+    public long l10679;
+    public long l10680;
+    public long l10681;
+    public long l10682;
+    public long l10683;
+    public long l10684;
+    public long l10685;
+    public long l10686;
+    public long l10687;
+    public long l10688;
+    public long l10689;
+    public long l10690;
+    public long l10691;
+    public long l10692;
+    public long l10693;
+    public long l10694;
+    public long l10695;
+    public long l10696;
+    public long l10697;
+    public long l10698;
+    public long l10699;
+    public long l10700;
+    public long l10701;
+    public long l10702;
+    public long l10703;
+    public long l10704;
+    public long l10705;
+    public long l10706;
+    public long l10707;
+    public long l10708;
+    public long l10709;
+    public long l10710;
+    public long l10711;
+    public long l10712;
+    public long l10713;
+    public long l10714;
+    public long l10715;
+    public long l10716;
+    public long l10717;
+    public long l10718;
+    public long l10719;
+    public long l10720;
+    public long l10721;
+    public long l10722;
+    public long l10723;
+    public long l10724;
+    public long l10725;
+    public long l10726;
+    public long l10727;
+    public long l10728;
+    public long l10729;
+    public long l10730;
+    public long l10731;
+    public long l10732;
+    public long l10733;
+    public long l10734;
+    public long l10735;
+    public long l10736;
+    public long l10737;
+    public long l10738;
+    public long l10739;
+    public long l10740;
+    public long l10741;
+    public long l10742;
+    public long l10743;
+    public long l10744;
+    public long l10745;
+    public long l10746;
+    public long l10747;
+    public long l10748;
+    public long l10749;
+    public long l10750;
+    public long l10751;
+    public long l10752;
+    public long l10753;
+    public long l10754;
+    public long l10755;
+    public long l10756;
+    public long l10757;
+    public long l10758;
+    public long l10759;
+    public long l10760;
+    public long l10761;
+    public long l10762;
+    public long l10763;
+    public long l10764;
+    public long l10765;
+    public long l10766;
+    public long l10767;
+    public long l10768;
+    public long l10769;
+    public long l10770;
+    public long l10771;
+    public long l10772;
+    public long l10773;
+    public long l10774;
+    public long l10775;
+    public long l10776;
+    public long l10777;
+    public long l10778;
+    public long l10779;
+    public long l10780;
+    public long l10781;
+    public long l10782;
+    public long l10783;
+    public long l10784;
+    public long l10785;
+    public long l10786;
+    public long l10787;
+    public long l10788;
+    public long l10789;
+    public long l10790;
+    public long l10791;
+    public long l10792;
+    public long l10793;
+    public long l10794;
+    public long l10795;
+    public long l10796;
+    public long l10797;
+    public long l10798;
+    public long l10799;
+    public long l10800;
+    public long l10801;
+    public long l10802;
+    public long l10803;
+    public long l10804;
+    public long l10805;
+    public long l10806;
+    public long l10807;
+    public long l10808;
+    public long l10809;
+    public long l10810;
+    public long l10811;
+    public long l10812;
+    public long l10813;
+    public long l10814;
+    public long l10815;
+    public long l10816;
+    public long l10817;
+    public long l10818;
+    public long l10819;
+    public long l10820;
+    public long l10821;
+    public long l10822;
+    public long l10823;
+    public long l10824;
+    public long l10825;
+    public long l10826;
+    public long l10827;
+    public long l10828;
+    public long l10829;
+    public long l10830;
+    public long l10831;
+    public long l10832;
+    public long l10833;
+    public long l10834;
+    public long l10835;
+    public long l10836;
+    public long l10837;
+    public long l10838;
+    public long l10839;
+    public long l10840;
+    public long l10841;
+    public long l10842;
+    public long l10843;
+    public long l10844;
+    public long l10845;
+    public long l10846;
+    public long l10847;
+    public long l10848;
+    public long l10849;
+    public long l10850;
+    public long l10851;
+    public long l10852;
+    public long l10853;
+    public long l10854;
+    public long l10855;
+    public long l10856;
+    public long l10857;
+    public long l10858;
+    public long l10859;
+    public long l10860;
+    public long l10861;
+    public long l10862;
+    public long l10863;
+    public long l10864;
+    public long l10865;
+    public long l10866;
+    public long l10867;
+    public long l10868;
+    public long l10869;
+    public long l10870;
+    public long l10871;
+    public long l10872;
+    public long l10873;
+    public long l10874;
+    public long l10875;
+    public long l10876;
+    public long l10877;
+    public long l10878;
+    public long l10879;
+    public long l10880;
+    public long l10881;
+    public long l10882;
+    public long l10883;
+    public long l10884;
+    public long l10885;
+    public long l10886;
+    public long l10887;
+    public long l10888;
+    public long l10889;
+    public long l10890;
+    public long l10891;
+    public long l10892;
+    public long l10893;
+    public long l10894;
+    public long l10895;
+    public long l10896;
+    public long l10897;
+    public long l10898;
+    public long l10899;
+    public long l10900;
+    public long l10901;
+    public long l10902;
+    public long l10903;
+    public long l10904;
+    public long l10905;
+    public long l10906;
+    public long l10907;
+    public long l10908;
+    public long l10909;
+    public long l10910;
+    public long l10911;
+    public long l10912;
+    public long l10913;
+    public long l10914;
+    public long l10915;
+    public long l10916;
+    public long l10917;
+    public long l10918;
+    public long l10919;
+    public long l10920;
+    public long l10921;
+    public long l10922;
+    public long l10923;
+    public long l10924;
+    public long l10925;
+    public long l10926;
+    public long l10927;
+    public long l10928;
+    public long l10929;
+    public long l10930;
+    public long l10931;
+    public long l10932;
+    public long l10933;
+    public long l10934;
+    public long l10935;
+    public long l10936;
+    public long l10937;
+    public long l10938;
+    public long l10939;
+    public long l10940;
+    public long l10941;
+    public long l10942;
+    public long l10943;
+    public long l10944;
+    public long l10945;
+    public long l10946;
+    public long l10947;
+    public long l10948;
+    public long l10949;
+    public long l10950;
+    public long l10951;
+    public long l10952;
+    public long l10953;
+    public long l10954;
+    public long l10955;
+    public long l10956;
+    public long l10957;
+    public long l10958;
+    public long l10959;
+    public long l10960;
+    public long l10961;
+    public long l10962;
+    public long l10963;
+    public long l10964;
+    public long l10965;
+    public long l10966;
+    public long l10967;
+    public long l10968;
+    public long l10969;
+    public long l10970;
+    public long l10971;
+    public long l10972;
+    public long l10973;
+    public long l10974;
+    public long l10975;
+    public long l10976;
+    public long l10977;
+    public long l10978;
+    public long l10979;
+    public long l10980;
+    public long l10981;
+    public long l10982;
+    public long l10983;
+    public long l10984;
+    public long l10985;
+    public long l10986;
+    public long l10987;
+    public long l10988;
+    public long l10989;
+    public long l10990;
+    public long l10991;
+    public long l10992;
+    public long l10993;
+    public long l10994;
+    public long l10995;
+    public long l10996;
+    public long l10997;
+    public long l10998;
+    public long l10999;
+    public long l11000;
+    public long l11001;
+    public long l11002;
+    public long l11003;
+    public long l11004;
+    public long l11005;
+    public long l11006;
+    public long l11007;
+    public long l11008;
+    public long l11009;
+    public long l11010;
+    public long l11011;
+    public long l11012;
+    public long l11013;
+    public long l11014;
+    public long l11015;
+    public long l11016;
+    public long l11017;
+    public long l11018;
+    public long l11019;
+    public long l11020;
+    public long l11021;
+    public long l11022;
+    public long l11023;
+    public long l11024;
+    public long l11025;
+    public long l11026;
+    public long l11027;
+    public long l11028;
+    public long l11029;
+    public long l11030;
+    public long l11031;
+    public long l11032;
+    public long l11033;
+    public long l11034;
+    public long l11035;
+    public long l11036;
+    public long l11037;
+    public long l11038;
+    public long l11039;
+    public long l11040;
+    public long l11041;
+    public long l11042;
+    public long l11043;
+    public long l11044;
+    public long l11045;
+    public long l11046;
+    public long l11047;
+    public long l11048;
+    public long l11049;
+    public long l11050;
+    public long l11051;
+    public long l11052;
+    public long l11053;
+    public long l11054;
+    public long l11055;
+    public long l11056;
+    public long l11057;
+    public long l11058;
+    public long l11059;
+    public long l11060;
+    public long l11061;
+    public long l11062;
+    public long l11063;
+    public long l11064;
+    public long l11065;
+    public long l11066;
+    public long l11067;
+    public long l11068;
+    public long l11069;
+    public long l11070;
+    public long l11071;
+    public long l11072;
+    public long l11073;
+    public long l11074;
+    public long l11075;
+    public long l11076;
+    public long l11077;
+    public long l11078;
+    public long l11079;
+    public long l11080;
+    public long l11081;
+    public long l11082;
+    public long l11083;
+    public long l11084;
+    public long l11085;
+    public long l11086;
+    public long l11087;
+    public long l11088;
+    public long l11089;
+    public long l11090;
+    public long l11091;
+    public long l11092;
+    public long l11093;
+    public long l11094;
+    public long l11095;
+    public long l11096;
+    public long l11097;
+    public long l11098;
+    public long l11099;
+    public long l11100;
+    public long l11101;
+    public long l11102;
+    public long l11103;
+    public long l11104;
+    public long l11105;
+    public long l11106;
+    public long l11107;
+    public long l11108;
+    public long l11109;
+    public long l11110;
+    public long l11111;
+    public long l11112;
+    public long l11113;
+    public long l11114;
+    public long l11115;
+    public long l11116;
+    public long l11117;
+    public long l11118;
+    public long l11119;
+    public long l11120;
+    public long l11121;
+    public long l11122;
+    public long l11123;
+    public long l11124;
+    public long l11125;
+    public long l11126;
+    public long l11127;
+    public long l11128;
+    public long l11129;
+    public long l11130;
+    public long l11131;
+    public long l11132;
+    public long l11133;
+    public long l11134;
+    public long l11135;
+    public long l11136;
+    public long l11137;
+    public long l11138;
+    public long l11139;
+    public long l11140;
+    public long l11141;
+    public long l11142;
+    public long l11143;
+    public long l11144;
+    public long l11145;
+    public long l11146;
+    public long l11147;
+    public long l11148;
+    public long l11149;
+    public long l11150;
+    public long l11151;
+    public long l11152;
+    public long l11153;
+    public long l11154;
+    public long l11155;
+    public long l11156;
+    public long l11157;
+    public long l11158;
+    public long l11159;
+    public long l11160;
+    public long l11161;
+    public long l11162;
+    public long l11163;
+    public long l11164;
+    public long l11165;
+    public long l11166;
+    public long l11167;
+    public long l11168;
+    public long l11169;
+    public long l11170;
+    public long l11171;
+    public long l11172;
+    public long l11173;
+    public long l11174;
+    public long l11175;
+    public long l11176;
+    public long l11177;
+    public long l11178;
+    public long l11179;
+    public long l11180;
+    public long l11181;
+    public long l11182;
+    public long l11183;
+    public long l11184;
+    public long l11185;
+    public long l11186;
+    public long l11187;
+    public long l11188;
+    public long l11189;
+    public long l11190;
+    public long l11191;
+    public long l11192;
+    public long l11193;
+    public long l11194;
+    public long l11195;
+    public long l11196;
+    public long l11197;
+    public long l11198;
+    public long l11199;
+    public long l11200;
+    public long l11201;
+    public long l11202;
+    public long l11203;
+    public long l11204;
+    public long l11205;
+    public long l11206;
+    public long l11207;
+    public long l11208;
+    public long l11209;
+    public long l11210;
+    public long l11211;
+    public long l11212;
+    public long l11213;
+    public long l11214;
+    public long l11215;
+    public long l11216;
+    public long l11217;
+    public long l11218;
+    public long l11219;
+    public long l11220;
+    public long l11221;
+    public long l11222;
+    public long l11223;
+    public long l11224;
+    public long l11225;
+    public long l11226;
+    public long l11227;
+    public long l11228;
+    public long l11229;
+    public long l11230;
+    public long l11231;
+    public long l11232;
+    public long l11233;
+    public long l11234;
+    public long l11235;
+    public long l11236;
+    public long l11237;
+    public long l11238;
+    public long l11239;
+    public long l11240;
+    public long l11241;
+    public long l11242;
+    public long l11243;
+    public long l11244;
+    public long l11245;
+    public long l11246;
+    public long l11247;
+    public long l11248;
+    public long l11249;
+    public long l11250;
+    public long l11251;
+    public long l11252;
+    public long l11253;
+    public long l11254;
+    public long l11255;
+    public long l11256;
+    public long l11257;
+    public long l11258;
+    public long l11259;
+    public long l11260;
+    public long l11261;
+    public long l11262;
+    public long l11263;
+    public long l11264;
+    public long l11265;
+    public long l11266;
+    public long l11267;
+    public long l11268;
+    public long l11269;
+    public long l11270;
+    public long l11271;
+    public long l11272;
+    public long l11273;
+    public long l11274;
+    public long l11275;
+    public long l11276;
+    public long l11277;
+    public long l11278;
+    public long l11279;
+    public long l11280;
+    public long l11281;
+    public long l11282;
+    public long l11283;
+    public long l11284;
+    public long l11285;
+    public long l11286;
+    public long l11287;
+    public long l11288;
+    public long l11289;
+    public long l11290;
+    public long l11291;
+    public long l11292;
+    public long l11293;
+    public long l11294;
+    public long l11295;
+    public long l11296;
+    public long l11297;
+    public long l11298;
+    public long l11299;
+    public long l11300;
+    public long l11301;
+    public long l11302;
+    public long l11303;
+    public long l11304;
+    public long l11305;
+    public long l11306;
+    public long l11307;
+    public long l11308;
+    public long l11309;
+    public long l11310;
+    public long l11311;
+    public long l11312;
+    public long l11313;
+    public long l11314;
+    public long l11315;
+    public long l11316;
+    public long l11317;
+    public long l11318;
+    public long l11319;
+    public long l11320;
+    public long l11321;
+    public long l11322;
+    public long l11323;
+    public long l11324;
+    public long l11325;
+    public long l11326;
+    public long l11327;
+    public long l11328;
+    public long l11329;
+    public long l11330;
+    public long l11331;
+    public long l11332;
+    public long l11333;
+    public long l11334;
+    public long l11335;
+    public long l11336;
+    public long l11337;
+    public long l11338;
+    public long l11339;
+    public long l11340;
+    public long l11341;
+    public long l11342;
+    public long l11343;
+    public long l11344;
+    public long l11345;
+    public long l11346;
+    public long l11347;
+    public long l11348;
+    public long l11349;
+    public long l11350;
+    public long l11351;
+    public long l11352;
+    public long l11353;
+    public long l11354;
+    public long l11355;
+    public long l11356;
+    public long l11357;
+    public long l11358;
+    public long l11359;
+    public long l11360;
+    public long l11361;
+    public long l11362;
+    public long l11363;
+    public long l11364;
+    public long l11365;
+    public long l11366;
+    public long l11367;
+    public long l11368;
+    public long l11369;
+    public long l11370;
+    public long l11371;
+    public long l11372;
+    public long l11373;
+    public long l11374;
+    public long l11375;
+    public long l11376;
+    public long l11377;
+    public long l11378;
+    public long l11379;
+    public long l11380;
+    public long l11381;
+    public long l11382;
+    public long l11383;
+    public long l11384;
+    public long l11385;
+    public long l11386;
+    public long l11387;
+    public long l11388;
+    public long l11389;
+    public long l11390;
+    public long l11391;
+    public long l11392;
+    public long l11393;
+    public long l11394;
+    public long l11395;
+    public long l11396;
+    public long l11397;
+    public long l11398;
+    public long l11399;
+    public long l11400;
+    public long l11401;
+    public long l11402;
+    public long l11403;
+    public long l11404;
+    public long l11405;
+    public long l11406;
+    public long l11407;
+    public long l11408;
+    public long l11409;
+    public long l11410;
+    public long l11411;
+    public long l11412;
+    public long l11413;
+    public long l11414;
+    public long l11415;
+    public long l11416;
+    public long l11417;
+    public long l11418;
+    public long l11419;
+    public long l11420;
+    public long l11421;
+    public long l11422;
+    public long l11423;
+    public long l11424;
+    public long l11425;
+    public long l11426;
+    public long l11427;
+    public long l11428;
+    public long l11429;
+    public long l11430;
+    public long l11431;
+    public long l11432;
+    public long l11433;
+    public long l11434;
+    public long l11435;
+    public long l11436;
+    public long l11437;
+    public long l11438;
+    public long l11439;
+    public long l11440;
+    public long l11441;
+    public long l11442;
+    public long l11443;
+    public long l11444;
+    public long l11445;
+    public long l11446;
+    public long l11447;
+    public long l11448;
+    public long l11449;
+    public long l11450;
+    public long l11451;
+    public long l11452;
+    public long l11453;
+    public long l11454;
+    public long l11455;
+    public long l11456;
+    public long l11457;
+    public long l11458;
+    public long l11459;
+    public long l11460;
+    public long l11461;
+    public long l11462;
+    public long l11463;
+    public long l11464;
+    public long l11465;
+    public long l11466;
+    public long l11467;
+    public long l11468;
+    public long l11469;
+    public long l11470;
+    public long l11471;
+    public long l11472;
+    public long l11473;
+    public long l11474;
+    public long l11475;
+    public long l11476;
+    public long l11477;
+    public long l11478;
+    public long l11479;
+    public long l11480;
+    public long l11481;
+    public long l11482;
+    public long l11483;
+    public long l11484;
+    public long l11485;
+    public long l11486;
+    public long l11487;
+    public long l11488;
+    public long l11489;
+    public long l11490;
+    public long l11491;
+    public long l11492;
+    public long l11493;
+    public long l11494;
+    public long l11495;
+    public long l11496;
+    public long l11497;
+    public long l11498;
+    public long l11499;
+    public long l11500;
+    public long l11501;
+    public long l11502;
+    public long l11503;
+    public long l11504;
+    public long l11505;
+    public long l11506;
+    public long l11507;
+    public long l11508;
+    public long l11509;
+    public long l11510;
+    public long l11511;
+    public long l11512;
+    public long l11513;
+    public long l11514;
+    public long l11515;
+    public long l11516;
+    public long l11517;
+    public long l11518;
+    public long l11519;
+    public long l11520;
+    public long l11521;
+    public long l11522;
+    public long l11523;
+    public long l11524;
+    public long l11525;
+    public long l11526;
+    public long l11527;
+    public long l11528;
+    public long l11529;
+    public long l11530;
+    public long l11531;
+    public long l11532;
+    public long l11533;
+    public long l11534;
+    public long l11535;
+    public long l11536;
+    public long l11537;
+    public long l11538;
+    public long l11539;
+    public long l11540;
+    public long l11541;
+    public long l11542;
+    public long l11543;
+    public long l11544;
+    public long l11545;
+    public long l11546;
+    public long l11547;
+    public long l11548;
+    public long l11549;
+    public long l11550;
+    public long l11551;
+    public long l11552;
+    public long l11553;
+    public long l11554;
+    public long l11555;
+    public long l11556;
+    public long l11557;
+    public long l11558;
+    public long l11559;
+    public long l11560;
+    public long l11561;
+    public long l11562;
+    public long l11563;
+    public long l11564;
+    public long l11565;
+    public long l11566;
+    public long l11567;
+    public long l11568;
+    public long l11569;
+    public long l11570;
+    public long l11571;
+    public long l11572;
+    public long l11573;
+    public long l11574;
+    public long l11575;
+    public long l11576;
+    public long l11577;
+    public long l11578;
+    public long l11579;
+    public long l11580;
+    public long l11581;
+    public long l11582;
+    public long l11583;
+    public long l11584;
+    public long l11585;
+    public long l11586;
+    public long l11587;
+    public long l11588;
+    public long l11589;
+    public long l11590;
+    public long l11591;
+    public long l11592;
+    public long l11593;
+    public long l11594;
+    public long l11595;
+    public long l11596;
+    public long l11597;
+    public long l11598;
+    public long l11599;
+    public long l11600;
+    public long l11601;
+    public long l11602;
+    public long l11603;
+    public long l11604;
+    public long l11605;
+    public long l11606;
+    public long l11607;
+    public long l11608;
+    public long l11609;
+    public long l11610;
+    public long l11611;
+    public long l11612;
+    public long l11613;
+    public long l11614;
+    public long l11615;
+    public long l11616;
+    public long l11617;
+    public long l11618;
+    public long l11619;
+    public long l11620;
+    public long l11621;
+    public long l11622;
+    public long l11623;
+    public long l11624;
+    public long l11625;
+    public long l11626;
+    public long l11627;
+    public long l11628;
+    public long l11629;
+    public long l11630;
+    public long l11631;
+    public long l11632;
+    public long l11633;
+    public long l11634;
+    public long l11635;
+    public long l11636;
+    public long l11637;
+    public long l11638;
+    public long l11639;
+    public long l11640;
+    public long l11641;
+    public long l11642;
+    public long l11643;
+    public long l11644;
+    public long l11645;
+    public long l11646;
+    public long l11647;
+    public long l11648;
+    public long l11649;
+    public long l11650;
+    public long l11651;
+    public long l11652;
+    public long l11653;
+    public long l11654;
+    public long l11655;
+    public long l11656;
+    public long l11657;
+    public long l11658;
+    public long l11659;
+    public long l11660;
+    public long l11661;
+    public long l11662;
+    public long l11663;
+    public long l11664;
+    public long l11665;
+    public long l11666;
+    public long l11667;
+    public long l11668;
+    public long l11669;
+    public long l11670;
+    public long l11671;
+    public long l11672;
+    public long l11673;
+    public long l11674;
+    public long l11675;
+    public long l11676;
+    public long l11677;
+    public long l11678;
+    public long l11679;
+    public long l11680;
+    public long l11681;
+    public long l11682;
+    public long l11683;
+    public long l11684;
+    public long l11685;
+    public long l11686;
+    public long l11687;
+    public long l11688;
+    public long l11689;
+    public long l11690;
+    public long l11691;
+    public long l11692;
+    public long l11693;
+    public long l11694;
+    public long l11695;
+    public long l11696;
+    public long l11697;
+    public long l11698;
+    public long l11699;
+    public long l11700;
+    public long l11701;
+    public long l11702;
+    public long l11703;
+    public long l11704;
+    public long l11705;
+    public long l11706;
+    public long l11707;
+    public long l11708;
+    public long l11709;
+    public long l11710;
+    public long l11711;
+    public long l11712;
+    public long l11713;
+    public long l11714;
+    public long l11715;
+    public long l11716;
+    public long l11717;
+    public long l11718;
+    public long l11719;
+    public long l11720;
+    public long l11721;
+    public long l11722;
+    public long l11723;
+    public long l11724;
+    public long l11725;
+    public long l11726;
+    public long l11727;
+    public long l11728;
+    public long l11729;
+    public long l11730;
+    public long l11731;
+    public long l11732;
+    public long l11733;
+    public long l11734;
+    public long l11735;
+    public long l11736;
+    public long l11737;
+    public long l11738;
+    public long l11739;
+    public long l11740;
+    public long l11741;
+    public long l11742;
+    public long l11743;
+    public long l11744;
+    public long l11745;
+    public long l11746;
+    public long l11747;
+    public long l11748;
+    public long l11749;
+    public long l11750;
+    public long l11751;
+    public long l11752;
+    public long l11753;
+    public long l11754;
+    public long l11755;
+    public long l11756;
+    public long l11757;
+    public long l11758;
+    public long l11759;
+    public long l11760;
+    public long l11761;
+    public long l11762;
+    public long l11763;
+    public long l11764;
+    public long l11765;
+    public long l11766;
+    public long l11767;
+    public long l11768;
+    public long l11769;
+    public long l11770;
+    public long l11771;
+    public long l11772;
+    public long l11773;
+    public long l11774;
+    public long l11775;
+    public long l11776;
+    public long l11777;
+    public long l11778;
+    public long l11779;
+    public long l11780;
+    public long l11781;
+    public long l11782;
+    public long l11783;
+    public long l11784;
+    public long l11785;
+    public long l11786;
+    public long l11787;
+    public long l11788;
+    public long l11789;
+    public long l11790;
+    public long l11791;
+    public long l11792;
+    public long l11793;
+    public long l11794;
+    public long l11795;
+    public long l11796;
+    public long l11797;
+    public long l11798;
+    public long l11799;
+    public long l11800;
+    public long l11801;
+    public long l11802;
+    public long l11803;
+    public long l11804;
+    public long l11805;
+    public long l11806;
+    public long l11807;
+    public long l11808;
+    public long l11809;
+    public long l11810;
+    public long l11811;
+    public long l11812;
+    public long l11813;
+    public long l11814;
+    public long l11815;
+    public long l11816;
+    public long l11817;
+    public long l11818;
+    public long l11819;
+    public long l11820;
+    public long l11821;
+    public long l11822;
+    public long l11823;
+    public long l11824;
+    public long l11825;
+    public long l11826;
+    public long l11827;
+    public long l11828;
+    public long l11829;
+    public long l11830;
+    public long l11831;
+    public long l11832;
+    public long l11833;
+    public long l11834;
+    public long l11835;
+    public long l11836;
+    public long l11837;
+    public long l11838;
+    public long l11839;
+    public long l11840;
+    public long l11841;
+    public long l11842;
+    public long l11843;
+    public long l11844;
+    public long l11845;
+    public long l11846;
+    public long l11847;
+    public long l11848;
+    public long l11849;
+    public long l11850;
+    public long l11851;
+    public long l11852;
+    public long l11853;
+    public long l11854;
+    public long l11855;
+    public long l11856;
+    public long l11857;
+    public long l11858;
+    public long l11859;
+    public long l11860;
+    public long l11861;
+    public long l11862;
+    public long l11863;
+    public long l11864;
+    public long l11865;
+    public long l11866;
+    public long l11867;
+    public long l11868;
+    public long l11869;
+    public long l11870;
+    public long l11871;
+    public long l11872;
+    public long l11873;
+    public long l11874;
+    public long l11875;
+    public long l11876;
+    public long l11877;
+    public long l11878;
+    public long l11879;
+    public long l11880;
+    public long l11881;
+    public long l11882;
+    public long l11883;
+    public long l11884;
+    public long l11885;
+    public long l11886;
+    public long l11887;
+    public long l11888;
+    public long l11889;
+    public long l11890;
+    public long l11891;
+    public long l11892;
+    public long l11893;
+    public long l11894;
+    public long l11895;
+    public long l11896;
+    public long l11897;
+    public long l11898;
+    public long l11899;
+    public long l11900;
+    public long l11901;
+    public long l11902;
+    public long l11903;
+    public long l11904;
+    public long l11905;
+    public long l11906;
+    public long l11907;
+    public long l11908;
+    public long l11909;
+    public long l11910;
+    public long l11911;
+    public long l11912;
+    public long l11913;
+    public long l11914;
+    public long l11915;
+    public long l11916;
+    public long l11917;
+    public long l11918;
+    public long l11919;
+    public long l11920;
+    public long l11921;
+    public long l11922;
+    public long l11923;
+    public long l11924;
+    public long l11925;
+    public long l11926;
+    public long l11927;
+    public long l11928;
+    public long l11929;
+    public long l11930;
+    public long l11931;
+    public long l11932;
+    public long l11933;
+    public long l11934;
+    public long l11935;
+    public long l11936;
+    public long l11937;
+    public long l11938;
+    public long l11939;
+    public long l11940;
+    public long l11941;
+    public long l11942;
+    public long l11943;
+    public long l11944;
+    public long l11945;
+    public long l11946;
+    public long l11947;
+    public long l11948;
+    public long l11949;
+    public long l11950;
+    public long l11951;
+    public long l11952;
+    public long l11953;
+    public long l11954;
+    public long l11955;
+    public long l11956;
+    public long l11957;
+    public long l11958;
+    public long l11959;
+    public long l11960;
+    public long l11961;
+    public long l11962;
+    public long l11963;
+    public long l11964;
+    public long l11965;
+    public long l11966;
+    public long l11967;
+    public long l11968;
+    public long l11969;
+    public long l11970;
+    public long l11971;
+    public long l11972;
+    public long l11973;
+    public long l11974;
+    public long l11975;
+    public long l11976;
+    public long l11977;
+    public long l11978;
+    public long l11979;
+    public long l11980;
+    public long l11981;
+    public long l11982;
+    public long l11983;
+    public long l11984;
+    public long l11985;
+    public long l11986;
+    public long l11987;
+    public long l11988;
+    public long l11989;
+    public long l11990;
+    public long l11991;
+    public long l11992;
+    public long l11993;
+    public long l11994;
+    public long l11995;
+    public long l11996;
+    public long l11997;
+    public long l11998;
+    public long l11999;
+    public long l12000;
+    public long l12001;
+    public long l12002;
+    public long l12003;
+    public long l12004;
+    public long l12005;
+    public long l12006;
+    public long l12007;
+    public long l12008;
+    public long l12009;
+    public long l12010;
+    public long l12011;
+    public long l12012;
+    public long l12013;
+    public long l12014;
+    public long l12015;
+    public long l12016;
+    public long l12017;
+    public long l12018;
+    public long l12019;
+    public long l12020;
+    public long l12021;
+    public long l12022;
+    public long l12023;
+    public long l12024;
+    public long l12025;
+    public long l12026;
+    public long l12027;
+    public long l12028;
+    public long l12029;
+    public long l12030;
+    public long l12031;
+    public long l12032;
+    public long l12033;
+    public long l12034;
+    public long l12035;
+    public long l12036;
+    public long l12037;
+    public long l12038;
+    public long l12039;
+    public long l12040;
+    public long l12041;
+    public long l12042;
+    public long l12043;
+    public long l12044;
+    public long l12045;
+    public long l12046;
+    public long l12047;
+    public long l12048;
+    public long l12049;
+    public long l12050;
+    public long l12051;
+    public long l12052;
+    public long l12053;
+    public long l12054;
+    public long l12055;
+    public long l12056;
+    public long l12057;
+    public long l12058;
+    public long l12059;
+    public long l12060;
+    public long l12061;
+    public long l12062;
+    public long l12063;
+    public long l12064;
+    public long l12065;
+    public long l12066;
+    public long l12067;
+    public long l12068;
+    public long l12069;
+    public long l12070;
+    public long l12071;
+    public long l12072;
+    public long l12073;
+    public long l12074;
+    public long l12075;
+    public long l12076;
+    public long l12077;
+    public long l12078;
+    public long l12079;
+    public long l12080;
+    public long l12081;
+    public long l12082;
+    public long l12083;
+    public long l12084;
+    public long l12085;
+    public long l12086;
+    public long l12087;
+    public long l12088;
+    public long l12089;
+    public long l12090;
+    public long l12091;
+    public long l12092;
+    public long l12093;
+    public long l12094;
+    public long l12095;
+    public long l12096;
+    public long l12097;
+    public long l12098;
+    public long l12099;
+    public long l12100;
+    public long l12101;
+    public long l12102;
+    public long l12103;
+    public long l12104;
+    public long l12105;
+    public long l12106;
+    public long l12107;
+    public long l12108;
+    public long l12109;
+    public long l12110;
+    public long l12111;
+    public long l12112;
+    public long l12113;
+    public long l12114;
+    public long l12115;
+    public long l12116;
+    public long l12117;
+    public long l12118;
+    public long l12119;
+    public long l12120;
+    public long l12121;
+    public long l12122;
+    public long l12123;
+    public long l12124;
+    public long l12125;
+    public long l12126;
+    public long l12127;
+    public long l12128;
+    public long l12129;
+    public long l12130;
+    public long l12131;
+    public long l12132;
+    public long l12133;
+    public long l12134;
+    public long l12135;
+    public long l12136;
+    public long l12137;
+    public long l12138;
+    public long l12139;
+    public long l12140;
+    public long l12141;
+    public long l12142;
+    public long l12143;
+    public long l12144;
+    public long l12145;
+    public long l12146;
+    public long l12147;
+    public long l12148;
+    public long l12149;
+    public long l12150;
+    public long l12151;
+    public long l12152;
+    public long l12153;
+    public long l12154;
+    public long l12155;
+    public long l12156;
+    public long l12157;
+    public long l12158;
+    public long l12159;
+    public long l12160;
+    public long l12161;
+    public long l12162;
+    public long l12163;
+    public long l12164;
+    public long l12165;
+    public long l12166;
+    public long l12167;
+    public long l12168;
+    public long l12169;
+    public long l12170;
+    public long l12171;
+    public long l12172;
+    public long l12173;
+    public long l12174;
+    public long l12175;
+    public long l12176;
+    public long l12177;
+    public long l12178;
+    public long l12179;
+    public long l12180;
+    public long l12181;
+    public long l12182;
+    public long l12183;
+    public long l12184;
+    public long l12185;
+    public long l12186;
+    public long l12187;
+    public long l12188;
+    public long l12189;
+    public long l12190;
+    public long l12191;
+    public long l12192;
+    public long l12193;
+    public long l12194;
+    public long l12195;
+    public long l12196;
+    public long l12197;
+    public long l12198;
+    public long l12199;
+    public long l12200;
+    public long l12201;
+    public long l12202;
+    public long l12203;
+    public long l12204;
+    public long l12205;
+    public long l12206;
+    public long l12207;
+    public long l12208;
+    public long l12209;
+    public long l12210;
+    public long l12211;
+    public long l12212;
+    public long l12213;
+    public long l12214;
+    public long l12215;
+    public long l12216;
+    public long l12217;
+    public long l12218;
+    public long l12219;
+    public long l12220;
+    public long l12221;
+    public long l12222;
+    public long l12223;
+    public long l12224;
+    public long l12225;
+    public long l12226;
+    public long l12227;
+    public long l12228;
+    public long l12229;
+    public long l12230;
+    public long l12231;
+    public long l12232;
+    public long l12233;
+    public long l12234;
+    public long l12235;
+    public long l12236;
+    public long l12237;
+    public long l12238;
+    public long l12239;
+    public long l12240;
+    public long l12241;
+    public long l12242;
+    public long l12243;
+    public long l12244;
+    public long l12245;
+    public long l12246;
+    public long l12247;
+    public long l12248;
+    public long l12249;
+    public long l12250;
+    public long l12251;
+    public long l12252;
+    public long l12253;
+    public long l12254;
+    public long l12255;
+    public long l12256;
+    public long l12257;
+    public long l12258;
+    public long l12259;
+    public long l12260;
+    public long l12261;
+    public long l12262;
+    public long l12263;
+    public long l12264;
+    public long l12265;
+    public long l12266;
+    public long l12267;
+    public long l12268;
+    public long l12269;
+    public long l12270;
+    public long l12271;
+    public long l12272;
+    public long l12273;
+    public long l12274;
+    public long l12275;
+    public long l12276;
+    public long l12277;
+    public long l12278;
+    public long l12279;
+    public long l12280;
+    public long l12281;
+    public long l12282;
+    public long l12283;
+    public long l12284;
+    public long l12285;
+    public long l12286;
+    public long l12287;
+    public long l12288;
+    public long l12289;
+    public long l12290;
+    public long l12291;
+    public long l12292;
+    public long l12293;
+    public long l12294;
+    public long l12295;
+    public long l12296;
+    public long l12297;
+    public long l12298;
+    public long l12299;
+    public long l12300;
+    public long l12301;
+    public long l12302;
+    public long l12303;
+    public long l12304;
+    public long l12305;
+    public long l12306;
+    public long l12307;
+    public long l12308;
+    public long l12309;
+    public long l12310;
+    public long l12311;
+    public long l12312;
+    public long l12313;
+    public long l12314;
+    public long l12315;
+    public long l12316;
+    public long l12317;
+    public long l12318;
+    public long l12319;
+    public long l12320;
+    public long l12321;
+    public long l12322;
+    public long l12323;
+    public long l12324;
+    public long l12325;
+    public long l12326;
+    public long l12327;
+    public long l12328;
+    public long l12329;
+    public long l12330;
+    public long l12331;
+    public long l12332;
+    public long l12333;
+    public long l12334;
+    public long l12335;
+    public long l12336;
+    public long l12337;
+    public long l12338;
+    public long l12339;
+    public long l12340;
+    public long l12341;
+    public long l12342;
+    public long l12343;
+    public long l12344;
+    public long l12345;
+    public long l12346;
+    public long l12347;
+    public long l12348;
+    public long l12349;
+    public long l12350;
+    public long l12351;
+    public long l12352;
+    public long l12353;
+    public long l12354;
+    public long l12355;
+    public long l12356;
+    public long l12357;
+    public long l12358;
+    public long l12359;
+    public long l12360;
+    public long l12361;
+    public long l12362;
+    public long l12363;
+    public long l12364;
+    public long l12365;
+    public long l12366;
+    public long l12367;
+    public long l12368;
+    public long l12369;
+    public long l12370;
+    public long l12371;
+    public long l12372;
+    public long l12373;
+    public long l12374;
+    public long l12375;
+    public long l12376;
+    public long l12377;
+    public long l12378;
+    public long l12379;
+    public long l12380;
+    public long l12381;
+    public long l12382;
+    public long l12383;
+    public long l12384;
+    public long l12385;
+    public long l12386;
+    public long l12387;
+    public long l12388;
+    public long l12389;
+    public long l12390;
+    public long l12391;
+    public long l12392;
+    public long l12393;
+    public long l12394;
+    public long l12395;
+    public long l12396;
+    public long l12397;
+    public long l12398;
+    public long l12399;
+    public long l12400;
+    public long l12401;
+    public long l12402;
+    public long l12403;
+    public long l12404;
+    public long l12405;
+    public long l12406;
+    public long l12407;
+    public long l12408;
+    public long l12409;
+    public long l12410;
+    public long l12411;
+    public long l12412;
+    public long l12413;
+    public long l12414;
+    public long l12415;
+    public long l12416;
+    public long l12417;
+    public long l12418;
+    public long l12419;
+    public long l12420;
+    public long l12421;
+    public long l12422;
+    public long l12423;
+    public long l12424;
+    public long l12425;
+    public long l12426;
+    public long l12427;
+    public long l12428;
+    public long l12429;
+    public long l12430;
+    public long l12431;
+    public long l12432;
+    public long l12433;
+    public long l12434;
+    public long l12435;
+    public long l12436;
+    public long l12437;
+    public long l12438;
+    public long l12439;
+    public long l12440;
+    public long l12441;
+    public long l12442;
+    public long l12443;
+    public long l12444;
+    public long l12445;
+    public long l12446;
+    public long l12447;
+    public long l12448;
+    public long l12449;
+    public long l12450;
+    public long l12451;
+    public long l12452;
+    public long l12453;
+    public long l12454;
+    public long l12455;
+    public long l12456;
+    public long l12457;
+    public long l12458;
+    public long l12459;
+    public long l12460;
+    public long l12461;
+    public long l12462;
+    public long l12463;
+    public long l12464;
+    public long l12465;
+    public long l12466;
+    public long l12467;
+    public long l12468;
+    public long l12469;
+    public long l12470;
+    public long l12471;
+    public long l12472;
+    public long l12473;
+    public long l12474;
+    public long l12475;
+    public long l12476;
+    public long l12477;
+    public long l12478;
+    public long l12479;
+    public long l12480;
+    public long l12481;
+    public long l12482;
+    public long l12483;
+    public long l12484;
+    public long l12485;
+    public long l12486;
+    public long l12487;
+    public long l12488;
+    public long l12489;
+    public long l12490;
+    public long l12491;
+    public long l12492;
+    public long l12493;
+    public long l12494;
+    public long l12495;
+    public long l12496;
+    public long l12497;
+    public long l12498;
+    public long l12499;
+    public long l12500;
+    public long l12501;
+    public long l12502;
+    public long l12503;
+    public long l12504;
+    public long l12505;
+    public long l12506;
+    public long l12507;
+    public long l12508;
+    public long l12509;
+    public long l12510;
+    public long l12511;
+    public long l12512;
+    public long l12513;
+    public long l12514;
+    public long l12515;
+    public long l12516;
+    public long l12517;
+    public long l12518;
+    public long l12519;
+    public long l12520;
+    public long l12521;
+    public long l12522;
+    public long l12523;
+    public long l12524;
+    public long l12525;
+    public long l12526;
+    public long l12527;
+    public long l12528;
+    public long l12529;
+    public long l12530;
+    public long l12531;
+    public long l12532;
+    public long l12533;
+    public long l12534;
+    public long l12535;
+    public long l12536;
+    public long l12537;
+    public long l12538;
+    public long l12539;
+    public long l12540;
+    public long l12541;
+    public long l12542;
+    public long l12543;
+    public long l12544;
+    public long l12545;
+    public long l12546;
+    public long l12547;
+    public long l12548;
+    public long l12549;
+    public long l12550;
+    public long l12551;
+    public long l12552;
+    public long l12553;
+    public long l12554;
+    public long l12555;
+    public long l12556;
+    public long l12557;
+    public long l12558;
+    public long l12559;
+    public long l12560;
+    public long l12561;
+    public long l12562;
+    public long l12563;
+    public long l12564;
+    public long l12565;
+    public long l12566;
+    public long l12567;
+    public long l12568;
+    public long l12569;
+    public long l12570;
+    public long l12571;
+    public long l12572;
+    public long l12573;
+    public long l12574;
+    public long l12575;
+    public long l12576;
+    public long l12577;
+    public long l12578;
+    public long l12579;
+    public long l12580;
+    public long l12581;
+    public long l12582;
+    public long l12583;
+    public long l12584;
+    public long l12585;
+    public long l12586;
+    public long l12587;
+    public long l12588;
+    public long l12589;
+    public long l12590;
+    public long l12591;
+    public long l12592;
+    public long l12593;
+    public long l12594;
+    public long l12595;
+    public long l12596;
+    public long l12597;
+    public long l12598;
+    public long l12599;
+    public long l12600;
+    public long l12601;
+    public long l12602;
+    public long l12603;
+    public long l12604;
+    public long l12605;
+    public long l12606;
+    public long l12607;
+    public long l12608;
+    public long l12609;
+    public long l12610;
+    public long l12611;
+    public long l12612;
+    public long l12613;
+    public long l12614;
+    public long l12615;
+    public long l12616;
+    public long l12617;
+    public long l12618;
+    public long l12619;
+    public long l12620;
+    public long l12621;
+    public long l12622;
+    public long l12623;
+    public long l12624;
+    public long l12625;
+    public long l12626;
+    public long l12627;
+    public long l12628;
+    public long l12629;
+    public long l12630;
+    public long l12631;
+    public long l12632;
+    public long l12633;
+    public long l12634;
+    public long l12635;
+    public long l12636;
+    public long l12637;
+    public long l12638;
+    public long l12639;
+    public long l12640;
+    public long l12641;
+    public long l12642;
+    public long l12643;
+    public long l12644;
+    public long l12645;
+    public long l12646;
+    public long l12647;
+    public long l12648;
+    public long l12649;
+    public long l12650;
+    public long l12651;
+    public long l12652;
+    public long l12653;
+    public long l12654;
+    public long l12655;
+    public long l12656;
+    public long l12657;
+    public long l12658;
+    public long l12659;
+    public long l12660;
+    public long l12661;
+    public long l12662;
+    public long l12663;
+    public long l12664;
+    public long l12665;
+    public long l12666;
+    public long l12667;
+    public long l12668;
+    public long l12669;
+    public long l12670;
+    public long l12671;
+    public long l12672;
+    public long l12673;
+    public long l12674;
+    public long l12675;
+    public long l12676;
+    public long l12677;
+    public long l12678;
+    public long l12679;
+    public long l12680;
+    public long l12681;
+    public long l12682;
+    public long l12683;
+    public long l12684;
+    public long l12685;
+    public long l12686;
+    public long l12687;
+    public long l12688;
+    public long l12689;
+    public long l12690;
+    public long l12691;
+    public long l12692;
+    public long l12693;
+    public long l12694;
+    public long l12695;
+    public long l12696;
+    public long l12697;
+    public long l12698;
+    public long l12699;
+    public long l12700;
+    public long l12701;
+    public long l12702;
+    public long l12703;
+    public long l12704;
+    public long l12705;
+    public long l12706;
+    public long l12707;
+    public long l12708;
+    public long l12709;
+    public long l12710;
+    public long l12711;
+    public long l12712;
+    public long l12713;
+    public long l12714;
+    public long l12715;
+    public long l12716;
+    public long l12717;
+    public long l12718;
+    public long l12719;
+    public long l12720;
+    public long l12721;
+    public long l12722;
+    public long l12723;
+    public long l12724;
+    public long l12725;
+    public long l12726;
+    public long l12727;
+    public long l12728;
+    public long l12729;
+    public long l12730;
+    public long l12731;
+    public long l12732;
+    public long l12733;
+    public long l12734;
+    public long l12735;
+    public long l12736;
+    public long l12737;
+    public long l12738;
+    public long l12739;
+    public long l12740;
+    public long l12741;
+    public long l12742;
+    public long l12743;
+    public long l12744;
+    public long l12745;
+    public long l12746;
+    public long l12747;
+    public long l12748;
+    public long l12749;
+    public long l12750;
+    public long l12751;
+    public long l12752;
+    public long l12753;
+    public long l12754;
+    public long l12755;
+    public long l12756;
+    public long l12757;
+    public long l12758;
+    public long l12759;
+    public long l12760;
+    public long l12761;
+    public long l12762;
+    public long l12763;
+    public long l12764;
+    public long l12765;
+    public long l12766;
+    public long l12767;
+    public long l12768;
+    public long l12769;
+    public long l12770;
+    public long l12771;
+    public long l12772;
+    public long l12773;
+    public long l12774;
+    public long l12775;
+    public long l12776;
+    public long l12777;
+    public long l12778;
+    public long l12779;
+    public long l12780;
+    public long l12781;
+    public long l12782;
+    public long l12783;
+    public long l12784;
+    public long l12785;
+    public long l12786;
+    public long l12787;
+    public long l12788;
+    public long l12789;
+    public long l12790;
+    public long l12791;
+    public long l12792;
+    public long l12793;
+    public long l12794;
+    public long l12795;
+    public long l12796;
+    public long l12797;
+    public long l12798;
+    public long l12799;
+    public long l12800;
+    public long l12801;
+    public long l12802;
+    public long l12803;
+    public long l12804;
+    public long l12805;
+    public long l12806;
+    public long l12807;
+    public long l12808;
+    public long l12809;
+    public long l12810;
+    public long l12811;
+    public long l12812;
+    public long l12813;
+    public long l12814;
+    public long l12815;
+    public long l12816;
+    public long l12817;
+    public long l12818;
+    public long l12819;
+    public long l12820;
+    public long l12821;
+    public long l12822;
+    public long l12823;
+    public long l12824;
+    public long l12825;
+    public long l12826;
+    public long l12827;
+    public long l12828;
+    public long l12829;
+    public long l12830;
+    public long l12831;
+    public long l12832;
+    public long l12833;
+    public long l12834;
+    public long l12835;
+    public long l12836;
+    public long l12837;
+    public long l12838;
+    public long l12839;
+    public long l12840;
+    public long l12841;
+    public long l12842;
+    public long l12843;
+    public long l12844;
+    public long l12845;
+    public long l12846;
+    public long l12847;
+    public long l12848;
+    public long l12849;
+    public long l12850;
+    public long l12851;
+    public long l12852;
+    public long l12853;
+    public long l12854;
+    public long l12855;
+    public long l12856;
+    public long l12857;
+    public long l12858;
+    public long l12859;
+    public long l12860;
+    public long l12861;
+    public long l12862;
+    public long l12863;
+    public long l12864;
+    public long l12865;
+    public long l12866;
+    public long l12867;
+    public long l12868;
+    public long l12869;
+    public long l12870;
+    public long l12871;
+    public long l12872;
+    public long l12873;
+    public long l12874;
+    public long l12875;
+    public long l12876;
+    public long l12877;
+    public long l12878;
+    public long l12879;
+    public long l12880;
+    public long l12881;
+    public long l12882;
+    public long l12883;
+    public long l12884;
+    public long l12885;
+    public long l12886;
+    public long l12887;
+    public long l12888;
+    public long l12889;
+    public long l12890;
+    public long l12891;
+    public long l12892;
+    public long l12893;
+    public long l12894;
+    public long l12895;
+    public long l12896;
+    public long l12897;
+    public long l12898;
+    public long l12899;
+    public long l12900;
+    public long l12901;
+    public long l12902;
+    public long l12903;
+    public long l12904;
+    public long l12905;
+    public long l12906;
+    public long l12907;
+    public long l12908;
+    public long l12909;
+    public long l12910;
+    public long l12911;
+    public long l12912;
+    public long l12913;
+    public long l12914;
+    public long l12915;
+    public long l12916;
+    public long l12917;
+    public long l12918;
+    public long l12919;
+    public long l12920;
+    public long l12921;
+    public long l12922;
+    public long l12923;
+    public long l12924;
+    public long l12925;
+    public long l12926;
+    public long l12927;
+    public long l12928;
+    public long l12929;
+    public long l12930;
+    public long l12931;
+    public long l12932;
+    public long l12933;
+    public long l12934;
+    public long l12935;
+    public long l12936;
+    public long l12937;
+    public long l12938;
+    public long l12939;
+    public long l12940;
+    public long l12941;
+    public long l12942;
+    public long l12943;
+    public long l12944;
+    public long l12945;
+    public long l12946;
+    public long l12947;
+    public long l12948;
+    public long l12949;
+    public long l12950;
+    public long l12951;
+    public long l12952;
+    public long l12953;
+    public long l12954;
+    public long l12955;
+    public long l12956;
+    public long l12957;
+    public long l12958;
+    public long l12959;
+    public long l12960;
+    public long l12961;
+    public long l12962;
+    public long l12963;
+    public long l12964;
+    public long l12965;
+    public long l12966;
+    public long l12967;
+    public long l12968;
+    public long l12969;
+    public long l12970;
+    public long l12971;
+    public long l12972;
+    public long l12973;
+    public long l12974;
+    public long l12975;
+    public long l12976;
+    public long l12977;
+    public long l12978;
+    public long l12979;
+    public long l12980;
+    public long l12981;
+    public long l12982;
+    public long l12983;
+    public long l12984;
+    public long l12985;
+    public long l12986;
+    public long l12987;
+    public long l12988;
+    public long l12989;
+    public long l12990;
+    public long l12991;
+    public long l12992;
+    public long l12993;
+    public long l12994;
+    public long l12995;
+    public long l12996;
+    public long l12997;
+    public long l12998;
+    public long l12999;
+    public long l13000;
+    public long l13001;
+    public long l13002;
+    public long l13003;
+    public long l13004;
+    public long l13005;
+    public long l13006;
+    public long l13007;
+    public long l13008;
+    public long l13009;
+    public long l13010;
+    public long l13011;
+    public long l13012;
+    public long l13013;
+    public long l13014;
+    public long l13015;
+    public long l13016;
+    public long l13017;
+    public long l13018;
+    public long l13019;
+    public long l13020;
+    public long l13021;
+    public long l13022;
+    public long l13023;
+    public long l13024;
+    public long l13025;
+    public long l13026;
+    public long l13027;
+    public long l13028;
+    public long l13029;
+    public long l13030;
+    public long l13031;
+    public long l13032;
+    public long l13033;
+    public long l13034;
+    public long l13035;
+    public long l13036;
+    public long l13037;
+    public long l13038;
+    public long l13039;
+    public long l13040;
+    public long l13041;
+    public long l13042;
+    public long l13043;
+    public long l13044;
+    public long l13045;
+    public long l13046;
+    public long l13047;
+    public long l13048;
+    public long l13049;
+    public long l13050;
+    public long l13051;
+    public long l13052;
+    public long l13053;
+    public long l13054;
+    public long l13055;
+    public long l13056;
+    public long l13057;
+    public long l13058;
+    public long l13059;
+    public long l13060;
+    public long l13061;
+    public long l13062;
+    public long l13063;
+    public long l13064;
+    public long l13065;
+    public long l13066;
+    public long l13067;
+    public long l13068;
+    public long l13069;
+    public long l13070;
+    public long l13071;
+    public long l13072;
+    public long l13073;
+    public long l13074;
+    public long l13075;
+    public long l13076;
+    public long l13077;
+    public long l13078;
+    public long l13079;
+    public long l13080;
+    public long l13081;
+    public long l13082;
+    public long l13083;
+    public long l13084;
+    public long l13085;
+    public long l13086;
+    public long l13087;
+    public long l13088;
+    public long l13089;
+    public long l13090;
+    public long l13091;
+    public long l13092;
+    public long l13093;
+    public long l13094;
+    public long l13095;
+    public long l13096;
+    public long l13097;
+    public long l13098;
+    public long l13099;
+    public long l13100;
+    public long l13101;
+    public long l13102;
+    public long l13103;
+    public long l13104;
+    public long l13105;
+    public long l13106;
+    public long l13107;
+    public long l13108;
+    public long l13109;
+    public long l13110;
+    public long l13111;
+    public long l13112;
+    public long l13113;
+    public long l13114;
+    public long l13115;
+    public long l13116;
+    public long l13117;
+    public long l13118;
+    public long l13119;
+    public long l13120;
+    public long l13121;
+    public long l13122;
+    public long l13123;
+    public long l13124;
+    public long l13125;
+    public long l13126;
+    public long l13127;
+    public long l13128;
+    public long l13129;
+    public long l13130;
+    public long l13131;
+    public long l13132;
+    public long l13133;
+    public long l13134;
+    public long l13135;
+    public long l13136;
+    public long l13137;
+    public long l13138;
+    public long l13139;
+    public long l13140;
+    public long l13141;
+    public long l13142;
+    public long l13143;
+    public long l13144;
+    public long l13145;
+    public long l13146;
+    public long l13147;
+    public long l13148;
+    public long l13149;
+    public long l13150;
+    public long l13151;
+    public long l13152;
+    public long l13153;
+    public long l13154;
+    public long l13155;
+    public long l13156;
+    public long l13157;
+    public long l13158;
+    public long l13159;
+    public long l13160;
+    public long l13161;
+    public long l13162;
+    public long l13163;
+    public long l13164;
+    public long l13165;
+    public long l13166;
+    public long l13167;
+    public long l13168;
+    public long l13169;
+    public long l13170;
+    public long l13171;
+    public long l13172;
+    public long l13173;
+    public long l13174;
+    public long l13175;
+    public long l13176;
+    public long l13177;
+    public long l13178;
+    public long l13179;
+    public long l13180;
+    public long l13181;
+    public long l13182;
+    public long l13183;
+    public long l13184;
+    public long l13185;
+    public long l13186;
+    public long l13187;
+    public long l13188;
+    public long l13189;
+    public long l13190;
+    public long l13191;
+    public long l13192;
+    public long l13193;
+    public long l13194;
+    public long l13195;
+    public long l13196;
+    public long l13197;
+    public long l13198;
+    public long l13199;
+    public long l13200;
+    public long l13201;
+    public long l13202;
+    public long l13203;
+    public long l13204;
+    public long l13205;
+    public long l13206;
+    public long l13207;
+    public long l13208;
+    public long l13209;
+    public long l13210;
+    public long l13211;
+    public long l13212;
+    public long l13213;
+    public long l13214;
+    public long l13215;
+    public long l13216;
+    public long l13217;
+    public long l13218;
+    public long l13219;
+    public long l13220;
+    public long l13221;
+    public long l13222;
+    public long l13223;
+    public long l13224;
+    public long l13225;
+    public long l13226;
+    public long l13227;
+    public long l13228;
+    public long l13229;
+    public long l13230;
+    public long l13231;
+    public long l13232;
+    public long l13233;
+    public long l13234;
+    public long l13235;
+    public long l13236;
+    public long l13237;
+    public long l13238;
+    public long l13239;
+    public long l13240;
+    public long l13241;
+    public long l13242;
+    public long l13243;
+    public long l13244;
+    public long l13245;
+    public long l13246;
+    public long l13247;
+    public long l13248;
+    public long l13249;
+    public long l13250;
+    public long l13251;
+    public long l13252;
+    public long l13253;
+    public long l13254;
+    public long l13255;
+    public long l13256;
+    public long l13257;
+    public long l13258;
+    public long l13259;
+    public long l13260;
+    public long l13261;
+    public long l13262;
+    public long l13263;
+    public long l13264;
+    public long l13265;
+    public long l13266;
+    public long l13267;
+    public long l13268;
+    public long l13269;
+    public long l13270;
+    public long l13271;
+    public long l13272;
+    public long l13273;
+    public long l13274;
+    public long l13275;
+    public long l13276;
+    public long l13277;
+    public long l13278;
+    public long l13279;
+    public long l13280;
+    public long l13281;
+    public long l13282;
+    public long l13283;
+    public long l13284;
+    public long l13285;
+    public long l13286;
+    public long l13287;
+    public long l13288;
+    public long l13289;
+    public long l13290;
+    public long l13291;
+    public long l13292;
+    public long l13293;
+    public long l13294;
+    public long l13295;
+    public long l13296;
+    public long l13297;
+    public long l13298;
+    public long l13299;
+    public long l13300;
+    public long l13301;
+    public long l13302;
+    public long l13303;
+    public long l13304;
+    public long l13305;
+    public long l13306;
+    public long l13307;
+    public long l13308;
+    public long l13309;
+    public long l13310;
+    public long l13311;
+    public long l13312;
+    public long l13313;
+    public long l13314;
+    public long l13315;
+    public long l13316;
+    public long l13317;
+    public long l13318;
+    public long l13319;
+    public long l13320;
+    public long l13321;
+    public long l13322;
+    public long l13323;
+    public long l13324;
+    public long l13325;
+    public long l13326;
+    public long l13327;
+    public long l13328;
+    public long l13329;
+    public long l13330;
+    public long l13331;
+    public long l13332;
+    public long l13333;
+    public long l13334;
+    public long l13335;
+    public long l13336;
+    public long l13337;
+    public long l13338;
+    public long l13339;
+    public long l13340;
+    public long l13341;
+    public long l13342;
+    public long l13343;
+    public long l13344;
+    public long l13345;
+    public long l13346;
+    public long l13347;
+    public long l13348;
+    public long l13349;
+    public long l13350;
+    public long l13351;
+    public long l13352;
+    public long l13353;
+    public long l13354;
+    public long l13355;
+    public long l13356;
+    public long l13357;
+    public long l13358;
+    public long l13359;
+    public long l13360;
+    public long l13361;
+    public long l13362;
+    public long l13363;
+    public long l13364;
+    public long l13365;
+    public long l13366;
+    public long l13367;
+    public long l13368;
+    public long l13369;
+    public long l13370;
+    public long l13371;
+    public long l13372;
+    public long l13373;
+    public long l13374;
+    public long l13375;
+    public long l13376;
+    public long l13377;
+    public long l13378;
+    public long l13379;
+    public long l13380;
+    public long l13381;
+    public long l13382;
+    public long l13383;
+    public long l13384;
+    public long l13385;
+    public long l13386;
+    public long l13387;
+    public long l13388;
+    public long l13389;
+    public long l13390;
+    public long l13391;
+    public long l13392;
+    public long l13393;
+    public long l13394;
+    public long l13395;
+    public long l13396;
+    public long l13397;
+    public long l13398;
+    public long l13399;
+    public long l13400;
+    public long l13401;
+    public long l13402;
+    public long l13403;
+    public long l13404;
+    public long l13405;
+    public long l13406;
+    public long l13407;
+    public long l13408;
+    public long l13409;
+    public long l13410;
+    public long l13411;
+    public long l13412;
+    public long l13413;
+    public long l13414;
+    public long l13415;
+    public long l13416;
+    public long l13417;
+    public long l13418;
+    public long l13419;
+    public long l13420;
+    public long l13421;
+    public long l13422;
+    public long l13423;
+    public long l13424;
+    public long l13425;
+    public long l13426;
+    public long l13427;
+    public long l13428;
+    public long l13429;
+    public long l13430;
+    public long l13431;
+    public long l13432;
+    public long l13433;
+    public long l13434;
+    public long l13435;
+    public long l13436;
+    public long l13437;
+    public long l13438;
+    public long l13439;
+    public long l13440;
+    public long l13441;
+    public long l13442;
+    public long l13443;
+    public long l13444;
+    public long l13445;
+    public long l13446;
+    public long l13447;
+    public long l13448;
+    public long l13449;
+    public long l13450;
+    public long l13451;
+    public long l13452;
+    public long l13453;
+    public long l13454;
+    public long l13455;
+    public long l13456;
+    public long l13457;
+    public long l13458;
+    public long l13459;
+    public long l13460;
+    public long l13461;
+    public long l13462;
+    public long l13463;
+    public long l13464;
+    public long l13465;
+    public long l13466;
+    public long l13467;
+    public long l13468;
+    public long l13469;
+    public long l13470;
+    public long l13471;
+    public long l13472;
+    public long l13473;
+    public long l13474;
+    public long l13475;
+    public long l13476;
+    public long l13477;
+    public long l13478;
+    public long l13479;
+    public long l13480;
+    public long l13481;
+    public long l13482;
+    public long l13483;
+    public long l13484;
+    public long l13485;
+    public long l13486;
+    public long l13487;
+    public long l13488;
+    public long l13489;
+    public long l13490;
+    public long l13491;
+    public long l13492;
+    public long l13493;
+    public long l13494;
+    public long l13495;
+    public long l13496;
+    public long l13497;
+    public long l13498;
+    public long l13499;
+    public long l13500;
+    public long l13501;
+    public long l13502;
+    public long l13503;
+    public long l13504;
+    public long l13505;
+    public long l13506;
+    public long l13507;
+    public long l13508;
+    public long l13509;
+    public long l13510;
+    public long l13511;
+    public long l13512;
+    public long l13513;
+    public long l13514;
+    public long l13515;
+    public long l13516;
+    public long l13517;
+    public long l13518;
+    public long l13519;
+    public long l13520;
+    public long l13521;
+    public long l13522;
+    public long l13523;
+    public long l13524;
+    public long l13525;
+    public long l13526;
+    public long l13527;
+    public long l13528;
+    public long l13529;
+    public long l13530;
+    public long l13531;
+    public long l13532;
+    public long l13533;
+    public long l13534;
+    public long l13535;
+    public long l13536;
+    public long l13537;
+    public long l13538;
+    public long l13539;
+    public long l13540;
+    public long l13541;
+    public long l13542;
+    public long l13543;
+    public long l13544;
+    public long l13545;
+    public long l13546;
+    public long l13547;
+    public long l13548;
+    public long l13549;
+    public long l13550;
+    public long l13551;
+    public long l13552;
+    public long l13553;
+    public long l13554;
+    public long l13555;
+    public long l13556;
+    public long l13557;
+    public long l13558;
+    public long l13559;
+    public long l13560;
+    public long l13561;
+    public long l13562;
+    public long l13563;
+    public long l13564;
+    public long l13565;
+    public long l13566;
+    public long l13567;
+    public long l13568;
+    public long l13569;
+    public long l13570;
+    public long l13571;
+    public long l13572;
+    public long l13573;
+    public long l13574;
+    public long l13575;
+    public long l13576;
+    public long l13577;
+    public long l13578;
+    public long l13579;
+    public long l13580;
+    public long l13581;
+    public long l13582;
+    public long l13583;
+    public long l13584;
+    public long l13585;
+    public long l13586;
+    public long l13587;
+    public long l13588;
+    public long l13589;
+    public long l13590;
+    public long l13591;
+    public long l13592;
+    public long l13593;
+    public long l13594;
+    public long l13595;
+    public long l13596;
+    public long l13597;
+    public long l13598;
+    public long l13599;
+    public long l13600;
+    public long l13601;
+    public long l13602;
+    public long l13603;
+    public long l13604;
+    public long l13605;
+    public long l13606;
+    public long l13607;
+    public long l13608;
+    public long l13609;
+    public long l13610;
+    public long l13611;
+    public long l13612;
+    public long l13613;
+    public long l13614;
+    public long l13615;
+    public long l13616;
+    public long l13617;
+    public long l13618;
+    public long l13619;
+    public long l13620;
+    public long l13621;
+    public long l13622;
+    public long l13623;
+    public long l13624;
+    public long l13625;
+    public long l13626;
+    public long l13627;
+    public long l13628;
+    public long l13629;
+    public long l13630;
+    public long l13631;
+    public long l13632;
+    public long l13633;
+    public long l13634;
+    public long l13635;
+    public long l13636;
+    public long l13637;
+    public long l13638;
+    public long l13639;
+    public long l13640;
+    public long l13641;
+    public long l13642;
+    public long l13643;
+    public long l13644;
+    public long l13645;
+    public long l13646;
+    public long l13647;
+    public long l13648;
+    public long l13649;
+    public long l13650;
+    public long l13651;
+    public long l13652;
+    public long l13653;
+    public long l13654;
+    public long l13655;
+    public long l13656;
+    public long l13657;
+    public long l13658;
+    public long l13659;
+    public long l13660;
+    public long l13661;
+    public long l13662;
+    public long l13663;
+    public long l13664;
+    public long l13665;
+    public long l13666;
+    public long l13667;
+    public long l13668;
+    public long l13669;
+    public long l13670;
+    public long l13671;
+    public long l13672;
+    public long l13673;
+    public long l13674;
+    public long l13675;
+    public long l13676;
+    public long l13677;
+    public long l13678;
+    public long l13679;
+    public long l13680;
+    public long l13681;
+    public long l13682;
+    public long l13683;
+    public long l13684;
+    public long l13685;
+    public long l13686;
+    public long l13687;
+    public long l13688;
+    public long l13689;
+    public long l13690;
+    public long l13691;
+    public long l13692;
+    public long l13693;
+    public long l13694;
+    public long l13695;
+    public long l13696;
+    public long l13697;
+    public long l13698;
+    public long l13699;
+    public long l13700;
+    public long l13701;
+    public long l13702;
+    public long l13703;
+    public long l13704;
+    public long l13705;
+    public long l13706;
+    public long l13707;
+    public long l13708;
+    public long l13709;
+    public long l13710;
+    public long l13711;
+    public long l13712;
+    public long l13713;
+    public long l13714;
+    public long l13715;
+    public long l13716;
+    public long l13717;
+    public long l13718;
+    public long l13719;
+    public long l13720;
+    public long l13721;
+    public long l13722;
+    public long l13723;
+    public long l13724;
+    public long l13725;
+    public long l13726;
+    public long l13727;
+    public long l13728;
+    public long l13729;
+    public long l13730;
+    public long l13731;
+    public long l13732;
+    public long l13733;
+    public long l13734;
+    public long l13735;
+    public long l13736;
+    public long l13737;
+    public long l13738;
+    public long l13739;
+    public long l13740;
+    public long l13741;
+    public long l13742;
+    public long l13743;
+    public long l13744;
+    public long l13745;
+    public long l13746;
+    public long l13747;
+    public long l13748;
+    public long l13749;
+    public long l13750;
+    public long l13751;
+    public long l13752;
+    public long l13753;
+    public long l13754;
+    public long l13755;
+    public long l13756;
+    public long l13757;
+    public long l13758;
+    public long l13759;
+    public long l13760;
+    public long l13761;
+    public long l13762;
+    public long l13763;
+    public long l13764;
+    public long l13765;
+    public long l13766;
+    public long l13767;
+    public long l13768;
+    public long l13769;
+    public long l13770;
+    public long l13771;
+    public long l13772;
+    public long l13773;
+    public long l13774;
+    public long l13775;
+    public long l13776;
+    public long l13777;
+    public long l13778;
+    public long l13779;
+    public long l13780;
+    public long l13781;
+    public long l13782;
+    public long l13783;
+    public long l13784;
+    public long l13785;
+    public long l13786;
+    public long l13787;
+    public long l13788;
+    public long l13789;
+    public long l13790;
+    public long l13791;
+    public long l13792;
+    public long l13793;
+    public long l13794;
+    public long l13795;
+    public long l13796;
+    public long l13797;
+    public long l13798;
+    public long l13799;
+    public long l13800;
+    public long l13801;
+    public long l13802;
+    public long l13803;
+    public long l13804;
+    public long l13805;
+    public long l13806;
+    public long l13807;
+    public long l13808;
+    public long l13809;
+    public long l13810;
+    public long l13811;
+    public long l13812;
+    public long l13813;
+    public long l13814;
+    public long l13815;
+    public long l13816;
+    public long l13817;
+    public long l13818;
+    public long l13819;
+    public long l13820;
+    public long l13821;
+    public long l13822;
+    public long l13823;
+    public long l13824;
+    public long l13825;
+    public long l13826;
+    public long l13827;
+    public long l13828;
+    public long l13829;
+    public long l13830;
+    public long l13831;
+    public long l13832;
+    public long l13833;
+    public long l13834;
+    public long l13835;
+    public long l13836;
+    public long l13837;
+    public long l13838;
+    public long l13839;
+    public long l13840;
+    public long l13841;
+    public long l13842;
+    public long l13843;
+    public long l13844;
+    public long l13845;
+    public long l13846;
+    public long l13847;
+    public long l13848;
+    public long l13849;
+    public long l13850;
+    public long l13851;
+    public long l13852;
+    public long l13853;
+    public long l13854;
+    public long l13855;
+    public long l13856;
+    public long l13857;
+    public long l13858;
+    public long l13859;
+    public long l13860;
+    public long l13861;
+    public long l13862;
+    public long l13863;
+    public long l13864;
+    public long l13865;
+    public long l13866;
+    public long l13867;
+    public long l13868;
+    public long l13869;
+    public long l13870;
+    public long l13871;
+    public long l13872;
+    public long l13873;
+    public long l13874;
+    public long l13875;
+    public long l13876;
+    public long l13877;
+    public long l13878;
+    public long l13879;
+    public long l13880;
+    public long l13881;
+    public long l13882;
+    public long l13883;
+    public long l13884;
+    public long l13885;
+    public long l13886;
+    public long l13887;
+    public long l13888;
+    public long l13889;
+    public long l13890;
+    public long l13891;
+    public long l13892;
+    public long l13893;
+    public long l13894;
+    public long l13895;
+    public long l13896;
+    public long l13897;
+    public long l13898;
+    public long l13899;
+    public long l13900;
+    public long l13901;
+    public long l13902;
+    public long l13903;
+    public long l13904;
+    public long l13905;
+    public long l13906;
+    public long l13907;
+    public long l13908;
+    public long l13909;
+    public long l13910;
+    public long l13911;
+    public long l13912;
+    public long l13913;
+    public long l13914;
+    public long l13915;
+    public long l13916;
+    public long l13917;
+    public long l13918;
+    public long l13919;
+    public long l13920;
+    public long l13921;
+    public long l13922;
+    public long l13923;
+    public long l13924;
+    public long l13925;
+    public long l13926;
+    public long l13927;
+    public long l13928;
+    public long l13929;
+    public long l13930;
+    public long l13931;
+    public long l13932;
+    public long l13933;
+    public long l13934;
+    public long l13935;
+    public long l13936;
+    public long l13937;
+    public long l13938;
+    public long l13939;
+    public long l13940;
+    public long l13941;
+    public long l13942;
+    public long l13943;
+    public long l13944;
+    public long l13945;
+    public long l13946;
+    public long l13947;
+    public long l13948;
+    public long l13949;
+    public long l13950;
+    public long l13951;
+    public long l13952;
+    public long l13953;
+    public long l13954;
+    public long l13955;
+    public long l13956;
+    public long l13957;
+    public long l13958;
+    public long l13959;
+    public long l13960;
+    public long l13961;
+    public long l13962;
+    public long l13963;
+    public long l13964;
+    public long l13965;
+    public long l13966;
+    public long l13967;
+    public long l13968;
+    public long l13969;
+    public long l13970;
+    public long l13971;
+    public long l13972;
+    public long l13973;
+    public long l13974;
+    public long l13975;
+    public long l13976;
+    public long l13977;
+    public long l13978;
+    public long l13979;
+    public long l13980;
+    public long l13981;
+    public long l13982;
+    public long l13983;
+    public long l13984;
+    public long l13985;
+    public long l13986;
+    public long l13987;
+    public long l13988;
+    public long l13989;
+    public long l13990;
+    public long l13991;
+    public long l13992;
+    public long l13993;
+    public long l13994;
+    public long l13995;
+    public long l13996;
+    public long l13997;
+    public long l13998;
+    public long l13999;
+    public long l14000;
+    public long l14001;
+    public long l14002;
+    public long l14003;
+    public long l14004;
+    public long l14005;
+    public long l14006;
+    public long l14007;
+    public long l14008;
+    public long l14009;
+    public long l14010;
+    public long l14011;
+    public long l14012;
+    public long l14013;
+    public long l14014;
+    public long l14015;
+    public long l14016;
+    public long l14017;
+    public long l14018;
+    public long l14019;
+    public long l14020;
+    public long l14021;
+    public long l14022;
+    public long l14023;
+    public long l14024;
+    public long l14025;
+    public long l14026;
+    public long l14027;
+    public long l14028;
+    public long l14029;
+    public long l14030;
+    public long l14031;
+    public long l14032;
+    public long l14033;
+    public long l14034;
+    public long l14035;
+    public long l14036;
+    public long l14037;
+    public long l14038;
+    public long l14039;
+    public long l14040;
+    public long l14041;
+    public long l14042;
+    public long l14043;
+    public long l14044;
+    public long l14045;
+    public long l14046;
+    public long l14047;
+    public long l14048;
+    public long l14049;
+    public long l14050;
+    public long l14051;
+    public long l14052;
+    public long l14053;
+    public long l14054;
+    public long l14055;
+    public long l14056;
+    public long l14057;
+    public long l14058;
+    public long l14059;
+    public long l14060;
+    public long l14061;
+    public long l14062;
+    public long l14063;
+    public long l14064;
+    public long l14065;
+    public long l14066;
+    public long l14067;
+    public long l14068;
+    public long l14069;
+    public long l14070;
+    public long l14071;
+    public long l14072;
+    public long l14073;
+    public long l14074;
+    public long l14075;
+    public long l14076;
+    public long l14077;
+    public long l14078;
+    public long l14079;
+    public long l14080;
+    public long l14081;
+    public long l14082;
+    public long l14083;
+    public long l14084;
+    public long l14085;
+    public long l14086;
+    public long l14087;
+    public long l14088;
+    public long l14089;
+    public long l14090;
+    public long l14091;
+    public long l14092;
+    public long l14093;
+    public long l14094;
+    public long l14095;
+    public long l14096;
+    public long l14097;
+    public long l14098;
+    public long l14099;
+    public long l14100;
+    public long l14101;
+    public long l14102;
+    public long l14103;
+    public long l14104;
+    public long l14105;
+    public long l14106;
+    public long l14107;
+    public long l14108;
+    public long l14109;
+    public long l14110;
+    public long l14111;
+    public long l14112;
+    public long l14113;
+    public long l14114;
+    public long l14115;
+    public long l14116;
+    public long l14117;
+    public long l14118;
+    public long l14119;
+    public long l14120;
+    public long l14121;
+    public long l14122;
+    public long l14123;
+    public long l14124;
+    public long l14125;
+    public long l14126;
+    public long l14127;
+    public long l14128;
+    public long l14129;
+    public long l14130;
+    public long l14131;
+    public long l14132;
+    public long l14133;
+    public long l14134;
+    public long l14135;
+    public long l14136;
+    public long l14137;
+    public long l14138;
+    public long l14139;
+    public long l14140;
+    public long l14141;
+    public long l14142;
+    public long l14143;
+    public long l14144;
+    public long l14145;
+    public long l14146;
+    public long l14147;
+    public long l14148;
+    public long l14149;
+    public long l14150;
+    public long l14151;
+    public long l14152;
+    public long l14153;
+    public long l14154;
+    public long l14155;
+    public long l14156;
+    public long l14157;
+    public long l14158;
+    public long l14159;
+    public long l14160;
+    public long l14161;
+    public long l14162;
+    public long l14163;
+    public long l14164;
+    public long l14165;
+    public long l14166;
+    public long l14167;
+    public long l14168;
+    public long l14169;
+    public long l14170;
+    public long l14171;
+    public long l14172;
+    public long l14173;
+    public long l14174;
+    public long l14175;
+    public long l14176;
+    public long l14177;
+    public long l14178;
+    public long l14179;
+    public long l14180;
+    public long l14181;
+    public long l14182;
+    public long l14183;
+    public long l14184;
+    public long l14185;
+    public long l14186;
+    public long l14187;
+    public long l14188;
+    public long l14189;
+    public long l14190;
+    public long l14191;
+    public long l14192;
+    public long l14193;
+    public long l14194;
+    public long l14195;
+    public long l14196;
+    public long l14197;
+    public long l14198;
+    public long l14199;
+    public long l14200;
+    public long l14201;
+    public long l14202;
+    public long l14203;
+    public long l14204;
+    public long l14205;
+    public long l14206;
+    public long l14207;
+    public long l14208;
+    public long l14209;
+    public long l14210;
+    public long l14211;
+    public long l14212;
+    public long l14213;
+    public long l14214;
+    public long l14215;
+    public long l14216;
+    public long l14217;
+    public long l14218;
+    public long l14219;
+    public long l14220;
+    public long l14221;
+    public long l14222;
+    public long l14223;
+    public long l14224;
+    public long l14225;
+    public long l14226;
+    public long l14227;
+    public long l14228;
+    public long l14229;
+    public long l14230;
+    public long l14231;
+    public long l14232;
+    public long l14233;
+    public long l14234;
+    public long l14235;
+    public long l14236;
+    public long l14237;
+    public long l14238;
+    public long l14239;
+    public long l14240;
+    public long l14241;
+    public long l14242;
+    public long l14243;
+    public long l14244;
+    public long l14245;
+    public long l14246;
+    public long l14247;
+    public long l14248;
+    public long l14249;
+    public long l14250;
+    public long l14251;
+    public long l14252;
+    public long l14253;
+    public long l14254;
+    public long l14255;
+    public long l14256;
+    public long l14257;
+    public long l14258;
+    public long l14259;
+    public long l14260;
+    public long l14261;
+    public long l14262;
+    public long l14263;
+    public long l14264;
+    public long l14265;
+    public long l14266;
+    public long l14267;
+    public long l14268;
+    public long l14269;
+    public long l14270;
+    public long l14271;
+    public long l14272;
+    public long l14273;
+    public long l14274;
+    public long l14275;
+    public long l14276;
+    public long l14277;
+    public long l14278;
+    public long l14279;
+    public long l14280;
+    public long l14281;
+    public long l14282;
+    public long l14283;
+    public long l14284;
+    public long l14285;
+    public long l14286;
+    public long l14287;
+    public long l14288;
+    public long l14289;
+    public long l14290;
+    public long l14291;
+    public long l14292;
+    public long l14293;
+    public long l14294;
+    public long l14295;
+    public long l14296;
+    public long l14297;
+    public long l14298;
+    public long l14299;
+    public long l14300;
+    public long l14301;
+    public long l14302;
+    public long l14303;
+    public long l14304;
+    public long l14305;
+    public long l14306;
+    public long l14307;
+    public long l14308;
+    public long l14309;
+    public long l14310;
+    public long l14311;
+    public long l14312;
+    public long l14313;
+    public long l14314;
+    public long l14315;
+    public long l14316;
+    public long l14317;
+    public long l14318;
+    public long l14319;
+    public long l14320;
+    public long l14321;
+    public long l14322;
+    public long l14323;
+    public long l14324;
+    public long l14325;
+    public long l14326;
+    public long l14327;
+    public long l14328;
+    public long l14329;
+    public long l14330;
+    public long l14331;
+    public long l14332;
+    public long l14333;
+    public long l14334;
+    public long l14335;
+    public long l14336;
+    public long l14337;
+    public long l14338;
+    public long l14339;
+    public long l14340;
+    public long l14341;
+    public long l14342;
+    public long l14343;
+    public long l14344;
+    public long l14345;
+    public long l14346;
+    public long l14347;
+    public long l14348;
+    public long l14349;
+    public long l14350;
+    public long l14351;
+    public long l14352;
+    public long l14353;
+    public long l14354;
+    public long l14355;
+    public long l14356;
+    public long l14357;
+    public long l14358;
+    public long l14359;
+    public long l14360;
+    public long l14361;
+    public long l14362;
+    public long l14363;
+    public long l14364;
+    public long l14365;
+    public long l14366;
+    public long l14367;
+    public long l14368;
+    public long l14369;
+    public long l14370;
+    public long l14371;
+    public long l14372;
+    public long l14373;
+    public long l14374;
+    public long l14375;
+    public long l14376;
+    public long l14377;
+    public long l14378;
+    public long l14379;
+    public long l14380;
+    public long l14381;
+    public long l14382;
+    public long l14383;
+    public long l14384;
+    public long l14385;
+    public long l14386;
+    public long l14387;
+    public long l14388;
+    public long l14389;
+    public long l14390;
+    public long l14391;
+    public long l14392;
+    public long l14393;
+    public long l14394;
+    public long l14395;
+    public long l14396;
+    public long l14397;
+    public long l14398;
+    public long l14399;
+    public long l14400;
+    public long l14401;
+    public long l14402;
+    public long l14403;
+    public long l14404;
+    public long l14405;
+    public long l14406;
+    public long l14407;
+    public long l14408;
+    public long l14409;
+    public long l14410;
+    public long l14411;
+    public long l14412;
+    public long l14413;
+    public long l14414;
+    public long l14415;
+    public long l14416;
+    public long l14417;
+    public long l14418;
+    public long l14419;
+    public long l14420;
+    public long l14421;
+    public long l14422;
+    public long l14423;
+    public long l14424;
+    public long l14425;
+    public long l14426;
+    public long l14427;
+    public long l14428;
+    public long l14429;
+    public long l14430;
+    public long l14431;
+    public long l14432;
+    public long l14433;
+    public long l14434;
+    public long l14435;
+    public long l14436;
+    public long l14437;
+    public long l14438;
+    public long l14439;
+    public long l14440;
+    public long l14441;
+    public long l14442;
+    public long l14443;
+    public long l14444;
+    public long l14445;
+    public long l14446;
+    public long l14447;
+    public long l14448;
+    public long l14449;
+    public long l14450;
+    public long l14451;
+    public long l14452;
+    public long l14453;
+    public long l14454;
+    public long l14455;
+    public long l14456;
+    public long l14457;
+    public long l14458;
+    public long l14459;
+    public long l14460;
+    public long l14461;
+    public long l14462;
+    public long l14463;
+    public long l14464;
+    public long l14465;
+    public long l14466;
+    public long l14467;
+    public long l14468;
+    public long l14469;
+    public long l14470;
+    public long l14471;
+    public long l14472;
+    public long l14473;
+    public long l14474;
+    public long l14475;
+    public long l14476;
+    public long l14477;
+    public long l14478;
+    public long l14479;
+    public long l14480;
+    public long l14481;
+    public long l14482;
+    public long l14483;
+    public long l14484;
+    public long l14485;
+    public long l14486;
+    public long l14487;
+    public long l14488;
+    public long l14489;
+    public long l14490;
+    public long l14491;
+    public long l14492;
+    public long l14493;
+    public long l14494;
+    public long l14495;
+    public long l14496;
+    public long l14497;
+    public long l14498;
+    public long l14499;
+    public long l14500;
+    public long l14501;
+    public long l14502;
+    public long l14503;
+    public long l14504;
+    public long l14505;
+    public long l14506;
+    public long l14507;
+    public long l14508;
+    public long l14509;
+    public long l14510;
+    public long l14511;
+    public long l14512;
+    public long l14513;
+    public long l14514;
+    public long l14515;
+    public long l14516;
+    public long l14517;
+    public long l14518;
+    public long l14519;
+    public long l14520;
+    public long l14521;
+    public long l14522;
+    public long l14523;
+    public long l14524;
+    public long l14525;
+    public long l14526;
+    public long l14527;
+    public long l14528;
+    public long l14529;
+    public long l14530;
+    public long l14531;
+    public long l14532;
+    public long l14533;
+    public long l14534;
+    public long l14535;
+    public long l14536;
+    public long l14537;
+    public long l14538;
+    public long l14539;
+    public long l14540;
+    public long l14541;
+    public long l14542;
+    public long l14543;
+    public long l14544;
+    public long l14545;
+    public long l14546;
+    public long l14547;
+    public long l14548;
+    public long l14549;
+    public long l14550;
+    public long l14551;
+    public long l14552;
+    public long l14553;
+    public long l14554;
+    public long l14555;
+    public long l14556;
+    public long l14557;
+    public long l14558;
+    public long l14559;
+    public long l14560;
+    public long l14561;
+    public long l14562;
+    public long l14563;
+    public long l14564;
+    public long l14565;
+    public long l14566;
+    public long l14567;
+    public long l14568;
+    public long l14569;
+    public long l14570;
+    public long l14571;
+    public long l14572;
+    public long l14573;
+    public long l14574;
+    public long l14575;
+    public long l14576;
+    public long l14577;
+    public long l14578;
+    public long l14579;
+    public long l14580;
+    public long l14581;
+    public long l14582;
+    public long l14583;
+    public long l14584;
+    public long l14585;
+    public long l14586;
+    public long l14587;
+    public long l14588;
+    public long l14589;
+    public long l14590;
+    public long l14591;
+    public long l14592;
+    public long l14593;
+    public long l14594;
+    public long l14595;
+    public long l14596;
+    public long l14597;
+    public long l14598;
+    public long l14599;
+    public long l14600;
+    public long l14601;
+    public long l14602;
+    public long l14603;
+    public long l14604;
+    public long l14605;
+    public long l14606;
+    public long l14607;
+    public long l14608;
+    public long l14609;
+    public long l14610;
+    public long l14611;
+    public long l14612;
+    public long l14613;
+    public long l14614;
+    public long l14615;
+    public long l14616;
+    public long l14617;
+    public long l14618;
+    public long l14619;
+    public long l14620;
+    public long l14621;
+    public long l14622;
+    public long l14623;
+    public long l14624;
+    public long l14625;
+    public long l14626;
+    public long l14627;
+    public long l14628;
+    public long l14629;
+    public long l14630;
+    public long l14631;
+    public long l14632;
+    public long l14633;
+    public long l14634;
+    public long l14635;
+    public long l14636;
+    public long l14637;
+    public long l14638;
+    public long l14639;
+    public long l14640;
+    public long l14641;
+    public long l14642;
+    public long l14643;
+    public long l14644;
+    public long l14645;
+    public long l14646;
+    public long l14647;
+    public long l14648;
+    public long l14649;
+    public long l14650;
+    public long l14651;
+    public long l14652;
+    public long l14653;
+    public long l14654;
+    public long l14655;
+    public long l14656;
+    public long l14657;
+    public long l14658;
+    public long l14659;
+    public long l14660;
+    public long l14661;
+    public long l14662;
+    public long l14663;
+    public long l14664;
+    public long l14665;
+    public long l14666;
+    public long l14667;
+    public long l14668;
+    public long l14669;
+    public long l14670;
+    public long l14671;
+    public long l14672;
+    public long l14673;
+    public long l14674;
+    public long l14675;
+    public long l14676;
+    public long l14677;
+    public long l14678;
+    public long l14679;
+    public long l14680;
+    public long l14681;
+    public long l14682;
+    public long l14683;
+    public long l14684;
+    public long l14685;
+    public long l14686;
+    public long l14687;
+    public long l14688;
+    public long l14689;
+    public long l14690;
+    public long l14691;
+    public long l14692;
+    public long l14693;
+    public long l14694;
+    public long l14695;
+    public long l14696;
+    public long l14697;
+    public long l14698;
+    public long l14699;
+    public long l14700;
+    public long l14701;
+    public long l14702;
+    public long l14703;
+    public long l14704;
+    public long l14705;
+    public long l14706;
+    public long l14707;
+    public long l14708;
+    public long l14709;
+    public long l14710;
+    public long l14711;
+    public long l14712;
+    public long l14713;
+    public long l14714;
+    public long l14715;
+    public long l14716;
+    public long l14717;
+    public long l14718;
+    public long l14719;
+    public long l14720;
+    public long l14721;
+    public long l14722;
+    public long l14723;
+    public long l14724;
+    public long l14725;
+    public long l14726;
+    public long l14727;
+    public long l14728;
+    public long l14729;
+    public long l14730;
+    public long l14731;
+    public long l14732;
+    public long l14733;
+    public long l14734;
+    public long l14735;
+    public long l14736;
+    public long l14737;
+    public long l14738;
+    public long l14739;
+    public long l14740;
+    public long l14741;
+    public long l14742;
+    public long l14743;
+    public long l14744;
+    public long l14745;
+    public long l14746;
+    public long l14747;
+    public long l14748;
+    public long l14749;
+    public long l14750;
+    public long l14751;
+    public long l14752;
+    public long l14753;
+    public long l14754;
+    public long l14755;
+    public long l14756;
+    public long l14757;
+    public long l14758;
+    public long l14759;
+    public long l14760;
+    public long l14761;
+    public long l14762;
+    public long l14763;
+    public long l14764;
+    public long l14765;
+    public long l14766;
+    public long l14767;
+    public long l14768;
+    public long l14769;
+    public long l14770;
+    public long l14771;
+    public long l14772;
+    public long l14773;
+    public long l14774;
+    public long l14775;
+    public long l14776;
+    public long l14777;
+    public long l14778;
+    public long l14779;
+    public long l14780;
+    public long l14781;
+    public long l14782;
+    public long l14783;
+    public long l14784;
+    public long l14785;
+    public long l14786;
+    public long l14787;
+    public long l14788;
+    public long l14789;
+    public long l14790;
+    public long l14791;
+    public long l14792;
+    public long l14793;
+    public long l14794;
+    public long l14795;
+    public long l14796;
+    public long l14797;
+    public long l14798;
+    public long l14799;
+    public long l14800;
+    public long l14801;
+    public long l14802;
+    public long l14803;
+    public long l14804;
+    public long l14805;
+    public long l14806;
+    public long l14807;
+    public long l14808;
+    public long l14809;
+    public long l14810;
+    public long l14811;
+    public long l14812;
+    public long l14813;
+    public long l14814;
+    public long l14815;
+    public long l14816;
+    public long l14817;
+    public long l14818;
+    public long l14819;
+    public long l14820;
+    public long l14821;
+    public long l14822;
+    public long l14823;
+    public long l14824;
+    public long l14825;
+    public long l14826;
+    public long l14827;
+    public long l14828;
+    public long l14829;
+    public long l14830;
+    public long l14831;
+    public long l14832;
+    public long l14833;
+    public long l14834;
+    public long l14835;
+    public long l14836;
+    public long l14837;
+    public long l14838;
+    public long l14839;
+    public long l14840;
+    public long l14841;
+    public long l14842;
+    public long l14843;
+    public long l14844;
+    public long l14845;
+    public long l14846;
+    public long l14847;
+    public long l14848;
+    public long l14849;
+    public long l14850;
+    public long l14851;
+    public long l14852;
+    public long l14853;
+    public long l14854;
+    public long l14855;
+    public long l14856;
+    public long l14857;
+    public long l14858;
+    public long l14859;
+    public long l14860;
+    public long l14861;
+    public long l14862;
+    public long l14863;
+    public long l14864;
+    public long l14865;
+    public long l14866;
+    public long l14867;
+    public long l14868;
+    public long l14869;
+    public long l14870;
+    public long l14871;
+    public long l14872;
+    public long l14873;
+    public long l14874;
+    public long l14875;
+    public long l14876;
+    public long l14877;
+    public long l14878;
+    public long l14879;
+    public long l14880;
+    public long l14881;
+    public long l14882;
+    public long l14883;
+    public long l14884;
+    public long l14885;
+    public long l14886;
+    public long l14887;
+    public long l14888;
+    public long l14889;
+    public long l14890;
+    public long l14891;
+    public long l14892;
+    public long l14893;
+    public long l14894;
+    public long l14895;
+    public long l14896;
+    public long l14897;
+    public long l14898;
+    public long l14899;
+    public long l14900;
+    public long l14901;
+    public long l14902;
+    public long l14903;
+    public long l14904;
+    public long l14905;
+    public long l14906;
+    public long l14907;
+    public long l14908;
+    public long l14909;
+    public long l14910;
+    public long l14911;
+    public long l14912;
+    public long l14913;
+    public long l14914;
+    public long l14915;
+    public long l14916;
+    public long l14917;
+    public long l14918;
+    public long l14919;
+    public long l14920;
+    public long l14921;
+    public long l14922;
+    public long l14923;
+    public long l14924;
+    public long l14925;
+    public long l14926;
+    public long l14927;
+    public long l14928;
+    public long l14929;
+    public long l14930;
+    public long l14931;
+    public long l14932;
+    public long l14933;
+    public long l14934;
+    public long l14935;
+    public long l14936;
+    public long l14937;
+    public long l14938;
+    public long l14939;
+    public long l14940;
+    public long l14941;
+    public long l14942;
+    public long l14943;
+    public long l14944;
+    public long l14945;
+    public long l14946;
+    public long l14947;
+    public long l14948;
+    public long l14949;
+    public long l14950;
+    public long l14951;
+    public long l14952;
+    public long l14953;
+    public long l14954;
+    public long l14955;
+    public long l14956;
+    public long l14957;
+    public long l14958;
+    public long l14959;
+    public long l14960;
+    public long l14961;
+    public long l14962;
+    public long l14963;
+    public long l14964;
+    public long l14965;
+    public long l14966;
+    public long l14967;
+    public long l14968;
+    public long l14969;
+    public long l14970;
+    public long l14971;
+    public long l14972;
+    public long l14973;
+    public long l14974;
+    public long l14975;
+    public long l14976;
+    public long l14977;
+    public long l14978;
+    public long l14979;
+    public long l14980;
+    public long l14981;
+    public long l14982;
+    public long l14983;
+    public long l14984;
+    public long l14985;
+    public long l14986;
+    public long l14987;
+    public long l14988;
+    public long l14989;
+    public long l14990;
+    public long l14991;
+    public long l14992;
+    public long l14993;
+    public long l14994;
+    public long l14995;
+    public long l14996;
+    public long l14997;
+    public long l14998;
+    public long l14999;
+    public long l15000;
+    public long l15001;
+    public long l15002;
+    public long l15003;
+    public long l15004;
+    public long l15005;
+    public long l15006;
+    public long l15007;
+    public long l15008;
+    public long l15009;
+    public long l15010;
+    public long l15011;
+    public long l15012;
+    public long l15013;
+    public long l15014;
+    public long l15015;
+    public long l15016;
+    public long l15017;
+    public long l15018;
+    public long l15019;
+    public long l15020;
+    public long l15021;
+    public long l15022;
+    public long l15023;
+    public long l15024;
+    public long l15025;
+    public long l15026;
+    public long l15027;
+    public long l15028;
+    public long l15029;
+    public long l15030;
+    public long l15031;
+    public long l15032;
+    public long l15033;
+    public long l15034;
+    public long l15035;
+    public long l15036;
+    public long l15037;
+    public long l15038;
+    public long l15039;
+    public long l15040;
+    public long l15041;
+    public long l15042;
+    public long l15043;
+    public long l15044;
+    public long l15045;
+    public long l15046;
+    public long l15047;
+    public long l15048;
+    public long l15049;
+    public long l15050;
+    public long l15051;
+    public long l15052;
+    public long l15053;
+    public long l15054;
+    public long l15055;
+    public long l15056;
+    public long l15057;
+    public long l15058;
+    public long l15059;
+    public long l15060;
+    public long l15061;
+    public long l15062;
+    public long l15063;
+    public long l15064;
+    public long l15065;
+    public long l15066;
+    public long l15067;
+    public long l15068;
+    public long l15069;
+    public long l15070;
+    public long l15071;
+    public long l15072;
+    public long l15073;
+    public long l15074;
+    public long l15075;
+    public long l15076;
+    public long l15077;
+    public long l15078;
+    public long l15079;
+    public long l15080;
+    public long l15081;
+    public long l15082;
+    public long l15083;
+    public long l15084;
+    public long l15085;
+    public long l15086;
+    public long l15087;
+    public long l15088;
+    public long l15089;
+    public long l15090;
+    public long l15091;
+    public long l15092;
+    public long l15093;
+    public long l15094;
+    public long l15095;
+    public long l15096;
+    public long l15097;
+    public long l15098;
+    public long l15099;
+    public long l15100;
+    public long l15101;
+    public long l15102;
+    public long l15103;
+    public long l15104;
+    public long l15105;
+    public long l15106;
+    public long l15107;
+    public long l15108;
+    public long l15109;
+    public long l15110;
+    public long l15111;
+    public long l15112;
+    public long l15113;
+    public long l15114;
+    public long l15115;
+    public long l15116;
+    public long l15117;
+    public long l15118;
+    public long l15119;
+    public long l15120;
+    public long l15121;
+    public long l15122;
+    public long l15123;
+    public long l15124;
+    public long l15125;
+    public long l15126;
+    public long l15127;
+    public long l15128;
+    public long l15129;
+    public long l15130;
+    public long l15131;
+    public long l15132;
+    public long l15133;
+    public long l15134;
+    public long l15135;
+    public long l15136;
+    public long l15137;
+    public long l15138;
+    public long l15139;
+    public long l15140;
+    public long l15141;
+    public long l15142;
+    public long l15143;
+    public long l15144;
+    public long l15145;
+    public long l15146;
+    public long l15147;
+    public long l15148;
+    public long l15149;
+    public long l15150;
+    public long l15151;
+    public long l15152;
+    public long l15153;
+    public long l15154;
+    public long l15155;
+    public long l15156;
+    public long l15157;
+    public long l15158;
+    public long l15159;
+    public long l15160;
+    public long l15161;
+    public long l15162;
+    public long l15163;
+    public long l15164;
+    public long l15165;
+    public long l15166;
+    public long l15167;
+    public long l15168;
+    public long l15169;
+    public long l15170;
+    public long l15171;
+    public long l15172;
+    public long l15173;
+    public long l15174;
+    public long l15175;
+    public long l15176;
+    public long l15177;
+    public long l15178;
+    public long l15179;
+    public long l15180;
+    public long l15181;
+    public long l15182;
+    public long l15183;
+    public long l15184;
+    public long l15185;
+    public long l15186;
+    public long l15187;
+    public long l15188;
+    public long l15189;
+    public long l15190;
+    public long l15191;
+    public long l15192;
+    public long l15193;
+    public long l15194;
+    public long l15195;
+    public long l15196;
+    public long l15197;
+    public long l15198;
+    public long l15199;
+    public long l15200;
+    public long l15201;
+    public long l15202;
+    public long l15203;
+    public long l15204;
+    public long l15205;
+    public long l15206;
+    public long l15207;
+    public long l15208;
+    public long l15209;
+    public long l15210;
+    public long l15211;
+    public long l15212;
+    public long l15213;
+    public long l15214;
+    public long l15215;
+    public long l15216;
+    public long l15217;
+    public long l15218;
+    public long l15219;
+    public long l15220;
+    public long l15221;
+    public long l15222;
+    public long l15223;
+    public long l15224;
+    public long l15225;
+    public long l15226;
+    public long l15227;
+    public long l15228;
+    public long l15229;
+    public long l15230;
+    public long l15231;
+    public long l15232;
+    public long l15233;
+    public long l15234;
+    public long l15235;
+    public long l15236;
+    public long l15237;
+    public long l15238;
+    public long l15239;
+    public long l15240;
+    public long l15241;
+    public long l15242;
+    public long l15243;
+    public long l15244;
+    public long l15245;
+    public long l15246;
+    public long l15247;
+    public long l15248;
+    public long l15249;
+    public long l15250;
+    public long l15251;
+    public long l15252;
+    public long l15253;
+    public long l15254;
+    public long l15255;
+    public long l15256;
+    public long l15257;
+    public long l15258;
+    public long l15259;
+    public long l15260;
+    public long l15261;
+    public long l15262;
+    public long l15263;
+    public long l15264;
+    public long l15265;
+    public long l15266;
+    public long l15267;
+    public long l15268;
+    public long l15269;
+    public long l15270;
+    public long l15271;
+    public long l15272;
+    public long l15273;
+    public long l15274;
+    public long l15275;
+    public long l15276;
+    public long l15277;
+    public long l15278;
+    public long l15279;
+    public long l15280;
+    public long l15281;
+    public long l15282;
+    public long l15283;
+    public long l15284;
+    public long l15285;
+    public long l15286;
+    public long l15287;
+    public long l15288;
+    public long l15289;
+    public long l15290;
+    public long l15291;
+    public long l15292;
+    public long l15293;
+    public long l15294;
+    public long l15295;
+    public long l15296;
+    public long l15297;
+    public long l15298;
+    public long l15299;
+    public long l15300;
+    public long l15301;
+    public long l15302;
+    public long l15303;
+    public long l15304;
+    public long l15305;
+    public long l15306;
+    public long l15307;
+    public long l15308;
+    public long l15309;
+    public long l15310;
+    public long l15311;
+    public long l15312;
+    public long l15313;
+    public long l15314;
+    public long l15315;
+    public long l15316;
+    public long l15317;
+    public long l15318;
+    public long l15319;
+    public long l15320;
+    public long l15321;
+    public long l15322;
+    public long l15323;
+    public long l15324;
+    public long l15325;
+    public long l15326;
+    public long l15327;
+    public long l15328;
+    public long l15329;
+    public long l15330;
+    public long l15331;
+    public long l15332;
+    public long l15333;
+    public long l15334;
+    public long l15335;
+    public long l15336;
+    public long l15337;
+    public long l15338;
+    public long l15339;
+    public long l15340;
+    public long l15341;
+    public long l15342;
+    public long l15343;
+    public long l15344;
+    public long l15345;
+    public long l15346;
+    public long l15347;
+    public long l15348;
+    public long l15349;
+    public long l15350;
+    public long l15351;
+    public long l15352;
+    public long l15353;
+    public long l15354;
+    public long l15355;
+    public long l15356;
+    public long l15357;
+    public long l15358;
+    public long l15359;
+    public long l15360;
+    public long l15361;
+    public long l15362;
+    public long l15363;
+    public long l15364;
+    public long l15365;
+    public long l15366;
+    public long l15367;
+    public long l15368;
+    public long l15369;
+    public long l15370;
+    public long l15371;
+    public long l15372;
+    public long l15373;
+    public long l15374;
+    public long l15375;
+    public long l15376;
+    public long l15377;
+    public long l15378;
+    public long l15379;
+    public long l15380;
+    public long l15381;
+    public long l15382;
+    public long l15383;
+    public long l15384;
+    public long l15385;
+    public long l15386;
+    public long l15387;
+    public long l15388;
+    public long l15389;
+    public long l15390;
+    public long l15391;
+    public long l15392;
+    public long l15393;
+    public long l15394;
+    public long l15395;
+    public long l15396;
+    public long l15397;
+    public long l15398;
+    public long l15399;
+    public long l15400;
+    public long l15401;
+    public long l15402;
+    public long l15403;
+    public long l15404;
+    public long l15405;
+    public long l15406;
+    public long l15407;
+    public long l15408;
+    public long l15409;
+    public long l15410;
+    public long l15411;
+    public long l15412;
+    public long l15413;
+    public long l15414;
+    public long l15415;
+    public long l15416;
+    public long l15417;
+    public long l15418;
+    public long l15419;
+    public long l15420;
+    public long l15421;
+    public long l15422;
+    public long l15423;
+    public long l15424;
+    public long l15425;
+    public long l15426;
+    public long l15427;
+    public long l15428;
+    public long l15429;
+    public long l15430;
+    public long l15431;
+    public long l15432;
+    public long l15433;
+    public long l15434;
+    public long l15435;
+    public long l15436;
+    public long l15437;
+    public long l15438;
+    public long l15439;
+    public long l15440;
+    public long l15441;
+    public long l15442;
+    public long l15443;
+    public long l15444;
+    public long l15445;
+    public long l15446;
+    public long l15447;
+    public long l15448;
+    public long l15449;
+    public long l15450;
+    public long l15451;
+    public long l15452;
+    public long l15453;
+    public long l15454;
+    public long l15455;
+    public long l15456;
+    public long l15457;
+    public long l15458;
+    public long l15459;
+    public long l15460;
+    public long l15461;
+    public long l15462;
+    public long l15463;
+    public long l15464;
+    public long l15465;
+    public long l15466;
+    public long l15467;
+    public long l15468;
+    public long l15469;
+    public long l15470;
+    public long l15471;
+    public long l15472;
+    public long l15473;
+    public long l15474;
+    public long l15475;
+    public long l15476;
+    public long l15477;
+    public long l15478;
+    public long l15479;
+    public long l15480;
+    public long l15481;
+    public long l15482;
+    public long l15483;
+    public long l15484;
+    public long l15485;
+    public long l15486;
+    public long l15487;
+    public long l15488;
+    public long l15489;
+    public long l15490;
+    public long l15491;
+    public long l15492;
+    public long l15493;
+    public long l15494;
+    public long l15495;
+    public long l15496;
+    public long l15497;
+    public long l15498;
+    public long l15499;
+    public long l15500;
+    public long l15501;
+    public long l15502;
+    public long l15503;
+    public long l15504;
+    public long l15505;
+    public long l15506;
+    public long l15507;
+    public long l15508;
+    public long l15509;
+    public long l15510;
+    public long l15511;
+    public long l15512;
+    public long l15513;
+    public long l15514;
+    public long l15515;
+    public long l15516;
+    public long l15517;
+    public long l15518;
+    public long l15519;
+    public long l15520;
+    public long l15521;
+    public long l15522;
+    public long l15523;
+    public long l15524;
+    public long l15525;
+    public long l15526;
+    public long l15527;
+    public long l15528;
+    public long l15529;
+    public long l15530;
+    public long l15531;
+    public long l15532;
+    public long l15533;
+    public long l15534;
+    public long l15535;
+    public long l15536;
+    public long l15537;
+    public long l15538;
+    public long l15539;
+    public long l15540;
+    public long l15541;
+    public long l15542;
+    public long l15543;
+    public long l15544;
+    public long l15545;
+    public long l15546;
+    public long l15547;
+    public long l15548;
+    public long l15549;
+    public long l15550;
+    public long l15551;
+    public long l15552;
+    public long l15553;
+    public long l15554;
+    public long l15555;
+    public long l15556;
+    public long l15557;
+    public long l15558;
+    public long l15559;
+    public long l15560;
+    public long l15561;
+    public long l15562;
+    public long l15563;
+    public long l15564;
+    public long l15565;
+    public long l15566;
+    public long l15567;
+    public long l15568;
+    public long l15569;
+    public long l15570;
+    public long l15571;
+    public long l15572;
+    public long l15573;
+    public long l15574;
+    public long l15575;
+    public long l15576;
+    public long l15577;
+    public long l15578;
+    public long l15579;
+    public long l15580;
+    public long l15581;
+    public long l15582;
+    public long l15583;
+    public long l15584;
+    public long l15585;
+    public long l15586;
+    public long l15587;
+    public long l15588;
+    public long l15589;
+    public long l15590;
+    public long l15591;
+    public long l15592;
+    public long l15593;
+    public long l15594;
+    public long l15595;
+    public long l15596;
+    public long l15597;
+    public long l15598;
+    public long l15599;
+    public long l15600;
+    public long l15601;
+    public long l15602;
+    public long l15603;
+    public long l15604;
+    public long l15605;
+    public long l15606;
+    public long l15607;
+    public long l15608;
+    public long l15609;
+    public long l15610;
+    public long l15611;
+    public long l15612;
+    public long l15613;
+    public long l15614;
+    public long l15615;
+    public long l15616;
+    public long l15617;
+    public long l15618;
+    public long l15619;
+    public long l15620;
+    public long l15621;
+    public long l15622;
+    public long l15623;
+    public long l15624;
+    public long l15625;
+    public long l15626;
+    public long l15627;
+    public long l15628;
+    public long l15629;
+    public long l15630;
+    public long l15631;
+    public long l15632;
+    public long l15633;
+    public long l15634;
+    public long l15635;
+    public long l15636;
+    public long l15637;
+    public long l15638;
+    public long l15639;
+    public long l15640;
+    public long l15641;
+    public long l15642;
+    public long l15643;
+    public long l15644;
+    public long l15645;
+    public long l15646;
+    public long l15647;
+    public long l15648;
+    public long l15649;
+    public long l15650;
+    public long l15651;
+    public long l15652;
+    public long l15653;
+    public long l15654;
+    public long l15655;
+    public long l15656;
+    public long l15657;
+    public long l15658;
+    public long l15659;
+    public long l15660;
+    public long l15661;
+    public long l15662;
+    public long l15663;
+    public long l15664;
+    public long l15665;
+    public long l15666;
+    public long l15667;
+    public long l15668;
+    public long l15669;
+    public long l15670;
+    public long l15671;
+    public long l15672;
+    public long l15673;
+    public long l15674;
+    public long l15675;
+    public long l15676;
+    public long l15677;
+    public long l15678;
+    public long l15679;
+    public long l15680;
+    public long l15681;
+    public long l15682;
+    public long l15683;
+    public long l15684;
+    public long l15685;
+    public long l15686;
+    public long l15687;
+    public long l15688;
+    public long l15689;
+    public long l15690;
+    public long l15691;
+    public long l15692;
+    public long l15693;
+    public long l15694;
+    public long l15695;
+    public long l15696;
+    public long l15697;
+    public long l15698;
+    public long l15699;
+    public long l15700;
+    public long l15701;
+    public long l15702;
+    public long l15703;
+    public long l15704;
+    public long l15705;
+    public long l15706;
+    public long l15707;
+    public long l15708;
+    public long l15709;
+    public long l15710;
+    public long l15711;
+    public long l15712;
+    public long l15713;
+    public long l15714;
+    public long l15715;
+    public long l15716;
+    public long l15717;
+    public long l15718;
+    public long l15719;
+    public long l15720;
+    public long l15721;
+    public long l15722;
+    public long l15723;
+    public long l15724;
+    public long l15725;
+    public long l15726;
+    public long l15727;
+    public long l15728;
+    public long l15729;
+    public long l15730;
+    public long l15731;
+    public long l15732;
+    public long l15733;
+    public long l15734;
+    public long l15735;
+    public long l15736;
+    public long l15737;
+    public long l15738;
+    public long l15739;
+    public long l15740;
+    public long l15741;
+    public long l15742;
+    public long l15743;
+    public long l15744;
+    public long l15745;
+    public long l15746;
+    public long l15747;
+    public long l15748;
+    public long l15749;
+    public long l15750;
+    public long l15751;
+    public long l15752;
+    public long l15753;
+    public long l15754;
+    public long l15755;
+    public long l15756;
+    public long l15757;
+    public long l15758;
+    public long l15759;
+    public long l15760;
+    public long l15761;
+    public long l15762;
+    public long l15763;
+    public long l15764;
+    public long l15765;
+    public long l15766;
+    public long l15767;
+    public long l15768;
+    public long l15769;
+    public long l15770;
+    public long l15771;
+    public long l15772;
+    public long l15773;
+    public long l15774;
+    public long l15775;
+    public long l15776;
+    public long l15777;
+    public long l15778;
+    public long l15779;
+    public long l15780;
+    public long l15781;
+    public long l15782;
+    public long l15783;
+    public long l15784;
+    public long l15785;
+    public long l15786;
+    public long l15787;
+    public long l15788;
+    public long l15789;
+    public long l15790;
+    public long l15791;
+    public long l15792;
+    public long l15793;
+    public long l15794;
+    public long l15795;
+    public long l15796;
+    public long l15797;
+    public long l15798;
+    public long l15799;
+    public long l15800;
+    public long l15801;
+    public long l15802;
+    public long l15803;
+    public long l15804;
+    public long l15805;
+    public long l15806;
+    public long l15807;
+    public long l15808;
+    public long l15809;
+    public long l15810;
+    public long l15811;
+    public long l15812;
+    public long l15813;
+    public long l15814;
+    public long l15815;
+    public long l15816;
+    public long l15817;
+    public long l15818;
+    public long l15819;
+    public long l15820;
+    public long l15821;
+    public long l15822;
+    public long l15823;
+    public long l15824;
+    public long l15825;
+    public long l15826;
+    public long l15827;
+    public long l15828;
+    public long l15829;
+    public long l15830;
+    public long l15831;
+    public long l15832;
+    public long l15833;
+    public long l15834;
+    public long l15835;
+    public long l15836;
+    public long l15837;
+    public long l15838;
+    public long l15839;
+    public long l15840;
+    public long l15841;
+    public long l15842;
+    public long l15843;
+    public long l15844;
+    public long l15845;
+    public long l15846;
+    public long l15847;
+    public long l15848;
+    public long l15849;
+    public long l15850;
+    public long l15851;
+    public long l15852;
+    public long l15853;
+    public long l15854;
+    public long l15855;
+    public long l15856;
+    public long l15857;
+    public long l15858;
+    public long l15859;
+    public long l15860;
+    public long l15861;
+    public long l15862;
+    public long l15863;
+    public long l15864;
+    public long l15865;
+    public long l15866;
+    public long l15867;
+    public long l15868;
+    public long l15869;
+    public long l15870;
+    public long l15871;
+    public long l15872;
+    public long l15873;
+    public long l15874;
+    public long l15875;
+    public long l15876;
+    public long l15877;
+    public long l15878;
+    public long l15879;
+    public long l15880;
+    public long l15881;
+    public long l15882;
+    public long l15883;
+    public long l15884;
+    public long l15885;
+    public long l15886;
+    public long l15887;
+    public long l15888;
+    public long l15889;
+    public long l15890;
+    public long l15891;
+    public long l15892;
+    public long l15893;
+    public long l15894;
+    public long l15895;
+    public long l15896;
+    public long l15897;
+    public long l15898;
+    public long l15899;
+    public long l15900;
+    public long l15901;
+    public long l15902;
+    public long l15903;
+    public long l15904;
+    public long l15905;
+    public long l15906;
+    public long l15907;
+    public long l15908;
+    public long l15909;
+    public long l15910;
+    public long l15911;
+    public long l15912;
+    public long l15913;
+    public long l15914;
+    public long l15915;
+    public long l15916;
+    public long l15917;
+    public long l15918;
+    public long l15919;
+    public long l15920;
+    public long l15921;
+    public long l15922;
+    public long l15923;
+    public long l15924;
+    public long l15925;
+    public long l15926;
+    public long l15927;
+    public long l15928;
+    public long l15929;
+    public long l15930;
+    public long l15931;
+    public long l15932;
+    public long l15933;
+    public long l15934;
+    public long l15935;
+    public long l15936;
+    public long l15937;
+    public long l15938;
+    public long l15939;
+    public long l15940;
+    public long l15941;
+    public long l15942;
+    public long l15943;
+    public long l15944;
+    public long l15945;
+    public long l15946;
+    public long l15947;
+    public long l15948;
+    public long l15949;
+    public long l15950;
+    public long l15951;
+    public long l15952;
+    public long l15953;
+    public long l15954;
+    public long l15955;
+    public long l15956;
+    public long l15957;
+    public long l15958;
+    public long l15959;
+    public long l15960;
+    public long l15961;
+    public long l15962;
+    public long l15963;
+    public long l15964;
+    public long l15965;
+    public long l15966;
+    public long l15967;
+    public long l15968;
+    public long l15969;
+    public long l15970;
+    public long l15971;
+    public long l15972;
+    public long l15973;
+    public long l15974;
+    public long l15975;
+    public long l15976;
+    public long l15977;
+    public long l15978;
+    public long l15979;
+    public long l15980;
+    public long l15981;
+    public long l15982;
+    public long l15983;
+    public long l15984;
+    public long l15985;
+    public long l15986;
+    public long l15987;
+    public long l15988;
+    public long l15989;
+    public long l15990;
+    public long l15991;
+    public long l15992;
+    public long l15993;
+    public long l15994;
+    public long l15995;
+    public long l15996;
+    public long l15997;
+    public long l15998;
+    public long l15999;
+    public long l16000;
+    public long l16001;
+    public long l16002;
+    public long l16003;
+    public long l16004;
+    public long l16005;
+    public long l16006;
+    public long l16007;
+    public long l16008;
+    public long l16009;
+    public long l16010;
+    public long l16011;
+    public long l16012;
+    public long l16013;
+    public long l16014;
+    public long l16015;
+    public long l16016;
+    public long l16017;
+    public long l16018;
+    public long l16019;
+    public long l16020;
+    public long l16021;
+    public long l16022;
+    public long l16023;
+    public long l16024;
+    public long l16025;
+    public long l16026;
+    public long l16027;
+    public long l16028;
+    public long l16029;
+    public long l16030;
+    public long l16031;
+    public long l16032;
+    public long l16033;
+    public long l16034;
+    public long l16035;
+    public long l16036;
+    public long l16037;
+    public long l16038;
+    public long l16039;
+    public long l16040;
+    public long l16041;
+    public long l16042;
+    public long l16043;
+    public long l16044;
+    public long l16045;
+    public long l16046;
+    public long l16047;
+    public long l16048;
+    public long l16049;
+    public long l16050;
+    public long l16051;
+    public long l16052;
+    public long l16053;
+    public long l16054;
+    public long l16055;
+    public long l16056;
+    public long l16057;
+    public long l16058;
+    public long l16059;
+    public long l16060;
+    public long l16061;
+    public long l16062;
+    public long l16063;
+    public long l16064;
+    public long l16065;
+    public long l16066;
+    public long l16067;
+    public long l16068;
+    public long l16069;
+    public long l16070;
+    public long l16071;
+    public long l16072;
+    public long l16073;
+    public long l16074;
+    public long l16075;
+    public long l16076;
+    public long l16077;
+    public long l16078;
+    public long l16079;
+    public long l16080;
+    public long l16081;
+    public long l16082;
+    public long l16083;
+    public long l16084;
+    public long l16085;
+    public long l16086;
+    public long l16087;
+    public long l16088;
+    public long l16089;
+    public long l16090;
+    public long l16091;
+    public long l16092;
+    public long l16093;
+    public long l16094;
+    public long l16095;
+    public long l16096;
+    public long l16097;
+    public long l16098;
+    public long l16099;
+    public long l16100;
+    public long l16101;
+    public long l16102;
+    public long l16103;
+    public long l16104;
+    public long l16105;
+    public long l16106;
+    public long l16107;
+    public long l16108;
+    public long l16109;
+    public long l16110;
+    public long l16111;
+    public long l16112;
+    public long l16113;
+    public long l16114;
+    public long l16115;
+    public long l16116;
+    public long l16117;
+    public long l16118;
+    public long l16119;
+    public long l16120;
+    public long l16121;
+    public long l16122;
+    public long l16123;
+    public long l16124;
+    public long l16125;
+    public long l16126;
+    public long l16127;
+    public long l16128;
+    public long l16129;
+    public long l16130;
+    public long l16131;
+    public long l16132;
+    public long l16133;
+    public long l16134;
+    public long l16135;
+    public long l16136;
+    public long l16137;
+    public long l16138;
+    public long l16139;
+    public long l16140;
+    public long l16141;
+    public long l16142;
+    public long l16143;
+    public long l16144;
+    public long l16145;
+    public long l16146;
+    public long l16147;
+    public long l16148;
+    public long l16149;
+    public long l16150;
+    public long l16151;
+    public long l16152;
+    public long l16153;
+    public long l16154;
+    public long l16155;
+    public long l16156;
+    public long l16157;
+    public long l16158;
+    public long l16159;
+    public long l16160;
+    public long l16161;
+    public long l16162;
+    public long l16163;
+    public long l16164;
+    public long l16165;
+    public long l16166;
+    public long l16167;
+    public long l16168;
+    public long l16169;
+    public long l16170;
+    public long l16171;
+    public long l16172;
+    public long l16173;
+    public long l16174;
+    public long l16175;
+    public long l16176;
+    public long l16177;
+    public long l16178;
+    public long l16179;
+    public long l16180;
+    public long l16181;
+    public long l16182;
+    public long l16183;
+    public long l16184;
+    public long l16185;
+    public long l16186;
+    public long l16187;
+    public long l16188;
+    public long l16189;
+    public long l16190;
+    public long l16191;
+    public long l16192;
+    public long l16193;
+    public long l16194;
+    public long l16195;
+    public long l16196;
+    public long l16197;
+    public long l16198;
+    public long l16199;
+    public long l16200;
+    public long l16201;
+    public long l16202;
+    public long l16203;
+    public long l16204;
+    public long l16205;
+    public long l16206;
+    public long l16207;
+    public long l16208;
+    public long l16209;
+    public long l16210;
+    public long l16211;
+    public long l16212;
+    public long l16213;
+    public long l16214;
+    public long l16215;
+    public long l16216;
+    public long l16217;
+    public long l16218;
+    public long l16219;
+    public long l16220;
+    public long l16221;
+    public long l16222;
+    public long l16223;
+    public long l16224;
+    public long l16225;
+    public long l16226;
+    public long l16227;
+    public long l16228;
+    public long l16229;
+    public long l16230;
+    public long l16231;
+    public long l16232;
+    public long l16233;
+    public long l16234;
+    public long l16235;
+    public long l16236;
+    public long l16237;
+    public long l16238;
+    public long l16239;
+    public long l16240;
+    public long l16241;
+    public long l16242;
+    public long l16243;
+    public long l16244;
+    public long l16245;
+    public long l16246;
+    public long l16247;
+    public long l16248;
+    public long l16249;
+    public long l16250;
+    public long l16251;
+    public long l16252;
+    public long l16253;
+    public long l16254;
+    public long l16255;
+    public long l16256;
+    public long l16257;
+    public long l16258;
+    public long l16259;
+    public long l16260;
+    public long l16261;
+    public long l16262;
+    public long l16263;
+    public long l16264;
+    public long l16265;
+    public long l16266;
+    public long l16267;
+    public long l16268;
+    public long l16269;
+    public long l16270;
+    public long l16271;
+    public long l16272;
+    public long l16273;
+    public long l16274;
+    public long l16275;
+    public long l16276;
+    public long l16277;
+    public long l16278;
+    public long l16279;
+    public long l16280;
+    public long l16281;
+    public long l16282;
+    public long l16283;
+    public long l16284;
+    public long l16285;
+    public long l16286;
+    public long l16287;
+    public long l16288;
+    public long l16289;
+    public long l16290;
+    public long l16291;
+    public long l16292;
+    public long l16293;
+    public long l16294;
+    public long l16295;
+    public long l16296;
+    public long l16297;
+    public long l16298;
+    public long l16299;
+    public long l16300;
+    public long l16301;
+    public long l16302;
+    public long l16303;
+    public long l16304;
+    public long l16305;
+    public long l16306;
+    public long l16307;
+    public long l16308;
+    public long l16309;
+    public long l16310;
+    public long l16311;
+    public long l16312;
+    public long l16313;
+    public long l16314;
+    public long l16315;
+    public long l16316;
+    public long l16317;
+    public long l16318;
+    public long l16319;
+    public long l16320;
+    public long l16321;
+    public long l16322;
+    public long l16323;
+    public long l16324;
+    public long l16325;
+    public long l16326;
+    public long l16327;
+    public long l16328;
+    public long l16329;
+    public long l16330;
+    public long l16331;
+    public long l16332;
+    public long l16333;
+    public long l16334;
+    public long l16335;
+    public long l16336;
+    public long l16337;
+    public long l16338;
+    public long l16339;
+    public long l16340;
+    public long l16341;
+    public long l16342;
+    public long l16343;
+    public long l16344;
+    public long l16345;
+    public long l16346;
+    public long l16347;
+    public long l16348;
+    public long l16349;
+    public long l16350;
+    public long l16351;
+    public long l16352;
+    public long l16353;
+    public long l16354;
+    public long l16355;
+    public long l16356;
+    public long l16357;
+    public long l16358;
+    public long l16359;
+    public long l16360;
+    public long l16361;
+    public long l16362;
+    public long l16363;
+    public long l16364;
+    public long l16365;
+    public long l16366;
+    public long l16367;
+    public long l16368;
+    public long l16369;
+    public long l16370;
+    public long l16371;
+    public long l16372;
+    public long l16373;
+    public long l16374;
+    public long l16375;
+    public long l16376;
+    public long l16377;
+    public long l16378;
+    public long l16379;
+    public long l16380;
+    public long l16381;
+    public long l16382;
+    public long l16383;
+    public long l16384;
+    public long l16385;
+    public long l16386;
+    public long l16387;
+    public long l16388;
+    public long l16389;
+    public long l16390;
+    public long l16391;
+    public long l16392;
+    public long l16393;
+    public long l16394;
+    public long l16395;
+    public long l16396;
+    public long l16397;
+    public long l16398;
+    public long l16399;
+    public long l16400;
+    public long l16401;
+    public long l16402;
+    public long l16403;
+    public long l16404;
+    public long l16405;
+    public long l16406;
+    public long l16407;
+    public long l16408;
+    public long l16409;
+    public long l16410;
+    public long l16411;
+    public long l16412;
+    public long l16413;
+    public long l16414;
+    public long l16415;
+    public long l16416;
+    public long l16417;
+    public long l16418;
+    public long l16419;
+    public long l16420;
+    public long l16421;
+    public long l16422;
+    public long l16423;
+    public long l16424;
+    public long l16425;
+    public long l16426;
+    public long l16427;
+    public long l16428;
+    public long l16429;
+    public long l16430;
+    public long l16431;
+    public long l16432;
+    public long l16433;
+    public long l16434;
+    public long l16435;
+    public long l16436;
+    public long l16437;
+    public long l16438;
+    public long l16439;
+    public long l16440;
+    public long l16441;
+    public long l16442;
+    public long l16443;
+    public long l16444;
+    public long l16445;
+    public long l16446;
+    public long l16447;
+    public long l16448;
+    public long l16449;
+    public long l16450;
+    public long l16451;
+    public long l16452;
+    public long l16453;
+    public long l16454;
+    public long l16455;
+    public long l16456;
+    public long l16457;
+    public long l16458;
+    public long l16459;
+    public long l16460;
+    public long l16461;
+    public long l16462;
+    public long l16463;
+    public long l16464;
+    public long l16465;
+    public long l16466;
+    public long l16467;
+    public long l16468;
+    public long l16469;
+    public long l16470;
+    public long l16471;
+    public long l16472;
+    public long l16473;
+    public long l16474;
+    public long l16475;
+    public long l16476;
+    public long l16477;
+    public long l16478;
+    public long l16479;
+    public long l16480;
+    public long l16481;
+    public long l16482;
+    public long l16483;
+    public long l16484;
+    public long l16485;
+    public long l16486;
+    public long l16487;
+    public long l16488;
+    public long l16489;
+    public long l16490;
+    public long l16491;
+    public long l16492;
+    public long l16493;
+    public long l16494;
+    public long l16495;
+    public long l16496;
+    public long l16497;
+    public long l16498;
+    public long l16499;
+    public long l16500;
+    public long l16501;
+    public long l16502;
+    public long l16503;
+    public long l16504;
+    public long l16505;
+    public long l16506;
+    public long l16507;
+    public long l16508;
+    public long l16509;
+    public long l16510;
+    public long l16511;
+    public long l16512;
+    public long l16513;
+    public long l16514;
+    public long l16515;
+    public long l16516;
+    public long l16517;
+    public long l16518;
+    public long l16519;
+    public long l16520;
+    public long l16521;
+    public long l16522;
+    public long l16523;
+    public long l16524;
+    public long l16525;
+    public long l16526;
+    public long l16527;
+    public long l16528;
+    public long l16529;
+    public long l16530;
+    public long l16531;
+    public long l16532;
+    public long l16533;
+    public long l16534;
+    public long l16535;
+    public long l16536;
+    public long l16537;
+    public long l16538;
+    public long l16539;
+    public long l16540;
+    public long l16541;
+    public long l16542;
+    public long l16543;
+    public long l16544;
+    public long l16545;
+    public long l16546;
+    public long l16547;
+    public long l16548;
+    public long l16549;
+    public long l16550;
+    public long l16551;
+    public long l16552;
+    public long l16553;
+    public long l16554;
+    public long l16555;
+    public long l16556;
+    public long l16557;
+    public long l16558;
+    public long l16559;
+    public long l16560;
+    public long l16561;
+    public long l16562;
+    public long l16563;
+    public long l16564;
+    public long l16565;
+    public long l16566;
+    public long l16567;
+    public long l16568;
+    public long l16569;
+    public long l16570;
+    public long l16571;
+    public long l16572;
+    public long l16573;
+    public long l16574;
+    public long l16575;
+    public long l16576;
+    public long l16577;
+    public long l16578;
+    public long l16579;
+    public long l16580;
+    public long l16581;
+    public long l16582;
+    public long l16583;
+    public long l16584;
+    public long l16585;
+    public long l16586;
+    public long l16587;
+    public long l16588;
+    public long l16589;
+    public long l16590;
+    public long l16591;
+    public long l16592;
+    public long l16593;
+    public long l16594;
+    public long l16595;
+    public long l16596;
+    public long l16597;
+    public long l16598;
+    public long l16599;
+    public long l16600;
+    public long l16601;
+    public long l16602;
+    public long l16603;
+    public long l16604;
+    public long l16605;
+    public long l16606;
+    public long l16607;
+    public long l16608;
+    public long l16609;
+    public long l16610;
+    public long l16611;
+    public long l16612;
+    public long l16613;
+    public long l16614;
+    public long l16615;
+    public long l16616;
+    public long l16617;
+    public long l16618;
+    public long l16619;
+    public long l16620;
+    public long l16621;
+    public long l16622;
+    public long l16623;
+    public long l16624;
+    public long l16625;
+    public long l16626;
+    public long l16627;
+    public long l16628;
+    public long l16629;
+    public long l16630;
+    public long l16631;
+    public long l16632;
+    public long l16633;
+    public long l16634;
+    public long l16635;
+    public long l16636;
+    public long l16637;
+    public long l16638;
+    public long l16639;
+    public long l16640;
+    public long l16641;
+    public long l16642;
+    public long l16643;
+    public long l16644;
+    public long l16645;
+    public long l16646;
+    public long l16647;
+    public long l16648;
+    public long l16649;
+    public long l16650;
+    public long l16651;
+    public long l16652;
+    public long l16653;
+    public long l16654;
+    public long l16655;
+    public long l16656;
+    public long l16657;
+    public long l16658;
+    public long l16659;
+    public long l16660;
+    public long l16661;
+    public long l16662;
+    public long l16663;
+    public long l16664;
+    public long l16665;
+    public long l16666;
+    public long l16667;
+    public long l16668;
+    public long l16669;
+    public long l16670;
+    public long l16671;
+    public long l16672;
+    public long l16673;
+    public long l16674;
+    public long l16675;
+    public long l16676;
+    public long l16677;
+    public long l16678;
+    public long l16679;
+    public long l16680;
+    public long l16681;
+    public long l16682;
+    public long l16683;
+    public long l16684;
+    public long l16685;
+    public long l16686;
+    public long l16687;
+    public long l16688;
+    public long l16689;
+    public long l16690;
+    public long l16691;
+    public long l16692;
+    public long l16693;
+    public long l16694;
+    public long l16695;
+    public long l16696;
+    public long l16697;
+    public long l16698;
+    public long l16699;
+    public long l16700;
+    public long l16701;
+    public long l16702;
+    public long l16703;
+    public long l16704;
+    public long l16705;
+    public long l16706;
+    public long l16707;
+    public long l16708;
+    public long l16709;
+    public long l16710;
+    public long l16711;
+    public long l16712;
+    public long l16713;
+    public long l16714;
+    public long l16715;
+    public long l16716;
+    public long l16717;
+    public long l16718;
+    public long l16719;
+    public long l16720;
+    public long l16721;
+    public long l16722;
+    public long l16723;
+    public long l16724;
+    public long l16725;
+    public long l16726;
+    public long l16727;
+    public long l16728;
+    public long l16729;
+    public long l16730;
+    public long l16731;
+    public long l16732;
+    public long l16733;
+    public long l16734;
+    public long l16735;
+    public long l16736;
+    public long l16737;
+    public long l16738;
+    public long l16739;
+    public long l16740;
+    public long l16741;
+    public long l16742;
+    public long l16743;
+    public long l16744;
+    public long l16745;
+    public long l16746;
+    public long l16747;
+    public long l16748;
+    public long l16749;
+    public long l16750;
+    public long l16751;
+    public long l16752;
+    public long l16753;
+    public long l16754;
+    public long l16755;
+    public long l16756;
+    public long l16757;
+    public long l16758;
+    public long l16759;
+    public long l16760;
+    public long l16761;
+    public long l16762;
+    public long l16763;
+    public long l16764;
+    public long l16765;
+    public long l16766;
+    public long l16767;
+    public long l16768;
+    public long l16769;
+    public long l16770;
+    public long l16771;
+    public long l16772;
+    public long l16773;
+    public long l16774;
+    public long l16775;
+    public long l16776;
+    public long l16777;
+    public long l16778;
+    public long l16779;
+    public long l16780;
+    public long l16781;
+    public long l16782;
+    public long l16783;
+    public long l16784;
+    public long l16785;
+    public long l16786;
+    public long l16787;
+    public long l16788;
+    public long l16789;
+    public long l16790;
+    public long l16791;
+    public long l16792;
+    public long l16793;
+    public long l16794;
+    public long l16795;
+    public long l16796;
+    public long l16797;
+    public long l16798;
+    public long l16799;
+    public long l16800;
+    public long l16801;
+    public long l16802;
+    public long l16803;
+    public long l16804;
+    public long l16805;
+    public long l16806;
+    public long l16807;
+    public long l16808;
+    public long l16809;
+    public long l16810;
+    public long l16811;
+    public long l16812;
+    public long l16813;
+    public long l16814;
+    public long l16815;
+    public long l16816;
+    public long l16817;
+    public long l16818;
+    public long l16819;
+    public long l16820;
+    public long l16821;
+    public long l16822;
+    public long l16823;
+    public long l16824;
+    public long l16825;
+    public long l16826;
+    public long l16827;
+    public long l16828;
+    public long l16829;
+    public long l16830;
+    public long l16831;
+    public long l16832;
+    public long l16833;
+    public long l16834;
+    public long l16835;
+    public long l16836;
+    public long l16837;
+    public long l16838;
+    public long l16839;
+    public long l16840;
+    public long l16841;
+    public long l16842;
+    public long l16843;
+    public long l16844;
+    public long l16845;
+    public long l16846;
+    public long l16847;
+    public long l16848;
+    public long l16849;
+    public long l16850;
+    public long l16851;
+    public long l16852;
+    public long l16853;
+    public long l16854;
+    public long l16855;
+    public long l16856;
+    public long l16857;
+    public long l16858;
+    public long l16859;
+    public long l16860;
+    public long l16861;
+    public long l16862;
+    public long l16863;
+    public long l16864;
+    public long l16865;
+    public long l16866;
+    public long l16867;
+    public long l16868;
+    public long l16869;
+    public long l16870;
+    public long l16871;
+    public long l16872;
+    public long l16873;
+    public long l16874;
+    public long l16875;
+    public long l16876;
+    public long l16877;
+    public long l16878;
+    public long l16879;
+    public long l16880;
+    public long l16881;
+    public long l16882;
+    public long l16883;
+    public long l16884;
+    public long l16885;
+    public long l16886;
+    public long l16887;
+    public long l16888;
+    public long l16889;
+    public long l16890;
+    public long l16891;
+    public long l16892;
+    public long l16893;
+    public long l16894;
+    public long l16895;
+    public long l16896;
+    public long l16897;
+    public long l16898;
+    public long l16899;
+    public long l16900;
+    public long l16901;
+    public long l16902;
+    public long l16903;
+    public long l16904;
+    public long l16905;
+    public long l16906;
+    public long l16907;
+    public long l16908;
+    public long l16909;
+    public long l16910;
+    public long l16911;
+    public long l16912;
+    public long l16913;
+    public long l16914;
+    public long l16915;
+    public long l16916;
+    public long l16917;
+    public long l16918;
+    public long l16919;
+    public long l16920;
+    public long l16921;
+    public long l16922;
+    public long l16923;
+    public long l16924;
+    public long l16925;
+    public long l16926;
+    public long l16927;
+    public long l16928;
+    public long l16929;
+    public long l16930;
+    public long l16931;
+    public long l16932;
+    public long l16933;
+    public long l16934;
+    public long l16935;
+    public long l16936;
+    public long l16937;
+    public long l16938;
+    public long l16939;
+    public long l16940;
+    public long l16941;
+    public long l16942;
+    public long l16943;
+    public long l16944;
+    public long l16945;
+    public long l16946;
+    public long l16947;
+    public long l16948;
+    public long l16949;
+    public long l16950;
+    public long l16951;
+    public long l16952;
+    public long l16953;
+    public long l16954;
+    public long l16955;
+    public long l16956;
+    public long l16957;
+    public long l16958;
+    public long l16959;
+    public long l16960;
+    public long l16961;
+    public long l16962;
+    public long l16963;
+    public long l16964;
+    public long l16965;
+    public long l16966;
+    public long l16967;
+    public long l16968;
+    public long l16969;
+    public long l16970;
+    public long l16971;
+    public long l16972;
+    public long l16973;
+    public long l16974;
+    public long l16975;
+    public long l16976;
+    public long l16977;
+    public long l16978;
+    public long l16979;
+    public long l16980;
+    public long l16981;
+    public long l16982;
+    public long l16983;
+    public long l16984;
+    public long l16985;
+    public long l16986;
+    public long l16987;
+    public long l16988;
+    public long l16989;
+    public long l16990;
+    public long l16991;
+    public long l16992;
+    public long l16993;
+    public long l16994;
+    public long l16995;
+    public long l16996;
+    public long l16997;
+    public long l16998;
+    public long l16999;
+    public long l17000;
+    public long l17001;
+    public long l17002;
+    public long l17003;
+    public long l17004;
+    public long l17005;
+    public long l17006;
+    public long l17007;
+    public long l17008;
+    public long l17009;
+    public long l17010;
+    public long l17011;
+    public long l17012;
+    public long l17013;
+    public long l17014;
+    public long l17015;
+    public long l17016;
+    public long l17017;
+    public long l17018;
+    public long l17019;
+    public long l17020;
+    public long l17021;
+    public long l17022;
+    public long l17023;
+    public long l17024;
+    public long l17025;
+    public long l17026;
+    public long l17027;
+    public long l17028;
+    public long l17029;
+    public long l17030;
+    public long l17031;
+    public long l17032;
+    public long l17033;
+    public long l17034;
+    public long l17035;
+    public long l17036;
+    public long l17037;
+    public long l17038;
+    public long l17039;
+    public long l17040;
+    public long l17041;
+    public long l17042;
+    public long l17043;
+    public long l17044;
+    public long l17045;
+    public long l17046;
+    public long l17047;
+    public long l17048;
+    public long l17049;
+    public long l17050;
+    public long l17051;
+    public long l17052;
+    public long l17053;
+    public long l17054;
+    public long l17055;
+    public long l17056;
+    public long l17057;
+    public long l17058;
+    public long l17059;
+    public long l17060;
+    public long l17061;
+    public long l17062;
+    public long l17063;
+    public long l17064;
+    public long l17065;
+    public long l17066;
+    public long l17067;
+    public long l17068;
+    public long l17069;
+    public long l17070;
+    public long l17071;
+    public long l17072;
+    public long l17073;
+    public long l17074;
+    public long l17075;
+    public long l17076;
+    public long l17077;
+    public long l17078;
+    public long l17079;
+    public long l17080;
+    public long l17081;
+    public long l17082;
+    public long l17083;
+    public long l17084;
+    public long l17085;
+    public long l17086;
+    public long l17087;
+    public long l17088;
+    public long l17089;
+    public long l17090;
+    public long l17091;
+    public long l17092;
+    public long l17093;
+    public long l17094;
+    public long l17095;
+    public long l17096;
+    public long l17097;
+    public long l17098;
+    public long l17099;
+    public long l17100;
+    public long l17101;
+    public long l17102;
+    public long l17103;
+    public long l17104;
+    public long l17105;
+    public long l17106;
+    public long l17107;
+    public long l17108;
+    public long l17109;
+    public long l17110;
+    public long l17111;
+    public long l17112;
+    public long l17113;
+    public long l17114;
+    public long l17115;
+    public long l17116;
+    public long l17117;
+    public long l17118;
+    public long l17119;
+    public long l17120;
+    public long l17121;
+    public long l17122;
+    public long l17123;
+    public long l17124;
+    public long l17125;
+    public long l17126;
+    public long l17127;
+    public long l17128;
+    public long l17129;
+    public long l17130;
+    public long l17131;
+    public long l17132;
+    public long l17133;
+    public long l17134;
+    public long l17135;
+    public long l17136;
+    public long l17137;
+    public long l17138;
+    public long l17139;
+    public long l17140;
+    public long l17141;
+    public long l17142;
+    public long l17143;
+    public long l17144;
+    public long l17145;
+    public long l17146;
+    public long l17147;
+    public long l17148;
+    public long l17149;
+    public long l17150;
+    public long l17151;
+    public long l17152;
+    public long l17153;
+    public long l17154;
+    public long l17155;
+    public long l17156;
+    public long l17157;
+    public long l17158;
+    public long l17159;
+    public long l17160;
+    public long l17161;
+    public long l17162;
+    public long l17163;
+    public long l17164;
+    public long l17165;
+    public long l17166;
+    public long l17167;
+    public long l17168;
+    public long l17169;
+    public long l17170;
+    public long l17171;
+    public long l17172;
+    public long l17173;
+    public long l17174;
+    public long l17175;
+    public long l17176;
+    public long l17177;
+    public long l17178;
+    public long l17179;
+    public long l17180;
+    public long l17181;
+    public long l17182;
+    public long l17183;
+    public long l17184;
+    public long l17185;
+    public long l17186;
+    public long l17187;
+    public long l17188;
+    public long l17189;
+    public long l17190;
+    public long l17191;
+    public long l17192;
+    public long l17193;
+    public long l17194;
+    public long l17195;
+    public long l17196;
+    public long l17197;
+    public long l17198;
+    public long l17199;
+    public long l17200;
+    public long l17201;
+    public long l17202;
+    public long l17203;
+    public long l17204;
+    public long l17205;
+    public long l17206;
+    public long l17207;
+    public long l17208;
+    public long l17209;
+    public long l17210;
+    public long l17211;
+    public long l17212;
+    public long l17213;
+    public long l17214;
+    public long l17215;
+    public long l17216;
+    public long l17217;
+    public long l17218;
+    public long l17219;
+    public long l17220;
+    public long l17221;
+    public long l17222;
+    public long l17223;
+    public long l17224;
+    public long l17225;
+    public long l17226;
+    public long l17227;
+    public long l17228;
+    public long l17229;
+    public long l17230;
+    public long l17231;
+    public long l17232;
+    public long l17233;
+    public long l17234;
+    public long l17235;
+    public long l17236;
+    public long l17237;
+    public long l17238;
+    public long l17239;
+    public long l17240;
+    public long l17241;
+    public long l17242;
+    public long l17243;
+    public long l17244;
+    public long l17245;
+    public long l17246;
+    public long l17247;
+    public long l17248;
+    public long l17249;
+    public long l17250;
+    public long l17251;
+    public long l17252;
+    public long l17253;
+    public long l17254;
+    public long l17255;
+    public long l17256;
+    public long l17257;
+    public long l17258;
+    public long l17259;
+    public long l17260;
+    public long l17261;
+    public long l17262;
+    public long l17263;
+    public long l17264;
+    public long l17265;
+    public long l17266;
+    public long l17267;
+    public long l17268;
+    public long l17269;
+    public long l17270;
+    public long l17271;
+    public long l17272;
+    public long l17273;
+    public long l17274;
+    public long l17275;
+    public long l17276;
+    public long l17277;
+    public long l17278;
+    public long l17279;
+    public long l17280;
+    public long l17281;
+    public long l17282;
+    public long l17283;
+    public long l17284;
+    public long l17285;
+    public long l17286;
+    public long l17287;
+    public long l17288;
+    public long l17289;
+    public long l17290;
+    public long l17291;
+    public long l17292;
+    public long l17293;
+    public long l17294;
+    public long l17295;
+    public long l17296;
+    public long l17297;
+    public long l17298;
+    public long l17299;
+    public long l17300;
+    public long l17301;
+    public long l17302;
+    public long l17303;
+    public long l17304;
+    public long l17305;
+    public long l17306;
+    public long l17307;
+    public long l17308;
+    public long l17309;
+    public long l17310;
+    public long l17311;
+    public long l17312;
+    public long l17313;
+    public long l17314;
+    public long l17315;
+    public long l17316;
+    public long l17317;
+    public long l17318;
+    public long l17319;
+    public long l17320;
+    public long l17321;
+    public long l17322;
+    public long l17323;
+    public long l17324;
+    public long l17325;
+    public long l17326;
+    public long l17327;
+    public long l17328;
+    public long l17329;
+    public long l17330;
+    public long l17331;
+    public long l17332;
+    public long l17333;
+    public long l17334;
+    public long l17335;
+    public long l17336;
+    public long l17337;
+    public long l17338;
+    public long l17339;
+    public long l17340;
+    public long l17341;
+    public long l17342;
+    public long l17343;
+    public long l17344;
+    public long l17345;
+    public long l17346;
+    public long l17347;
+    public long l17348;
+    public long l17349;
+    public long l17350;
+    public long l17351;
+    public long l17352;
+    public long l17353;
+    public long l17354;
+    public long l17355;
+    public long l17356;
+    public long l17357;
+    public long l17358;
+    public long l17359;
+    public long l17360;
+    public long l17361;
+    public long l17362;
+    public long l17363;
+    public long l17364;
+    public long l17365;
+    public long l17366;
+    public long l17367;
+    public long l17368;
+    public long l17369;
+    public long l17370;
+    public long l17371;
+    public long l17372;
+    public long l17373;
+    public long l17374;
+    public long l17375;
+    public long l17376;
+    public long l17377;
+    public long l17378;
+    public long l17379;
+    public long l17380;
+    public long l17381;
+    public long l17382;
+    public long l17383;
+    public long l17384;
+    public long l17385;
+    public long l17386;
+    public long l17387;
+    public long l17388;
+    public long l17389;
+    public long l17390;
+    public long l17391;
+    public long l17392;
+    public long l17393;
+    public long l17394;
+    public long l17395;
+    public long l17396;
+    public long l17397;
+    public long l17398;
+    public long l17399;
+    public long l17400;
+    public long l17401;
+    public long l17402;
+    public long l17403;
+    public long l17404;
+    public long l17405;
+    public long l17406;
+    public long l17407;
+    public long l17408;
+    public long l17409;
+    public long l17410;
+    public long l17411;
+    public long l17412;
+    public long l17413;
+    public long l17414;
+    public long l17415;
+    public long l17416;
+    public long l17417;
+    public long l17418;
+    public long l17419;
+    public long l17420;
+    public long l17421;
+    public long l17422;
+    public long l17423;
+    public long l17424;
+    public long l17425;
+    public long l17426;
+    public long l17427;
+    public long l17428;
+    public long l17429;
+    public long l17430;
+    public long l17431;
+    public long l17432;
+    public long l17433;
+    public long l17434;
+    public long l17435;
+    public long l17436;
+    public long l17437;
+    public long l17438;
+    public long l17439;
+    public long l17440;
+    public long l17441;
+    public long l17442;
+    public long l17443;
+    public long l17444;
+    public long l17445;
+    public long l17446;
+    public long l17447;
+    public long l17448;
+    public long l17449;
+    public long l17450;
+    public long l17451;
+    public long l17452;
+    public long l17453;
+    public long l17454;
+    public long l17455;
+    public long l17456;
+    public long l17457;
+    public long l17458;
+    public long l17459;
+    public long l17460;
+    public long l17461;
+    public long l17462;
+    public long l17463;
+    public long l17464;
+    public long l17465;
+    public long l17466;
+    public long l17467;
+    public long l17468;
+    public long l17469;
+    public long l17470;
+    public long l17471;
+    public long l17472;
+    public long l17473;
+    public long l17474;
+    public long l17475;
+    public long l17476;
+    public long l17477;
+    public long l17478;
+    public long l17479;
+    public long l17480;
+    public long l17481;
+    public long l17482;
+    public long l17483;
+    public long l17484;
+    public long l17485;
+    public long l17486;
+    public long l17487;
+    public long l17488;
+    public long l17489;
+    public long l17490;
+    public long l17491;
+    public long l17492;
+    public long l17493;
+    public long l17494;
+    public long l17495;
+    public long l17496;
+    public long l17497;
+    public long l17498;
+    public long l17499;
+    public long l17500;
+    public long l17501;
+    public long l17502;
+    public long l17503;
+    public long l17504;
+    public long l17505;
+    public long l17506;
+    public long l17507;
+    public long l17508;
+    public long l17509;
+    public long l17510;
+    public long l17511;
+    public long l17512;
+    public long l17513;
+    public long l17514;
+    public long l17515;
+    public long l17516;
+    public long l17517;
+    public long l17518;
+    public long l17519;
+    public long l17520;
+    public long l17521;
+    public long l17522;
+    public long l17523;
+    public long l17524;
+    public long l17525;
+    public long l17526;
+    public long l17527;
+    public long l17528;
+    public long l17529;
+    public long l17530;
+    public long l17531;
+    public long l17532;
+    public long l17533;
+    public long l17534;
+    public long l17535;
+    public long l17536;
+    public long l17537;
+    public long l17538;
+    public long l17539;
+    public long l17540;
+    public long l17541;
+    public long l17542;
+    public long l17543;
+    public long l17544;
+    public long l17545;
+    public long l17546;
+    public long l17547;
+    public long l17548;
+    public long l17549;
+    public long l17550;
+    public long l17551;
+    public long l17552;
+    public long l17553;
+    public long l17554;
+    public long l17555;
+    public long l17556;
+    public long l17557;
+    public long l17558;
+    public long l17559;
+    public long l17560;
+    public long l17561;
+    public long l17562;
+    public long l17563;
+    public long l17564;
+    public long l17565;
+    public long l17566;
+    public long l17567;
+    public long l17568;
+    public long l17569;
+    public long l17570;
+    public long l17571;
+    public long l17572;
+    public long l17573;
+    public long l17574;
+    public long l17575;
+    public long l17576;
+    public long l17577;
+    public long l17578;
+    public long l17579;
+    public long l17580;
+    public long l17581;
+    public long l17582;
+    public long l17583;
+    public long l17584;
+    public long l17585;
+    public long l17586;
+    public long l17587;
+    public long l17588;
+    public long l17589;
+    public long l17590;
+    public long l17591;
+    public long l17592;
+    public long l17593;
+    public long l17594;
+    public long l17595;
+    public long l17596;
+    public long l17597;
+    public long l17598;
+    public long l17599;
+    public long l17600;
+    public long l17601;
+    public long l17602;
+    public long l17603;
+    public long l17604;
+    public long l17605;
+    public long l17606;
+    public long l17607;
+    public long l17608;
+    public long l17609;
+    public long l17610;
+    public long l17611;
+    public long l17612;
+    public long l17613;
+    public long l17614;
+    public long l17615;
+    public long l17616;
+    public long l17617;
+    public long l17618;
+    public long l17619;
+    public long l17620;
+    public long l17621;
+    public long l17622;
+    public long l17623;
+    public long l17624;
+    public long l17625;
+    public long l17626;
+    public long l17627;
+    public long l17628;
+    public long l17629;
+    public long l17630;
+    public long l17631;
+    public long l17632;
+    public long l17633;
+    public long l17634;
+    public long l17635;
+    public long l17636;
+    public long l17637;
+    public long l17638;
+    public long l17639;
+    public long l17640;
+    public long l17641;
+    public long l17642;
+    public long l17643;
+    public long l17644;
+    public long l17645;
+    public long l17646;
+    public long l17647;
+    public long l17648;
+    public long l17649;
+    public long l17650;
+    public long l17651;
+    public long l17652;
+    public long l17653;
+    public long l17654;
+    public long l17655;
+    public long l17656;
+    public long l17657;
+    public long l17658;
+    public long l17659;
+    public long l17660;
+    public long l17661;
+    public long l17662;
+    public long l17663;
+    public long l17664;
+    public long l17665;
+    public long l17666;
+    public long l17667;
+    public long l17668;
+    public long l17669;
+    public long l17670;
+    public long l17671;
+    public long l17672;
+    public long l17673;
+    public long l17674;
+    public long l17675;
+    public long l17676;
+    public long l17677;
+    public long l17678;
+    public long l17679;
+    public long l17680;
+    public long l17681;
+    public long l17682;
+    public long l17683;
+    public long l17684;
+    public long l17685;
+    public long l17686;
+    public long l17687;
+    public long l17688;
+    public long l17689;
+    public long l17690;
+    public long l17691;
+    public long l17692;
+    public long l17693;
+    public long l17694;
+    public long l17695;
+    public long l17696;
+    public long l17697;
+    public long l17698;
+    public long l17699;
+    public long l17700;
+    public long l17701;
+    public long l17702;
+    public long l17703;
+    public long l17704;
+    public long l17705;
+    public long l17706;
+    public long l17707;
+    public long l17708;
+    public long l17709;
+    public long l17710;
+    public long l17711;
+    public long l17712;
+    public long l17713;
+    public long l17714;
+    public long l17715;
+    public long l17716;
+    public long l17717;
+    public long l17718;
+    public long l17719;
+    public long l17720;
+    public long l17721;
+    public long l17722;
+    public long l17723;
+    public long l17724;
+    public long l17725;
+    public long l17726;
+    public long l17727;
+    public long l17728;
+    public long l17729;
+    public long l17730;
+    public long l17731;
+    public long l17732;
+    public long l17733;
+    public long l17734;
+    public long l17735;
+    public long l17736;
+    public long l17737;
+    public long l17738;
+    public long l17739;
+    public long l17740;
+    public long l17741;
+    public long l17742;
+    public long l17743;
+    public long l17744;
+    public long l17745;
+    public long l17746;
+    public long l17747;
+    public long l17748;
+    public long l17749;
+    public long l17750;
+    public long l17751;
+    public long l17752;
+    public long l17753;
+    public long l17754;
+    public long l17755;
+    public long l17756;
+    public long l17757;
+    public long l17758;
+    public long l17759;
+    public long l17760;
+    public long l17761;
+    public long l17762;
+    public long l17763;
+    public long l17764;
+    public long l17765;
+    public long l17766;
+    public long l17767;
+    public long l17768;
+    public long l17769;
+    public long l17770;
+    public long l17771;
+    public long l17772;
+    public long l17773;
+    public long l17774;
+    public long l17775;
+    public long l17776;
+    public long l17777;
+    public long l17778;
+    public long l17779;
+    public long l17780;
+    public long l17781;
+    public long l17782;
+    public long l17783;
+    public long l17784;
+    public long l17785;
+    public long l17786;
+    public long l17787;
+    public long l17788;
+    public long l17789;
+    public long l17790;
+    public long l17791;
+    public long l17792;
+    public long l17793;
+    public long l17794;
+    public long l17795;
+    public long l17796;
+    public long l17797;
+    public long l17798;
+    public long l17799;
+    public long l17800;
+    public long l17801;
+    public long l17802;
+    public long l17803;
+    public long l17804;
+    public long l17805;
+    public long l17806;
+    public long l17807;
+    public long l17808;
+    public long l17809;
+    public long l17810;
+    public long l17811;
+    public long l17812;
+    public long l17813;
+    public long l17814;
+    public long l17815;
+    public long l17816;
+    public long l17817;
+    public long l17818;
+    public long l17819;
+    public long l17820;
+    public long l17821;
+    public long l17822;
+    public long l17823;
+    public long l17824;
+    public long l17825;
+    public long l17826;
+    public long l17827;
+    public long l17828;
+    public long l17829;
+    public long l17830;
+    public long l17831;
+    public long l17832;
+    public long l17833;
+    public long l17834;
+    public long l17835;
+    public long l17836;
+    public long l17837;
+    public long l17838;
+    public long l17839;
+    public long l17840;
+    public long l17841;
+    public long l17842;
+    public long l17843;
+    public long l17844;
+    public long l17845;
+    public long l17846;
+    public long l17847;
+    public long l17848;
+    public long l17849;
+    public long l17850;
+    public long l17851;
+    public long l17852;
+    public long l17853;
+    public long l17854;
+    public long l17855;
+    public long l17856;
+    public long l17857;
+    public long l17858;
+    public long l17859;
+    public long l17860;
+    public long l17861;
+    public long l17862;
+    public long l17863;
+    public long l17864;
+    public long l17865;
+    public long l17866;
+    public long l17867;
+    public long l17868;
+    public long l17869;
+    public long l17870;
+    public long l17871;
+    public long l17872;
+    public long l17873;
+    public long l17874;
+    public long l17875;
+    public long l17876;
+    public long l17877;
+    public long l17878;
+    public long l17879;
+    public long l17880;
+    public long l17881;
+    public long l17882;
+    public long l17883;
+    public long l17884;
+    public long l17885;
+    public long l17886;
+    public long l17887;
+    public long l17888;
+    public long l17889;
+    public long l17890;
+    public long l17891;
+    public long l17892;
+    public long l17893;
+    public long l17894;
+    public long l17895;
+    public long l17896;
+    public long l17897;
+    public long l17898;
+    public long l17899;
+    public long l17900;
+    public long l17901;
+    public long l17902;
+    public long l17903;
+    public long l17904;
+    public long l17905;
+    public long l17906;
+    public long l17907;
+    public long l17908;
+    public long l17909;
+    public long l17910;
+    public long l17911;
+    public long l17912;
+    public long l17913;
+    public long l17914;
+    public long l17915;
+    public long l17916;
+    public long l17917;
+    public long l17918;
+    public long l17919;
+    public long l17920;
+    public long l17921;
+    public long l17922;
+    public long l17923;
+    public long l17924;
+    public long l17925;
+    public long l17926;
+    public long l17927;
+    public long l17928;
+    public long l17929;
+    public long l17930;
+    public long l17931;
+    public long l17932;
+    public long l17933;
+    public long l17934;
+    public long l17935;
+    public long l17936;
+    public long l17937;
+    public long l17938;
+    public long l17939;
+    public long l17940;
+    public long l17941;
+    public long l17942;
+    public long l17943;
+    public long l17944;
+    public long l17945;
+    public long l17946;
+    public long l17947;
+    public long l17948;
+    public long l17949;
+    public long l17950;
+    public long l17951;
+    public long l17952;
+    public long l17953;
+    public long l17954;
+    public long l17955;
+    public long l17956;
+    public long l17957;
+    public long l17958;
+    public long l17959;
+    public long l17960;
+    public long l17961;
+    public long l17962;
+    public long l17963;
+    public long l17964;
+    public long l17965;
+    public long l17966;
+    public long l17967;
+    public long l17968;
+    public long l17969;
+    public long l17970;
+    public long l17971;
+    public long l17972;
+    public long l17973;
+    public long l17974;
+    public long l17975;
+    public long l17976;
+    public long l17977;
+    public long l17978;
+    public long l17979;
+    public long l17980;
+    public long l17981;
+    public long l17982;
+    public long l17983;
+    public long l17984;
+    public long l17985;
+    public long l17986;
+    public long l17987;
+    public long l17988;
+    public long l17989;
+    public long l17990;
+    public long l17991;
+    public long l17992;
+    public long l17993;
+    public long l17994;
+    public long l17995;
+    public long l17996;
+    public long l17997;
+    public long l17998;
+    public long l17999;
+    public long l18000;
+    public long l18001;
+    public long l18002;
+    public long l18003;
+    public long l18004;
+    public long l18005;
+    public long l18006;
+    public long l18007;
+    public long l18008;
+    public long l18009;
+    public long l18010;
+    public long l18011;
+    public long l18012;
+    public long l18013;
+    public long l18014;
+    public long l18015;
+    public long l18016;
+    public long l18017;
+    public long l18018;
+    public long l18019;
+    public long l18020;
+    public long l18021;
+    public long l18022;
+    public long l18023;
+    public long l18024;
+    public long l18025;
+    public long l18026;
+    public long l18027;
+    public long l18028;
+    public long l18029;
+    public long l18030;
+    public long l18031;
+    public long l18032;
+    public long l18033;
+    public long l18034;
+    public long l18035;
+    public long l18036;
+    public long l18037;
+    public long l18038;
+    public long l18039;
+    public long l18040;
+    public long l18041;
+    public long l18042;
+    public long l18043;
+    public long l18044;
+    public long l18045;
+    public long l18046;
+    public long l18047;
+    public long l18048;
+    public long l18049;
+    public long l18050;
+    public long l18051;
+    public long l18052;
+    public long l18053;
+    public long l18054;
+    public long l18055;
+    public long l18056;
+    public long l18057;
+    public long l18058;
+    public long l18059;
+    public long l18060;
+    public long l18061;
+    public long l18062;
+    public long l18063;
+    public long l18064;
+    public long l18065;
+    public long l18066;
+    public long l18067;
+    public long l18068;
+    public long l18069;
+    public long l18070;
+    public long l18071;
+    public long l18072;
+    public long l18073;
+    public long l18074;
+    public long l18075;
+    public long l18076;
+    public long l18077;
+    public long l18078;
+    public long l18079;
+    public long l18080;
+    public long l18081;
+    public long l18082;
+    public long l18083;
+    public long l18084;
+    public long l18085;
+    public long l18086;
+    public long l18087;
+    public long l18088;
+    public long l18089;
+    public long l18090;
+    public long l18091;
+    public long l18092;
+    public long l18093;
+    public long l18094;
+    public long l18095;
+    public long l18096;
+    public long l18097;
+    public long l18098;
+    public long l18099;
+    public long l18100;
+    public long l18101;
+    public long l18102;
+    public long l18103;
+    public long l18104;
+    public long l18105;
+    public long l18106;
+    public long l18107;
+    public long l18108;
+    public long l18109;
+    public long l18110;
+    public long l18111;
+    public long l18112;
+    public long l18113;
+    public long l18114;
+    public long l18115;
+    public long l18116;
+    public long l18117;
+    public long l18118;
+    public long l18119;
+    public long l18120;
+    public long l18121;
+    public long l18122;
+    public long l18123;
+    public long l18124;
+    public long l18125;
+    public long l18126;
+    public long l18127;
+    public long l18128;
+    public long l18129;
+    public long l18130;
+    public long l18131;
+    public long l18132;
+    public long l18133;
+    public long l18134;
+    public long l18135;
+    public long l18136;
+    public long l18137;
+    public long l18138;
+    public long l18139;
+    public long l18140;
+    public long l18141;
+    public long l18142;
+    public long l18143;
+    public long l18144;
+    public long l18145;
+    public long l18146;
+    public long l18147;
+    public long l18148;
+    public long l18149;
+    public long l18150;
+    public long l18151;
+    public long l18152;
+    public long l18153;
+    public long l18154;
+    public long l18155;
+    public long l18156;
+    public long l18157;
+    public long l18158;
+    public long l18159;
+    public long l18160;
+    public long l18161;
+    public long l18162;
+    public long l18163;
+    public long l18164;
+    public long l18165;
+    public long l18166;
+    public long l18167;
+    public long l18168;
+    public long l18169;
+    public long l18170;
+    public long l18171;
+    public long l18172;
+    public long l18173;
+    public long l18174;
+    public long l18175;
+    public long l18176;
+    public long l18177;
+    public long l18178;
+    public long l18179;
+    public long l18180;
+    public long l18181;
+    public long l18182;
+    public long l18183;
+    public long l18184;
+    public long l18185;
+    public long l18186;
+    public long l18187;
+    public long l18188;
+    public long l18189;
+    public long l18190;
+    public long l18191;
+    public long l18192;
+    public long l18193;
+    public long l18194;
+    public long l18195;
+    public long l18196;
+    public long l18197;
+    public long l18198;
+    public long l18199;
+    public long l18200;
+    public long l18201;
+    public long l18202;
+    public long l18203;
+    public long l18204;
+    public long l18205;
+    public long l18206;
+    public long l18207;
+    public long l18208;
+    public long l18209;
+    public long l18210;
+    public long l18211;
+    public long l18212;
+    public long l18213;
+    public long l18214;
+    public long l18215;
+    public long l18216;
+    public long l18217;
+    public long l18218;
+    public long l18219;
+    public long l18220;
+    public long l18221;
+    public long l18222;
+    public long l18223;
+    public long l18224;
+    public long l18225;
+    public long l18226;
+    public long l18227;
+    public long l18228;
+    public long l18229;
+    public long l18230;
+    public long l18231;
+    public long l18232;
+    public long l18233;
+    public long l18234;
+    public long l18235;
+    public long l18236;
+    public long l18237;
+    public long l18238;
+    public long l18239;
+    public long l18240;
+    public long l18241;
+    public long l18242;
+    public long l18243;
+    public long l18244;
+    public long l18245;
+    public long l18246;
+    public long l18247;
+    public long l18248;
+    public long l18249;
+    public long l18250;
+    public long l18251;
+    public long l18252;
+    public long l18253;
+    public long l18254;
+    public long l18255;
+    public long l18256;
+    public long l18257;
+    public long l18258;
+    public long l18259;
+    public long l18260;
+    public long l18261;
+    public long l18262;
+    public long l18263;
+    public long l18264;
+    public long l18265;
+    public long l18266;
+    public long l18267;
+    public long l18268;
+    public long l18269;
+    public long l18270;
+    public long l18271;
+    public long l18272;
+    public long l18273;
+    public long l18274;
+    public long l18275;
+    public long l18276;
+    public long l18277;
+    public long l18278;
+    public long l18279;
+    public long l18280;
+    public long l18281;
+    public long l18282;
+    public long l18283;
+    public long l18284;
+    public long l18285;
+    public long l18286;
+    public long l18287;
+    public long l18288;
+    public long l18289;
+    public long l18290;
+    public long l18291;
+    public long l18292;
+    public long l18293;
+    public long l18294;
+    public long l18295;
+    public long l18296;
+    public long l18297;
+    public long l18298;
+    public long l18299;
+    public long l18300;
+    public long l18301;
+    public long l18302;
+    public long l18303;
+    public long l18304;
+    public long l18305;
+    public long l18306;
+    public long l18307;
+    public long l18308;
+    public long l18309;
+    public long l18310;
+    public long l18311;
+    public long l18312;
+    public long l18313;
+    public long l18314;
+    public long l18315;
+    public long l18316;
+    public long l18317;
+    public long l18318;
+    public long l18319;
+    public long l18320;
+    public long l18321;
+    public long l18322;
+    public long l18323;
+    public long l18324;
+    public long l18325;
+    public long l18326;
+    public long l18327;
+    public long l18328;
+    public long l18329;
+    public long l18330;
+    public long l18331;
+    public long l18332;
+    public long l18333;
+    public long l18334;
+    public long l18335;
+    public long l18336;
+    public long l18337;
+    public long l18338;
+    public long l18339;
+    public long l18340;
+    public long l18341;
+    public long l18342;
+    public long l18343;
+    public long l18344;
+    public long l18345;
+    public long l18346;
+    public long l18347;
+    public long l18348;
+    public long l18349;
+    public long l18350;
+    public long l18351;
+    public long l18352;
+    public long l18353;
+    public long l18354;
+    public long l18355;
+    public long l18356;
+    public long l18357;
+    public long l18358;
+    public long l18359;
+    public long l18360;
+    public long l18361;
+    public long l18362;
+    public long l18363;
+    public long l18364;
+    public long l18365;
+    public long l18366;
+    public long l18367;
+    public long l18368;
+    public long l18369;
+    public long l18370;
+    public long l18371;
+    public long l18372;
+    public long l18373;
+    public long l18374;
+    public long l18375;
+    public long l18376;
+    public long l18377;
+    public long l18378;
+    public long l18379;
+    public long l18380;
+    public long l18381;
+    public long l18382;
+    public long l18383;
+    public long l18384;
+    public long l18385;
+    public long l18386;
+    public long l18387;
+    public long l18388;
+    public long l18389;
+    public long l18390;
+    public long l18391;
+    public long l18392;
+    public long l18393;
+    public long l18394;
+    public long l18395;
+    public long l18396;
+    public long l18397;
+    public long l18398;
+    public long l18399;
+    public long l18400;
+    public long l18401;
+    public long l18402;
+    public long l18403;
+    public long l18404;
+    public long l18405;
+    public long l18406;
+    public long l18407;
+    public long l18408;
+    public long l18409;
+    public long l18410;
+    public long l18411;
+    public long l18412;
+    public long l18413;
+    public long l18414;
+    public long l18415;
+    public long l18416;
+    public long l18417;
+    public long l18418;
+    public long l18419;
+    public long l18420;
+    public long l18421;
+    public long l18422;
+    public long l18423;
+    public long l18424;
+    public long l18425;
+    public long l18426;
+    public long l18427;
+    public long l18428;
+    public long l18429;
+    public long l18430;
+    public long l18431;
+    public long l18432;
+    public long l18433;
+    public long l18434;
+    public long l18435;
+    public long l18436;
+    public long l18437;
+    public long l18438;
+    public long l18439;
+    public long l18440;
+    public long l18441;
+    public long l18442;
+    public long l18443;
+    public long l18444;
+    public long l18445;
+    public long l18446;
+    public long l18447;
+    public long l18448;
+    public long l18449;
+    public long l18450;
+    public long l18451;
+    public long l18452;
+    public long l18453;
+    public long l18454;
+    public long l18455;
+    public long l18456;
+    public long l18457;
+    public long l18458;
+    public long l18459;
+    public long l18460;
+    public long l18461;
+    public long l18462;
+    public long l18463;
+    public long l18464;
+    public long l18465;
+    public long l18466;
+    public long l18467;
+    public long l18468;
+    public long l18469;
+    public long l18470;
+    public long l18471;
+    public long l18472;
+    public long l18473;
+    public long l18474;
+    public long l18475;
+    public long l18476;
+    public long l18477;
+    public long l18478;
+    public long l18479;
+    public long l18480;
+    public long l18481;
+    public long l18482;
+    public long l18483;
+    public long l18484;
+    public long l18485;
+    public long l18486;
+    public long l18487;
+    public long l18488;
+    public long l18489;
+    public long l18490;
+    public long l18491;
+    public long l18492;
+    public long l18493;
+    public long l18494;
+    public long l18495;
+    public long l18496;
+    public long l18497;
+    public long l18498;
+    public long l18499;
+    public long l18500;
+    public long l18501;
+    public long l18502;
+    public long l18503;
+    public long l18504;
+    public long l18505;
+    public long l18506;
+    public long l18507;
+    public long l18508;
+    public long l18509;
+    public long l18510;
+    public long l18511;
+    public long l18512;
+    public long l18513;
+    public long l18514;
+    public long l18515;
+    public long l18516;
+    public long l18517;
+    public long l18518;
+    public long l18519;
+    public long l18520;
+    public long l18521;
+    public long l18522;
+    public long l18523;
+    public long l18524;
+    public long l18525;
+    public long l18526;
+    public long l18527;
+    public long l18528;
+    public long l18529;
+    public long l18530;
+    public long l18531;
+    public long l18532;
+    public long l18533;
+    public long l18534;
+    public long l18535;
+    public long l18536;
+    public long l18537;
+    public long l18538;
+    public long l18539;
+    public long l18540;
+    public long l18541;
+    public long l18542;
+    public long l18543;
+    public long l18544;
+    public long l18545;
+    public long l18546;
+    public long l18547;
+    public long l18548;
+    public long l18549;
+    public long l18550;
+    public long l18551;
+    public long l18552;
+    public long l18553;
+    public long l18554;
+    public long l18555;
+    public long l18556;
+    public long l18557;
+    public long l18558;
+    public long l18559;
+    public long l18560;
+    public long l18561;
+    public long l18562;
+    public long l18563;
+    public long l18564;
+    public long l18565;
+    public long l18566;
+    public long l18567;
+    public long l18568;
+    public long l18569;
+    public long l18570;
+    public long l18571;
+    public long l18572;
+    public long l18573;
+    public long l18574;
+    public long l18575;
+    public long l18576;
+    public long l18577;
+    public long l18578;
+    public long l18579;
+    public long l18580;
+    public long l18581;
+    public long l18582;
+    public long l18583;
+    public long l18584;
+    public long l18585;
+    public long l18586;
+    public long l18587;
+    public long l18588;
+    public long l18589;
+    public long l18590;
+    public long l18591;
+    public long l18592;
+    public long l18593;
+    public long l18594;
+    public long l18595;
+    public long l18596;
+    public long l18597;
+    public long l18598;
+    public long l18599;
+    public long l18600;
+    public long l18601;
+    public long l18602;
+    public long l18603;
+    public long l18604;
+    public long l18605;
+    public long l18606;
+    public long l18607;
+    public long l18608;
+    public long l18609;
+    public long l18610;
+    public long l18611;
+    public long l18612;
+    public long l18613;
+    public long l18614;
+    public long l18615;
+    public long l18616;
+    public long l18617;
+    public long l18618;
+    public long l18619;
+    public long l18620;
+    public long l18621;
+    public long l18622;
+    public long l18623;
+    public long l18624;
+    public long l18625;
+    public long l18626;
+    public long l18627;
+    public long l18628;
+    public long l18629;
+    public long l18630;
+    public long l18631;
+    public long l18632;
+    public long l18633;
+    public long l18634;
+    public long l18635;
+    public long l18636;
+    public long l18637;
+    public long l18638;
+    public long l18639;
+    public long l18640;
+    public long l18641;
+    public long l18642;
+    public long l18643;
+    public long l18644;
+    public long l18645;
+    public long l18646;
+    public long l18647;
+    public long l18648;
+    public long l18649;
+    public long l18650;
+    public long l18651;
+    public long l18652;
+    public long l18653;
+    public long l18654;
+    public long l18655;
+    public long l18656;
+    public long l18657;
+    public long l18658;
+    public long l18659;
+    public long l18660;
+    public long l18661;
+    public long l18662;
+    public long l18663;
+    public long l18664;
+    public long l18665;
+    public long l18666;
+    public long l18667;
+    public long l18668;
+    public long l18669;
+    public long l18670;
+    public long l18671;
+    public long l18672;
+    public long l18673;
+    public long l18674;
+    public long l18675;
+    public long l18676;
+    public long l18677;
+    public long l18678;
+    public long l18679;
+    public long l18680;
+    public long l18681;
+    public long l18682;
+    public long l18683;
+    public long l18684;
+    public long l18685;
+    public long l18686;
+    public long l18687;
+    public long l18688;
+    public long l18689;
+    public long l18690;
+    public long l18691;
+    public long l18692;
+    public long l18693;
+    public long l18694;
+    public long l18695;
+    public long l18696;
+    public long l18697;
+    public long l18698;
+    public long l18699;
+    public long l18700;
+    public long l18701;
+    public long l18702;
+    public long l18703;
+    public long l18704;
+    public long l18705;
+    public long l18706;
+    public long l18707;
+    public long l18708;
+    public long l18709;
+    public long l18710;
+    public long l18711;
+    public long l18712;
+    public long l18713;
+    public long l18714;
+    public long l18715;
+    public long l18716;
+    public long l18717;
+    public long l18718;
+    public long l18719;
+    public long l18720;
+    public long l18721;
+    public long l18722;
+    public long l18723;
+    public long l18724;
+    public long l18725;
+    public long l18726;
+    public long l18727;
+    public long l18728;
+    public long l18729;
+    public long l18730;
+    public long l18731;
+    public long l18732;
+    public long l18733;
+    public long l18734;
+    public long l18735;
+    public long l18736;
+    public long l18737;
+    public long l18738;
+    public long l18739;
+    public long l18740;
+    public long l18741;
+    public long l18742;
+    public long l18743;
+    public long l18744;
+    public long l18745;
+    public long l18746;
+    public long l18747;
+    public long l18748;
+    public long l18749;
+    public long l18750;
+    public long l18751;
+    public long l18752;
+    public long l18753;
+    public long l18754;
+    public long l18755;
+    public long l18756;
+    public long l18757;
+    public long l18758;
+    public long l18759;
+    public long l18760;
+    public long l18761;
+    public long l18762;
+    public long l18763;
+    public long l18764;
+    public long l18765;
+    public long l18766;
+    public long l18767;
+    public long l18768;
+    public long l18769;
+    public long l18770;
+    public long l18771;
+    public long l18772;
+    public long l18773;
+    public long l18774;
+    public long l18775;
+    public long l18776;
+    public long l18777;
+    public long l18778;
+    public long l18779;
+    public long l18780;
+    public long l18781;
+    public long l18782;
+    public long l18783;
+    public long l18784;
+    public long l18785;
+    public long l18786;
+    public long l18787;
+    public long l18788;
+    public long l18789;
+    public long l18790;
+    public long l18791;
+    public long l18792;
+    public long l18793;
+    public long l18794;
+    public long l18795;
+    public long l18796;
+    public long l18797;
+    public long l18798;
+    public long l18799;
+    public long l18800;
+    public long l18801;
+    public long l18802;
+    public long l18803;
+    public long l18804;
+    public long l18805;
+    public long l18806;
+    public long l18807;
+    public long l18808;
+    public long l18809;
+    public long l18810;
+    public long l18811;
+    public long l18812;
+    public long l18813;
+    public long l18814;
+    public long l18815;
+    public long l18816;
+    public long l18817;
+    public long l18818;
+    public long l18819;
+    public long l18820;
+    public long l18821;
+    public long l18822;
+    public long l18823;
+    public long l18824;
+    public long l18825;
+    public long l18826;
+    public long l18827;
+    public long l18828;
+    public long l18829;
+    public long l18830;
+    public long l18831;
+    public long l18832;
+    public long l18833;
+    public long l18834;
+    public long l18835;
+    public long l18836;
+    public long l18837;
+    public long l18838;
+    public long l18839;
+    public long l18840;
+    public long l18841;
+    public long l18842;
+    public long l18843;
+    public long l18844;
+    public long l18845;
+    public long l18846;
+    public long l18847;
+    public long l18848;
+    public long l18849;
+    public long l18850;
+    public long l18851;
+    public long l18852;
+    public long l18853;
+    public long l18854;
+    public long l18855;
+    public long l18856;
+    public long l18857;
+    public long l18858;
+    public long l18859;
+    public long l18860;
+    public long l18861;
+    public long l18862;
+    public long l18863;
+    public long l18864;
+    public long l18865;
+    public long l18866;
+    public long l18867;
+    public long l18868;
+    public long l18869;
+    public long l18870;
+    public long l18871;
+    public long l18872;
+    public long l18873;
+    public long l18874;
+    public long l18875;
+    public long l18876;
+    public long l18877;
+    public long l18878;
+    public long l18879;
+    public long l18880;
+    public long l18881;
+    public long l18882;
+    public long l18883;
+    public long l18884;
+    public long l18885;
+    public long l18886;
+    public long l18887;
+    public long l18888;
+    public long l18889;
+    public long l18890;
+    public long l18891;
+    public long l18892;
+    public long l18893;
+    public long l18894;
+    public long l18895;
+    public long l18896;
+    public long l18897;
+    public long l18898;
+    public long l18899;
+    public long l18900;
+    public long l18901;
+    public long l18902;
+    public long l18903;
+    public long l18904;
+    public long l18905;
+    public long l18906;
+    public long l18907;
+    public long l18908;
+    public long l18909;
+    public long l18910;
+    public long l18911;
+    public long l18912;
+    public long l18913;
+    public long l18914;
+    public long l18915;
+    public long l18916;
+    public long l18917;
+    public long l18918;
+    public long l18919;
+    public long l18920;
+    public long l18921;
+    public long l18922;
+    public long l18923;
+    public long l18924;
+    public long l18925;
+    public long l18926;
+    public long l18927;
+    public long l18928;
+    public long l18929;
+    public long l18930;
+    public long l18931;
+    public long l18932;
+    public long l18933;
+    public long l18934;
+    public long l18935;
+    public long l18936;
+    public long l18937;
+    public long l18938;
+    public long l18939;
+    public long l18940;
+    public long l18941;
+    public long l18942;
+    public long l18943;
+    public long l18944;
+    public long l18945;
+    public long l18946;
+    public long l18947;
+    public long l18948;
+    public long l18949;
+    public long l18950;
+    public long l18951;
+    public long l18952;
+    public long l18953;
+    public long l18954;
+    public long l18955;
+    public long l18956;
+    public long l18957;
+    public long l18958;
+    public long l18959;
+    public long l18960;
+    public long l18961;
+    public long l18962;
+    public long l18963;
+    public long l18964;
+    public long l18965;
+    public long l18966;
+    public long l18967;
+    public long l18968;
+    public long l18969;
+    public long l18970;
+    public long l18971;
+    public long l18972;
+    public long l18973;
+    public long l18974;
+    public long l18975;
+    public long l18976;
+    public long l18977;
+    public long l18978;
+    public long l18979;
+    public long l18980;
+    public long l18981;
+    public long l18982;
+    public long l18983;
+    public long l18984;
+    public long l18985;
+    public long l18986;
+    public long l18987;
+    public long l18988;
+    public long l18989;
+    public long l18990;
+    public long l18991;
+    public long l18992;
+    public long l18993;
+    public long l18994;
+    public long l18995;
+    public long l18996;
+    public long l18997;
+    public long l18998;
+    public long l18999;
+    public long l19000;
+    public long l19001;
+    public long l19002;
+    public long l19003;
+    public long l19004;
+    public long l19005;
+    public long l19006;
+    public long l19007;
+    public long l19008;
+    public long l19009;
+    public long l19010;
+    public long l19011;
+    public long l19012;
+    public long l19013;
+    public long l19014;
+    public long l19015;
+    public long l19016;
+    public long l19017;
+    public long l19018;
+    public long l19019;
+    public long l19020;
+    public long l19021;
+    public long l19022;
+    public long l19023;
+    public long l19024;
+    public long l19025;
+    public long l19026;
+    public long l19027;
+    public long l19028;
+    public long l19029;
+    public long l19030;
+    public long l19031;
+    public long l19032;
+    public long l19033;
+    public long l19034;
+    public long l19035;
+    public long l19036;
+    public long l19037;
+    public long l19038;
+    public long l19039;
+    public long l19040;
+    public long l19041;
+    public long l19042;
+    public long l19043;
+    public long l19044;
+    public long l19045;
+    public long l19046;
+    public long l19047;
+    public long l19048;
+    public long l19049;
+    public long l19050;
+    public long l19051;
+    public long l19052;
+    public long l19053;
+    public long l19054;
+    public long l19055;
+    public long l19056;
+    public long l19057;
+    public long l19058;
+    public long l19059;
+    public long l19060;
+    public long l19061;
+    public long l19062;
+    public long l19063;
+    public long l19064;
+    public long l19065;
+    public long l19066;
+    public long l19067;
+    public long l19068;
+    public long l19069;
+    public long l19070;
+    public long l19071;
+    public long l19072;
+    public long l19073;
+    public long l19074;
+    public long l19075;
+    public long l19076;
+    public long l19077;
+    public long l19078;
+    public long l19079;
+    public long l19080;
+    public long l19081;
+    public long l19082;
+    public long l19083;
+    public long l19084;
+    public long l19085;
+    public long l19086;
+    public long l19087;
+    public long l19088;
+    public long l19089;
+    public long l19090;
+    public long l19091;
+    public long l19092;
+    public long l19093;
+    public long l19094;
+    public long l19095;
+    public long l19096;
+    public long l19097;
+    public long l19098;
+    public long l19099;
+    public long l19100;
+    public long l19101;
+    public long l19102;
+    public long l19103;
+    public long l19104;
+    public long l19105;
+    public long l19106;
+    public long l19107;
+    public long l19108;
+    public long l19109;
+    public long l19110;
+    public long l19111;
+    public long l19112;
+    public long l19113;
+    public long l19114;
+    public long l19115;
+    public long l19116;
+    public long l19117;
+    public long l19118;
+    public long l19119;
+    public long l19120;
+    public long l19121;
+    public long l19122;
+    public long l19123;
+    public long l19124;
+    public long l19125;
+    public long l19126;
+    public long l19127;
+    public long l19128;
+    public long l19129;
+    public long l19130;
+    public long l19131;
+    public long l19132;
+    public long l19133;
+    public long l19134;
+    public long l19135;
+    public long l19136;
+    public long l19137;
+    public long l19138;
+    public long l19139;
+    public long l19140;
+    public long l19141;
+    public long l19142;
+    public long l19143;
+    public long l19144;
+    public long l19145;
+    public long l19146;
+    public long l19147;
+    public long l19148;
+    public long l19149;
+    public long l19150;
+    public long l19151;
+    public long l19152;
+    public long l19153;
+    public long l19154;
+    public long l19155;
+    public long l19156;
+    public long l19157;
+    public long l19158;
+    public long l19159;
+    public long l19160;
+    public long l19161;
+    public long l19162;
+    public long l19163;
+    public long l19164;
+    public long l19165;
+    public long l19166;
+    public long l19167;
+    public long l19168;
+    public long l19169;
+    public long l19170;
+    public long l19171;
+    public long l19172;
+    public long l19173;
+    public long l19174;
+    public long l19175;
+    public long l19176;
+    public long l19177;
+    public long l19178;
+    public long l19179;
+    public long l19180;
+    public long l19181;
+    public long l19182;
+    public long l19183;
+    public long l19184;
+    public long l19185;
+    public long l19186;
+    public long l19187;
+    public long l19188;
+    public long l19189;
+    public long l19190;
+    public long l19191;
+    public long l19192;
+    public long l19193;
+    public long l19194;
+    public long l19195;
+    public long l19196;
+    public long l19197;
+    public long l19198;
+    public long l19199;
+    public long l19200;
+    public long l19201;
+    public long l19202;
+    public long l19203;
+    public long l19204;
+    public long l19205;
+    public long l19206;
+    public long l19207;
+    public long l19208;
+    public long l19209;
+    public long l19210;
+    public long l19211;
+    public long l19212;
+    public long l19213;
+    public long l19214;
+    public long l19215;
+    public long l19216;
+    public long l19217;
+    public long l19218;
+    public long l19219;
+    public long l19220;
+    public long l19221;
+    public long l19222;
+    public long l19223;
+    public long l19224;
+    public long l19225;
+    public long l19226;
+    public long l19227;
+    public long l19228;
+    public long l19229;
+    public long l19230;
+    public long l19231;
+    public long l19232;
+    public long l19233;
+    public long l19234;
+    public long l19235;
+    public long l19236;
+    public long l19237;
+    public long l19238;
+    public long l19239;
+    public long l19240;
+    public long l19241;
+    public long l19242;
+    public long l19243;
+    public long l19244;
+    public long l19245;
+    public long l19246;
+    public long l19247;
+    public long l19248;
+    public long l19249;
+    public long l19250;
+    public long l19251;
+    public long l19252;
+    public long l19253;
+    public long l19254;
+    public long l19255;
+    public long l19256;
+    public long l19257;
+    public long l19258;
+    public long l19259;
+    public long l19260;
+    public long l19261;
+    public long l19262;
+    public long l19263;
+    public long l19264;
+    public long l19265;
+    public long l19266;
+    public long l19267;
+    public long l19268;
+    public long l19269;
+    public long l19270;
+    public long l19271;
+    public long l19272;
+    public long l19273;
+    public long l19274;
+    public long l19275;
+    public long l19276;
+    public long l19277;
+    public long l19278;
+    public long l19279;
+    public long l19280;
+    public long l19281;
+    public long l19282;
+    public long l19283;
+    public long l19284;
+    public long l19285;
+    public long l19286;
+    public long l19287;
+    public long l19288;
+    public long l19289;
+    public long l19290;
+    public long l19291;
+    public long l19292;
+    public long l19293;
+    public long l19294;
+    public long l19295;
+    public long l19296;
+    public long l19297;
+    public long l19298;
+    public long l19299;
+    public long l19300;
+    public long l19301;
+    public long l19302;
+    public long l19303;
+    public long l19304;
+    public long l19305;
+    public long l19306;
+    public long l19307;
+    public long l19308;
+    public long l19309;
+    public long l19310;
+    public long l19311;
+    public long l19312;
+    public long l19313;
+    public long l19314;
+    public long l19315;
+    public long l19316;
+    public long l19317;
+    public long l19318;
+    public long l19319;
+    public long l19320;
+    public long l19321;
+    public long l19322;
+    public long l19323;
+    public long l19324;
+    public long l19325;
+    public long l19326;
+    public long l19327;
+    public long l19328;
+    public long l19329;
+    public long l19330;
+    public long l19331;
+    public long l19332;
+    public long l19333;
+    public long l19334;
+    public long l19335;
+    public long l19336;
+    public long l19337;
+    public long l19338;
+    public long l19339;
+    public long l19340;
+    public long l19341;
+    public long l19342;
+    public long l19343;
+    public long l19344;
+    public long l19345;
+    public long l19346;
+    public long l19347;
+    public long l19348;
+    public long l19349;
+    public long l19350;
+    public long l19351;
+    public long l19352;
+    public long l19353;
+    public long l19354;
+    public long l19355;
+    public long l19356;
+    public long l19357;
+    public long l19358;
+    public long l19359;
+    public long l19360;
+    public long l19361;
+    public long l19362;
+    public long l19363;
+    public long l19364;
+    public long l19365;
+    public long l19366;
+    public long l19367;
+    public long l19368;
+    public long l19369;
+    public long l19370;
+    public long l19371;
+    public long l19372;
+    public long l19373;
+    public long l19374;
+    public long l19375;
+    public long l19376;
+    public long l19377;
+    public long l19378;
+    public long l19379;
+    public long l19380;
+    public long l19381;
+    public long l19382;
+    public long l19383;
+    public long l19384;
+    public long l19385;
+    public long l19386;
+    public long l19387;
+    public long l19388;
+    public long l19389;
+    public long l19390;
+    public long l19391;
+    public long l19392;
+    public long l19393;
+    public long l19394;
+    public long l19395;
+    public long l19396;
+    public long l19397;
+    public long l19398;
+    public long l19399;
+    public long l19400;
+    public long l19401;
+    public long l19402;
+    public long l19403;
+    public long l19404;
+    public long l19405;
+    public long l19406;
+    public long l19407;
+    public long l19408;
+    public long l19409;
+    public long l19410;
+    public long l19411;
+    public long l19412;
+    public long l19413;
+    public long l19414;
+    public long l19415;
+    public long l19416;
+    public long l19417;
+    public long l19418;
+    public long l19419;
+    public long l19420;
+    public long l19421;
+    public long l19422;
+    public long l19423;
+    public long l19424;
+    public long l19425;
+    public long l19426;
+    public long l19427;
+    public long l19428;
+    public long l19429;
+    public long l19430;
+    public long l19431;
+    public long l19432;
+    public long l19433;
+    public long l19434;
+    public long l19435;
+    public long l19436;
+    public long l19437;
+    public long l19438;
+    public long l19439;
+    public long l19440;
+    public long l19441;
+    public long l19442;
+    public long l19443;
+    public long l19444;
+    public long l19445;
+    public long l19446;
+    public long l19447;
+    public long l19448;
+    public long l19449;
+    public long l19450;
+    public long l19451;
+    public long l19452;
+    public long l19453;
+    public long l19454;
+    public long l19455;
+    public long l19456;
+    public long l19457;
+    public long l19458;
+    public long l19459;
+    public long l19460;
+    public long l19461;
+    public long l19462;
+    public long l19463;
+    public long l19464;
+    public long l19465;
+    public long l19466;
+    public long l19467;
+    public long l19468;
+    public long l19469;
+    public long l19470;
+    public long l19471;
+    public long l19472;
+    public long l19473;
+    public long l19474;
+    public long l19475;
+    public long l19476;
+    public long l19477;
+    public long l19478;
+    public long l19479;
+    public long l19480;
+    public long l19481;
+    public long l19482;
+    public long l19483;
+    public long l19484;
+    public long l19485;
+    public long l19486;
+    public long l19487;
+    public long l19488;
+    public long l19489;
+    public long l19490;
+    public long l19491;
+    public long l19492;
+    public long l19493;
+    public long l19494;
+    public long l19495;
+    public long l19496;
+    public long l19497;
+    public long l19498;
+    public long l19499;
+    public long l19500;
+    public long l19501;
+    public long l19502;
+    public long l19503;
+    public long l19504;
+    public long l19505;
+    public long l19506;
+    public long l19507;
+    public long l19508;
+    public long l19509;
+    public long l19510;
+    public long l19511;
+    public long l19512;
+    public long l19513;
+    public long l19514;
+    public long l19515;
+    public long l19516;
+    public long l19517;
+    public long l19518;
+    public long l19519;
+    public long l19520;
+    public long l19521;
+    public long l19522;
+    public long l19523;
+    public long l19524;
+    public long l19525;
+    public long l19526;
+    public long l19527;
+    public long l19528;
+    public long l19529;
+    public long l19530;
+    public long l19531;
+    public long l19532;
+    public long l19533;
+    public long l19534;
+    public long l19535;
+    public long l19536;
+    public long l19537;
+    public long l19538;
+    public long l19539;
+    public long l19540;
+    public long l19541;
+    public long l19542;
+    public long l19543;
+    public long l19544;
+    public long l19545;
+    public long l19546;
+    public long l19547;
+    public long l19548;
+    public long l19549;
+    public long l19550;
+    public long l19551;
+    public long l19552;
+    public long l19553;
+    public long l19554;
+    public long l19555;
+    public long l19556;
+    public long l19557;
+    public long l19558;
+    public long l19559;
+    public long l19560;
+    public long l19561;
+    public long l19562;
+    public long l19563;
+    public long l19564;
+    public long l19565;
+    public long l19566;
+    public long l19567;
+    public long l19568;
+    public long l19569;
+    public long l19570;
+    public long l19571;
+    public long l19572;
+    public long l19573;
+    public long l19574;
+    public long l19575;
+    public long l19576;
+    public long l19577;
+    public long l19578;
+    public long l19579;
+    public long l19580;
+    public long l19581;
+    public long l19582;
+    public long l19583;
+    public long l19584;
+    public long l19585;
+    public long l19586;
+    public long l19587;
+    public long l19588;
+    public long l19589;
+    public long l19590;
+    public long l19591;
+    public long l19592;
+    public long l19593;
+    public long l19594;
+    public long l19595;
+    public long l19596;
+    public long l19597;
+    public long l19598;
+    public long l19599;
+    public long l19600;
+    public long l19601;
+    public long l19602;
+    public long l19603;
+    public long l19604;
+    public long l19605;
+    public long l19606;
+    public long l19607;
+    public long l19608;
+    public long l19609;
+    public long l19610;
+    public long l19611;
+    public long l19612;
+    public long l19613;
+    public long l19614;
+    public long l19615;
+    public long l19616;
+    public long l19617;
+    public long l19618;
+    public long l19619;
+    public long l19620;
+    public long l19621;
+    public long l19622;
+    public long l19623;
+    public long l19624;
+    public long l19625;
+    public long l19626;
+    public long l19627;
+    public long l19628;
+    public long l19629;
+    public long l19630;
+    public long l19631;
+    public long l19632;
+    public long l19633;
+    public long l19634;
+    public long l19635;
+    public long l19636;
+    public long l19637;
+    public long l19638;
+    public long l19639;
+    public long l19640;
+    public long l19641;
+    public long l19642;
+    public long l19643;
+    public long l19644;
+    public long l19645;
+    public long l19646;
+    public long l19647;
+    public long l19648;
+    public long l19649;
+    public long l19650;
+    public long l19651;
+    public long l19652;
+    public long l19653;
+    public long l19654;
+    public long l19655;
+    public long l19656;
+    public long l19657;
+    public long l19658;
+    public long l19659;
+    public long l19660;
+    public long l19661;
+    public long l19662;
+    public long l19663;
+    public long l19664;
+    public long l19665;
+    public long l19666;
+    public long l19667;
+    public long l19668;
+    public long l19669;
+    public long l19670;
+    public long l19671;
+    public long l19672;
+    public long l19673;
+    public long l19674;
+    public long l19675;
+    public long l19676;
+    public long l19677;
+    public long l19678;
+    public long l19679;
+    public long l19680;
+    public long l19681;
+    public long l19682;
+    public long l19683;
+    public long l19684;
+    public long l19685;
+    public long l19686;
+    public long l19687;
+    public long l19688;
+    public long l19689;
+    public long l19690;
+    public long l19691;
+    public long l19692;
+    public long l19693;
+    public long l19694;
+    public long l19695;
+    public long l19696;
+    public long l19697;
+    public long l19698;
+    public long l19699;
+    public long l19700;
+    public long l19701;
+    public long l19702;
+    public long l19703;
+    public long l19704;
+    public long l19705;
+    public long l19706;
+    public long l19707;
+    public long l19708;
+    public long l19709;
+    public long l19710;
+    public long l19711;
+    public long l19712;
+    public long l19713;
+    public long l19714;
+    public long l19715;
+    public long l19716;
+    public long l19717;
+    public long l19718;
+    public long l19719;
+    public long l19720;
+    public long l19721;
+    public long l19722;
+    public long l19723;
+    public long l19724;
+    public long l19725;
+    public long l19726;
+    public long l19727;
+    public long l19728;
+    public long l19729;
+    public long l19730;
+    public long l19731;
+    public long l19732;
+    public long l19733;
+    public long l19734;
+    public long l19735;
+    public long l19736;
+    public long l19737;
+    public long l19738;
+    public long l19739;
+    public long l19740;
+    public long l19741;
+    public long l19742;
+    public long l19743;
+    public long l19744;
+    public long l19745;
+    public long l19746;
+    public long l19747;
+    public long l19748;
+    public long l19749;
+    public long l19750;
+    public long l19751;
+    public long l19752;
+    public long l19753;
+    public long l19754;
+    public long l19755;
+    public long l19756;
+    public long l19757;
+    public long l19758;
+    public long l19759;
+    public long l19760;
+    public long l19761;
+    public long l19762;
+    public long l19763;
+    public long l19764;
+    public long l19765;
+    public long l19766;
+    public long l19767;
+    public long l19768;
+    public long l19769;
+    public long l19770;
+    public long l19771;
+    public long l19772;
+    public long l19773;
+    public long l19774;
+    public long l19775;
+    public long l19776;
+    public long l19777;
+    public long l19778;
+    public long l19779;
+    public long l19780;
+    public long l19781;
+    public long l19782;
+    public long l19783;
+    public long l19784;
+    public long l19785;
+    public long l19786;
+    public long l19787;
+    public long l19788;
+    public long l19789;
+    public long l19790;
+    public long l19791;
+    public long l19792;
+    public long l19793;
+    public long l19794;
+    public long l19795;
+    public long l19796;
+    public long l19797;
+    public long l19798;
+    public long l19799;
+    public long l19800;
+    public long l19801;
+    public long l19802;
+    public long l19803;
+    public long l19804;
+    public long l19805;
+    public long l19806;
+    public long l19807;
+    public long l19808;
+    public long l19809;
+    public long l19810;
+    public long l19811;
+    public long l19812;
+    public long l19813;
+    public long l19814;
+    public long l19815;
+    public long l19816;
+    public long l19817;
+    public long l19818;
+    public long l19819;
+    public long l19820;
+    public long l19821;
+    public long l19822;
+    public long l19823;
+    public long l19824;
+    public long l19825;
+    public long l19826;
+    public long l19827;
+    public long l19828;
+    public long l19829;
+    public long l19830;
+    public long l19831;
+    public long l19832;
+    public long l19833;
+    public long l19834;
+    public long l19835;
+    public long l19836;
+    public long l19837;
+    public long l19838;
+    public long l19839;
+    public long l19840;
+    public long l19841;
+    public long l19842;
+    public long l19843;
+    public long l19844;
+    public long l19845;
+    public long l19846;
+    public long l19847;
+    public long l19848;
+    public long l19849;
+    public long l19850;
+    public long l19851;
+    public long l19852;
+    public long l19853;
+    public long l19854;
+    public long l19855;
+    public long l19856;
+    public long l19857;
+    public long l19858;
+    public long l19859;
+    public long l19860;
+    public long l19861;
+    public long l19862;
+    public long l19863;
+    public long l19864;
+    public long l19865;
+    public long l19866;
+    public long l19867;
+    public long l19868;
+    public long l19869;
+    public long l19870;
+    public long l19871;
+    public long l19872;
+    public long l19873;
+    public long l19874;
+    public long l19875;
+    public long l19876;
+    public long l19877;
+    public long l19878;
+    public long l19879;
+    public long l19880;
+    public long l19881;
+    public long l19882;
+    public long l19883;
+    public long l19884;
+    public long l19885;
+    public long l19886;
+    public long l19887;
+    public long l19888;
+    public long l19889;
+    public long l19890;
+    public long l19891;
+    public long l19892;
+    public long l19893;
+    public long l19894;
+    public long l19895;
+    public long l19896;
+    public long l19897;
+    public long l19898;
+    public long l19899;
+    public long l19900;
+    public long l19901;
+    public long l19902;
+    public long l19903;
+    public long l19904;
+    public long l19905;
+    public long l19906;
+    public long l19907;
+    public long l19908;
+    public long l19909;
+    public long l19910;
+    public long l19911;
+    public long l19912;
+    public long l19913;
+    public long l19914;
+    public long l19915;
+    public long l19916;
+    public long l19917;
+    public long l19918;
+    public long l19919;
+    public long l19920;
+    public long l19921;
+    public long l19922;
+    public long l19923;
+    public long l19924;
+    public long l19925;
+    public long l19926;
+    public long l19927;
+    public long l19928;
+    public long l19929;
+    public long l19930;
+    public long l19931;
+    public long l19932;
+    public long l19933;
+    public long l19934;
+    public long l19935;
+    public long l19936;
+    public long l19937;
+    public long l19938;
+    public long l19939;
+    public long l19940;
+    public long l19941;
+    public long l19942;
+    public long l19943;
+    public long l19944;
+    public long l19945;
+    public long l19946;
+    public long l19947;
+    public long l19948;
+    public long l19949;
+    public long l19950;
+    public long l19951;
+    public long l19952;
+    public long l19953;
+    public long l19954;
+    public long l19955;
+    public long l19956;
+    public long l19957;
+    public long l19958;
+    public long l19959;
+    public long l19960;
+    public long l19961;
+    public long l19962;
+    public long l19963;
+    public long l19964;
+    public long l19965;
+    public long l19966;
+    public long l19967;
+    public long l19968;
+    public long l19969;
+    public long l19970;
+    public long l19971;
+    public long l19972;
+    public long l19973;
+    public long l19974;
+    public long l19975;
+    public long l19976;
+    public long l19977;
+    public long l19978;
+    public long l19979;
+    public long l19980;
+    public long l19981;
+    public long l19982;
+    public long l19983;
+    public long l19984;
+    public long l19985;
+    public long l19986;
+    public long l19987;
+    public long l19988;
+    public long l19989;
+    public long l19990;
+    public long l19991;
+    public long l19992;
+    public long l19993;
+    public long l19994;
+    public long l19995;
+    public long l19996;
+    public long l19997;
+    public long l19998;
+    public long l19999;
+    public long l20000;
+    public long l20001;
+    public long l20002;
+    public long l20003;
+    public long l20004;
+    public long l20005;
+    public long l20006;
+    public long l20007;
+    public long l20008;
+    public long l20009;
+    public long l20010;
+    public long l20011;
+    public long l20012;
+    public long l20013;
+    public long l20014;
+    public long l20015;
+    public long l20016;
+    public long l20017;
+    public long l20018;
+    public long l20019;
+    public long l20020;
+    public long l20021;
+    public long l20022;
+    public long l20023;
+    public long l20024;
+    public long l20025;
+    public long l20026;
+    public long l20027;
+    public long l20028;
+    public long l20029;
+    public long l20030;
+    public long l20031;
+    public long l20032;
+    public long l20033;
+    public long l20034;
+    public long l20035;
+    public long l20036;
+    public long l20037;
+    public long l20038;
+    public long l20039;
+    public long l20040;
+    public long l20041;
+    public long l20042;
+    public long l20043;
+    public long l20044;
+    public long l20045;
+    public long l20046;
+    public long l20047;
+    public long l20048;
+    public long l20049;
+    public long l20050;
+    public long l20051;
+    public long l20052;
+    public long l20053;
+    public long l20054;
+    public long l20055;
+    public long l20056;
+    public long l20057;
+    public long l20058;
+    public long l20059;
+    public long l20060;
+    public long l20061;
+    public long l20062;
+    public long l20063;
+    public long l20064;
+    public long l20065;
+    public long l20066;
+    public long l20067;
+    public long l20068;
+    public long l20069;
+    public long l20070;
+    public long l20071;
+    public long l20072;
+    public long l20073;
+    public long l20074;
+    public long l20075;
+    public long l20076;
+    public long l20077;
+    public long l20078;
+    public long l20079;
+    public long l20080;
+    public long l20081;
+    public long l20082;
+    public long l20083;
+    public long l20084;
+    public long l20085;
+    public long l20086;
+    public long l20087;
+    public long l20088;
+    public long l20089;
+    public long l20090;
+    public long l20091;
+    public long l20092;
+    public long l20093;
+    public long l20094;
+    public long l20095;
+    public long l20096;
+    public long l20097;
+    public long l20098;
+    public long l20099;
+    public long l20100;
+    public long l20101;
+    public long l20102;
+    public long l20103;
+    public long l20104;
+    public long l20105;
+    public long l20106;
+    public long l20107;
+    public long l20108;
+    public long l20109;
+    public long l20110;
+    public long l20111;
+    public long l20112;
+    public long l20113;
+    public long l20114;
+    public long l20115;
+    public long l20116;
+    public long l20117;
+    public long l20118;
+    public long l20119;
+    public long l20120;
+    public long l20121;
+    public long l20122;
+    public long l20123;
+    public long l20124;
+    public long l20125;
+    public long l20126;
+    public long l20127;
+    public long l20128;
+    public long l20129;
+    public long l20130;
+    public long l20131;
+    public long l20132;
+    public long l20133;
+    public long l20134;
+    public long l20135;
+    public long l20136;
+    public long l20137;
+    public long l20138;
+    public long l20139;
+    public long l20140;
+    public long l20141;
+    public long l20142;
+    public long l20143;
+    public long l20144;
+    public long l20145;
+    public long l20146;
+    public long l20147;
+    public long l20148;
+    public long l20149;
+    public long l20150;
+    public long l20151;
+    public long l20152;
+    public long l20153;
+    public long l20154;
+    public long l20155;
+    public long l20156;
+    public long l20157;
+    public long l20158;
+    public long l20159;
+    public long l20160;
+    public long l20161;
+    public long l20162;
+    public long l20163;
+    public long l20164;
+    public long l20165;
+    public long l20166;
+    public long l20167;
+    public long l20168;
+    public long l20169;
+    public long l20170;
+    public long l20171;
+    public long l20172;
+    public long l20173;
+    public long l20174;
+    public long l20175;
+    public long l20176;
+    public long l20177;
+    public long l20178;
+    public long l20179;
+    public long l20180;
+    public long l20181;
+    public long l20182;
+    public long l20183;
+    public long l20184;
+    public long l20185;
+    public long l20186;
+    public long l20187;
+    public long l20188;
+    public long l20189;
+    public long l20190;
+    public long l20191;
+    public long l20192;
+    public long l20193;
+    public long l20194;
+    public long l20195;
+    public long l20196;
+    public long l20197;
+    public long l20198;
+    public long l20199;
+    public long l20200;
+    public long l20201;
+    public long l20202;
+    public long l20203;
+    public long l20204;
+    public long l20205;
+    public long l20206;
+    public long l20207;
+    public long l20208;
+    public long l20209;
+    public long l20210;
+    public long l20211;
+    public long l20212;
+    public long l20213;
+    public long l20214;
+    public long l20215;
+    public long l20216;
+    public long l20217;
+    public long l20218;
+    public long l20219;
+    public long l20220;
+    public long l20221;
+    public long l20222;
+    public long l20223;
+    public long l20224;
+    public long l20225;
+    public long l20226;
+    public long l20227;
+    public long l20228;
+    public long l20229;
+    public long l20230;
+    public long l20231;
+    public long l20232;
+    public long l20233;
+    public long l20234;
+    public long l20235;
+    public long l20236;
+    public long l20237;
+    public long l20238;
+    public long l20239;
+    public long l20240;
+    public long l20241;
+    public long l20242;
+    public long l20243;
+    public long l20244;
+    public long l20245;
+    public long l20246;
+    public long l20247;
+    public long l20248;
+    public long l20249;
+    public long l20250;
+    public long l20251;
+    public long l20252;
+    public long l20253;
+    public long l20254;
+    public long l20255;
+    public long l20256;
+    public long l20257;
+    public long l20258;
+    public long l20259;
+    public long l20260;
+    public long l20261;
+    public long l20262;
+    public long l20263;
+    public long l20264;
+    public long l20265;
+    public long l20266;
+    public long l20267;
+    public long l20268;
+    public long l20269;
+    public long l20270;
+    public long l20271;
+    public long l20272;
+    public long l20273;
+    public long l20274;
+    public long l20275;
+    public long l20276;
+    public long l20277;
+    public long l20278;
+    public long l20279;
+    public long l20280;
+    public long l20281;
+    public long l20282;
+    public long l20283;
+    public long l20284;
+    public long l20285;
+    public long l20286;
+    public long l20287;
+    public long l20288;
+    public long l20289;
+    public long l20290;
+    public long l20291;
+    public long l20292;
+    public long l20293;
+    public long l20294;
+    public long l20295;
+    public long l20296;
+    public long l20297;
+    public long l20298;
+    public long l20299;
+    public long l20300;
+    public long l20301;
+    public long l20302;
+    public long l20303;
+    public long l20304;
+    public long l20305;
+    public long l20306;
+    public long l20307;
+    public long l20308;
+    public long l20309;
+    public long l20310;
+    public long l20311;
+    public long l20312;
+    public long l20313;
+    public long l20314;
+    public long l20315;
+    public long l20316;
+    public long l20317;
+    public long l20318;
+    public long l20319;
+    public long l20320;
+    public long l20321;
+    public long l20322;
+    public long l20323;
+    public long l20324;
+    public long l20325;
+    public long l20326;
+    public long l20327;
+    public long l20328;
+    public long l20329;
+    public long l20330;
+    public long l20331;
+    public long l20332;
+    public long l20333;
+    public long l20334;
+    public long l20335;
+    public long l20336;
+    public long l20337;
+    public long l20338;
+    public long l20339;
+    public long l20340;
+    public long l20341;
+    public long l20342;
+    public long l20343;
+    public long l20344;
+    public long l20345;
+    public long l20346;
+    public long l20347;
+    public long l20348;
+    public long l20349;
+    public long l20350;
+    public long l20351;
+    public long l20352;
+    public long l20353;
+    public long l20354;
+    public long l20355;
+    public long l20356;
+    public long l20357;
+    public long l20358;
+    public long l20359;
+    public long l20360;
+    public long l20361;
+    public long l20362;
+    public long l20363;
+    public long l20364;
+    public long l20365;
+    public long l20366;
+    public long l20367;
+    public long l20368;
+    public long l20369;
+    public long l20370;
+    public long l20371;
+    public long l20372;
+    public long l20373;
+    public long l20374;
+    public long l20375;
+    public long l20376;
+    public long l20377;
+    public long l20378;
+    public long l20379;
+    public long l20380;
+    public long l20381;
+    public long l20382;
+    public long l20383;
+    public long l20384;
+    public long l20385;
+    public long l20386;
+    public long l20387;
+    public long l20388;
+    public long l20389;
+    public long l20390;
+    public long l20391;
+    public long l20392;
+    public long l20393;
+    public long l20394;
+    public long l20395;
+    public long l20396;
+    public long l20397;
+    public long l20398;
+    public long l20399;
+    public long l20400;
+    public long l20401;
+    public long l20402;
+    public long l20403;
+    public long l20404;
+    public long l20405;
+    public long l20406;
+    public long l20407;
+    public long l20408;
+    public long l20409;
+    public long l20410;
+    public long l20411;
+    public long l20412;
+    public long l20413;
+    public long l20414;
+    public long l20415;
+    public long l20416;
+    public long l20417;
+    public long l20418;
+    public long l20419;
+    public long l20420;
+    public long l20421;
+    public long l20422;
+    public long l20423;
+    public long l20424;
+    public long l20425;
+    public long l20426;
+    public long l20427;
+    public long l20428;
+    public long l20429;
+    public long l20430;
+    public long l20431;
+    public long l20432;
+    public long l20433;
+    public long l20434;
+    public long l20435;
+    public long l20436;
+    public long l20437;
+    public long l20438;
+    public long l20439;
+    public long l20440;
+    public long l20441;
+    public long l20442;
+    public long l20443;
+    public long l20444;
+    public long l20445;
+    public long l20446;
+    public long l20447;
+    public long l20448;
+    public long l20449;
+    public long l20450;
+    public long l20451;
+    public long l20452;
+    public long l20453;
+    public long l20454;
+    public long l20455;
+    public long l20456;
+    public long l20457;
+    public long l20458;
+    public long l20459;
+    public long l20460;
+    public long l20461;
+    public long l20462;
+    public long l20463;
+    public long l20464;
+    public long l20465;
+    public long l20466;
+    public long l20467;
+    public long l20468;
+    public long l20469;
+    public long l20470;
+    public long l20471;
+    public long l20472;
+    public long l20473;
+    public long l20474;
+    public long l20475;
+    public long l20476;
+    public long l20477;
+    public long l20478;
+    public long l20479;
+    public long l20480;
+    public long l20481;
+    public long l20482;
+    public long l20483;
+    public long l20484;
+    public long l20485;
+    public long l20486;
+    public long l20487;
+    public long l20488;
+    public long l20489;
+    public long l20490;
+    public long l20491;
+    public long l20492;
+    public long l20493;
+    public long l20494;
+    public long l20495;
+    public long l20496;
+    public long l20497;
+    public long l20498;
+    public long l20499;
+    public long l20500;
+    public long l20501;
+    public long l20502;
+    public long l20503;
+    public long l20504;
+    public long l20505;
+    public long l20506;
+    public long l20507;
+    public long l20508;
+    public long l20509;
+    public long l20510;
+    public long l20511;
+    public long l20512;
+    public long l20513;
+    public long l20514;
+    public long l20515;
+    public long l20516;
+    public long l20517;
+    public long l20518;
+    public long l20519;
+    public long l20520;
+    public long l20521;
+    public long l20522;
+    public long l20523;
+    public long l20524;
+    public long l20525;
+    public long l20526;
+    public long l20527;
+    public long l20528;
+    public long l20529;
+    public long l20530;
+    public long l20531;
+    public long l20532;
+    public long l20533;
+    public long l20534;
+    public long l20535;
+    public long l20536;
+    public long l20537;
+    public long l20538;
+    public long l20539;
+    public long l20540;
+    public long l20541;
+    public long l20542;
+    public long l20543;
+    public long l20544;
+    public long l20545;
+    public long l20546;
+    public long l20547;
+    public long l20548;
+    public long l20549;
+    public long l20550;
+    public long l20551;
+    public long l20552;
+    public long l20553;
+    public long l20554;
+    public long l20555;
+    public long l20556;
+    public long l20557;
+    public long l20558;
+    public long l20559;
+    public long l20560;
+    public long l20561;
+    public long l20562;
+    public long l20563;
+    public long l20564;
+    public long l20565;
+    public long l20566;
+    public long l20567;
+    public long l20568;
+    public long l20569;
+    public long l20570;
+    public long l20571;
+    public long l20572;
+    public long l20573;
+    public long l20574;
+    public long l20575;
+    public long l20576;
+    public long l20577;
+    public long l20578;
+    public long l20579;
+    public long l20580;
+    public long l20581;
+    public long l20582;
+    public long l20583;
+    public long l20584;
+    public long l20585;
+    public long l20586;
+    public long l20587;
+    public long l20588;
+    public long l20589;
+    public long l20590;
+    public long l20591;
+    public long l20592;
+    public long l20593;
+    public long l20594;
+    public long l20595;
+    public long l20596;
+    public long l20597;
+    public long l20598;
+    public long l20599;
+    public long l20600;
+    public long l20601;
+    public long l20602;
+    public long l20603;
+    public long l20604;
+    public long l20605;
+    public long l20606;
+    public long l20607;
+    public long l20608;
+    public long l20609;
+    public long l20610;
+    public long l20611;
+    public long l20612;
+    public long l20613;
+    public long l20614;
+    public long l20615;
+    public long l20616;
+    public long l20617;
+    public long l20618;
+    public long l20619;
+    public long l20620;
+    public long l20621;
+    public long l20622;
+    public long l20623;
+    public long l20624;
+    public long l20625;
+    public long l20626;
+    public long l20627;
+    public long l20628;
+    public long l20629;
+    public long l20630;
+    public long l20631;
+    public long l20632;
+    public long l20633;
+    public long l20634;
+    public long l20635;
+    public long l20636;
+    public long l20637;
+    public long l20638;
+    public long l20639;
+    public long l20640;
+    public long l20641;
+    public long l20642;
+    public long l20643;
+    public long l20644;
+    public long l20645;
+    public long l20646;
+    public long l20647;
+    public long l20648;
+    public long l20649;
+    public long l20650;
+    public long l20651;
+    public long l20652;
+    public long l20653;
+    public long l20654;
+    public long l20655;
+    public long l20656;
+    public long l20657;
+    public long l20658;
+    public long l20659;
+    public long l20660;
+    public long l20661;
+    public long l20662;
+    public long l20663;
+    public long l20664;
+    public long l20665;
+    public long l20666;
+    public long l20667;
+    public long l20668;
+    public long l20669;
+    public long l20670;
+    public long l20671;
+    public long l20672;
+    public long l20673;
+    public long l20674;
+    public long l20675;
+    public long l20676;
+    public long l20677;
+    public long l20678;
+    public long l20679;
+    public long l20680;
+    public long l20681;
+    public long l20682;
+    public long l20683;
+    public long l20684;
+    public long l20685;
+    public long l20686;
+    public long l20687;
+    public long l20688;
+    public long l20689;
+    public long l20690;
+    public long l20691;
+    public long l20692;
+    public long l20693;
+    public long l20694;
+    public long l20695;
+    public long l20696;
+    public long l20697;
+    public long l20698;
+    public long l20699;
+    public long l20700;
+    public long l20701;
+    public long l20702;
+    public long l20703;
+    public long l20704;
+    public long l20705;
+    public long l20706;
+    public long l20707;
+    public long l20708;
+    public long l20709;
+    public long l20710;
+    public long l20711;
+    public long l20712;
+    public long l20713;
+    public long l20714;
+    public long l20715;
+    public long l20716;
+    public long l20717;
+    public long l20718;
+    public long l20719;
+    public long l20720;
+    public long l20721;
+    public long l20722;
+    public long l20723;
+    public long l20724;
+    public long l20725;
+    public long l20726;
+    public long l20727;
+    public long l20728;
+    public long l20729;
+    public long l20730;
+    public long l20731;
+    public long l20732;
+    public long l20733;
+    public long l20734;
+    public long l20735;
+    public long l20736;
+    public long l20737;
+    public long l20738;
+    public long l20739;
+    public long l20740;
+    public long l20741;
+    public long l20742;
+    public long l20743;
+    public long l20744;
+    public long l20745;
+    public long l20746;
+    public long l20747;
+    public long l20748;
+    public long l20749;
+    public long l20750;
+    public long l20751;
+    public long l20752;
+    public long l20753;
+    public long l20754;
+    public long l20755;
+    public long l20756;
+    public long l20757;
+    public long l20758;
+    public long l20759;
+    public long l20760;
+    public long l20761;
+    public long l20762;
+    public long l20763;
+    public long l20764;
+    public long l20765;
+    public long l20766;
+    public long l20767;
+    public long l20768;
+    public long l20769;
+    public long l20770;
+    public long l20771;
+    public long l20772;
+    public long l20773;
+    public long l20774;
+    public long l20775;
+    public long l20776;
+    public long l20777;
+    public long l20778;
+    public long l20779;
+    public long l20780;
+    public long l20781;
+    public long l20782;
+    public long l20783;
+    public long l20784;
+    public long l20785;
+    public long l20786;
+    public long l20787;
+    public long l20788;
+    public long l20789;
+    public long l20790;
+    public long l20791;
+    public long l20792;
+    public long l20793;
+    public long l20794;
+    public long l20795;
+    public long l20796;
+    public long l20797;
+    public long l20798;
+    public long l20799;
+    public long l20800;
+    public long l20801;
+    public long l20802;
+    public long l20803;
+    public long l20804;
+    public long l20805;
+    public long l20806;
+    public long l20807;
+    public long l20808;
+    public long l20809;
+    public long l20810;
+    public long l20811;
+    public long l20812;
+    public long l20813;
+    public long l20814;
+    public long l20815;
+    public long l20816;
+    public long l20817;
+    public long l20818;
+    public long l20819;
+    public long l20820;
+    public long l20821;
+    public long l20822;
+    public long l20823;
+    public long l20824;
+    public long l20825;
+    public long l20826;
+    public long l20827;
+    public long l20828;
+    public long l20829;
+    public long l20830;
+    public long l20831;
+    public long l20832;
+    public long l20833;
+    public long l20834;
+    public long l20835;
+    public long l20836;
+    public long l20837;
+    public long l20838;
+    public long l20839;
+    public long l20840;
+    public long l20841;
+    public long l20842;
+    public long l20843;
+    public long l20844;
+    public long l20845;
+    public long l20846;
+    public long l20847;
+    public long l20848;
+    public long l20849;
+    public long l20850;
+    public long l20851;
+    public long l20852;
+    public long l20853;
+    public long l20854;
+    public long l20855;
+    public long l20856;
+    public long l20857;
+    public long l20858;
+    public long l20859;
+    public long l20860;
+    public long l20861;
+    public long l20862;
+    public long l20863;
+    public long l20864;
+    public long l20865;
+    public long l20866;
+    public long l20867;
+    public long l20868;
+    public long l20869;
+    public long l20870;
+    public long l20871;
+    public long l20872;
+    public long l20873;
+    public long l20874;
+    public long l20875;
+    public long l20876;
+    public long l20877;
+    public long l20878;
+    public long l20879;
+    public long l20880;
+    public long l20881;
+    public long l20882;
+    public long l20883;
+    public long l20884;
+    public long l20885;
+    public long l20886;
+    public long l20887;
+    public long l20888;
+    public long l20889;
+    public long l20890;
+    public long l20891;
+    public long l20892;
+    public long l20893;
+    public long l20894;
+    public long l20895;
+    public long l20896;
+    public long l20897;
+    public long l20898;
+    public long l20899;
+    public long l20900;
+    public long l20901;
+    public long l20902;
+    public long l20903;
+    public long l20904;
+    public long l20905;
+    public long l20906;
+    public long l20907;
+    public long l20908;
+    public long l20909;
+    public long l20910;
+    public long l20911;
+    public long l20912;
+    public long l20913;
+    public long l20914;
+    public long l20915;
+    public long l20916;
+    public long l20917;
+    public long l20918;
+    public long l20919;
+    public long l20920;
+    public long l20921;
+    public long l20922;
+    public long l20923;
+    public long l20924;
+    public long l20925;
+    public long l20926;
+    public long l20927;
+    public long l20928;
+    public long l20929;
+    public long l20930;
+    public long l20931;
+    public long l20932;
+    public long l20933;
+    public long l20934;
+    public long l20935;
+    public long l20936;
+    public long l20937;
+    public long l20938;
+    public long l20939;
+    public long l20940;
+    public long l20941;
+    public long l20942;
+    public long l20943;
+    public long l20944;
+    public long l20945;
+    public long l20946;
+    public long l20947;
+    public long l20948;
+    public long l20949;
+    public long l20950;
+    public long l20951;
+    public long l20952;
+    public long l20953;
+    public long l20954;
+    public long l20955;
+    public long l20956;
+    public long l20957;
+    public long l20958;
+    public long l20959;
+    public long l20960;
+    public long l20961;
+    public long l20962;
+    public long l20963;
+    public long l20964;
+    public long l20965;
+    public long l20966;
+    public long l20967;
+    public long l20968;
+    public long l20969;
+    public long l20970;
+    public long l20971;
+    public long l20972;
+    public long l20973;
+    public long l20974;
+    public long l20975;
+    public long l20976;
+    public long l20977;
+    public long l20978;
+    public long l20979;
+    public long l20980;
+    public long l20981;
+    public long l20982;
+    public long l20983;
+    public long l20984;
+    public long l20985;
+    public long l20986;
+    public long l20987;
+    public long l20988;
+    public long l20989;
+    public long l20990;
+    public long l20991;
+    public long l20992;
+    public long l20993;
+    public long l20994;
+    public long l20995;
+    public long l20996;
+    public long l20997;
+    public long l20998;
+    public long l20999;
+    public long l21000;
+    public long l21001;
+    public long l21002;
+    public long l21003;
+    public long l21004;
+    public long l21005;
+    public long l21006;
+    public long l21007;
+    public long l21008;
+    public long l21009;
+    public long l21010;
+    public long l21011;
+    public long l21012;
+    public long l21013;
+    public long l21014;
+    public long l21015;
+    public long l21016;
+    public long l21017;
+    public long l21018;
+    public long l21019;
+    public long l21020;
+    public long l21021;
+    public long l21022;
+    public long l21023;
+    public long l21024;
+    public long l21025;
+    public long l21026;
+    public long l21027;
+    public long l21028;
+    public long l21029;
+    public long l21030;
+    public long l21031;
+    public long l21032;
+    public long l21033;
+    public long l21034;
+    public long l21035;
+    public long l21036;
+    public long l21037;
+    public long l21038;
+    public long l21039;
+    public long l21040;
+    public long l21041;
+    public long l21042;
+    public long l21043;
+    public long l21044;
+    public long l21045;
+    public long l21046;
+    public long l21047;
+    public long l21048;
+    public long l21049;
+    public long l21050;
+    public long l21051;
+    public long l21052;
+    public long l21053;
+    public long l21054;
+    public long l21055;
+    public long l21056;
+    public long l21057;
+    public long l21058;
+    public long l21059;
+    public long l21060;
+    public long l21061;
+    public long l21062;
+    public long l21063;
+    public long l21064;
+    public long l21065;
+    public long l21066;
+    public long l21067;
+    public long l21068;
+    public long l21069;
+    public long l21070;
+    public long l21071;
+    public long l21072;
+    public long l21073;
+    public long l21074;
+    public long l21075;
+    public long l21076;
+    public long l21077;
+    public long l21078;
+    public long l21079;
+    public long l21080;
+    public long l21081;
+    public long l21082;
+    public long l21083;
+    public long l21084;
+    public long l21085;
+    public long l21086;
+    public long l21087;
+    public long l21088;
+    public long l21089;
+    public long l21090;
+    public long l21091;
+    public long l21092;
+    public long l21093;
+    public long l21094;
+    public long l21095;
+    public long l21096;
+    public long l21097;
+    public long l21098;
+    public long l21099;
+    public long l21100;
+    public long l21101;
+    public long l21102;
+    public long l21103;
+    public long l21104;
+    public long l21105;
+    public long l21106;
+    public long l21107;
+    public long l21108;
+    public long l21109;
+    public long l21110;
+    public long l21111;
+    public long l21112;
+    public long l21113;
+    public long l21114;
+    public long l21115;
+    public long l21116;
+    public long l21117;
+    public long l21118;
+    public long l21119;
+    public long l21120;
+    public long l21121;
+    public long l21122;
+    public long l21123;
+    public long l21124;
+    public long l21125;
+    public long l21126;
+    public long l21127;
+    public long l21128;
+    public long l21129;
+    public long l21130;
+    public long l21131;
+    public long l21132;
+    public long l21133;
+    public long l21134;
+    public long l21135;
+    public long l21136;
+    public long l21137;
+    public long l21138;
+    public long l21139;
+    public long l21140;
+    public long l21141;
+    public long l21142;
+    public long l21143;
+    public long l21144;
+    public long l21145;
+    public long l21146;
+    public long l21147;
+    public long l21148;
+    public long l21149;
+    public long l21150;
+    public long l21151;
+    public long l21152;
+    public long l21153;
+    public long l21154;
+    public long l21155;
+    public long l21156;
+    public long l21157;
+    public long l21158;
+    public long l21159;
+    public long l21160;
+    public long l21161;
+    public long l21162;
+    public long l21163;
+    public long l21164;
+    public long l21165;
+    public long l21166;
+    public long l21167;
+    public long l21168;
+    public long l21169;
+    public long l21170;
+    public long l21171;
+    public long l21172;
+    public long l21173;
+    public long l21174;
+    public long l21175;
+    public long l21176;
+    public long l21177;
+    public long l21178;
+    public long l21179;
+    public long l21180;
+    public long l21181;
+    public long l21182;
+    public long l21183;
+    public long l21184;
+    public long l21185;
+    public long l21186;
+    public long l21187;
+    public long l21188;
+    public long l21189;
+    public long l21190;
+    public long l21191;
+    public long l21192;
+    public long l21193;
+    public long l21194;
+    public long l21195;
+    public long l21196;
+    public long l21197;
+    public long l21198;
+    public long l21199;
+    public long l21200;
+    public long l21201;
+    public long l21202;
+    public long l21203;
+    public long l21204;
+    public long l21205;
+    public long l21206;
+    public long l21207;
+    public long l21208;
+    public long l21209;
+    public long l21210;
+    public long l21211;
+    public long l21212;
+    public long l21213;
+    public long l21214;
+    public long l21215;
+    public long l21216;
+    public long l21217;
+    public long l21218;
+    public long l21219;
+    public long l21220;
+    public long l21221;
+    public long l21222;
+    public long l21223;
+    public long l21224;
+    public long l21225;
+    public long l21226;
+    public long l21227;
+    public long l21228;
+    public long l21229;
+    public long l21230;
+    public long l21231;
+    public long l21232;
+    public long l21233;
+    public long l21234;
+    public long l21235;
+    public long l21236;
+    public long l21237;
+    public long l21238;
+    public long l21239;
+    public long l21240;
+    public long l21241;
+    public long l21242;
+    public long l21243;
+    public long l21244;
+    public long l21245;
+    public long l21246;
+    public long l21247;
+    public long l21248;
+    public long l21249;
+    public long l21250;
+    public long l21251;
+    public long l21252;
+    public long l21253;
+    public long l21254;
+    public long l21255;
+    public long l21256;
+    public long l21257;
+    public long l21258;
+    public long l21259;
+    public long l21260;
+    public long l21261;
+    public long l21262;
+    public long l21263;
+    public long l21264;
+    public long l21265;
+    public long l21266;
+    public long l21267;
+    public long l21268;
+    public long l21269;
+    public long l21270;
+    public long l21271;
+    public long l21272;
+    public long l21273;
+    public long l21274;
+    public long l21275;
+    public long l21276;
+    public long l21277;
+    public long l21278;
+    public long l21279;
+    public long l21280;
+    public long l21281;
+    public long l21282;
+    public long l21283;
+    public long l21284;
+    public long l21285;
+    public long l21286;
+    public long l21287;
+    public long l21288;
+    public long l21289;
+    public long l21290;
+    public long l21291;
+    public long l21292;
+    public long l21293;
+    public long l21294;
+    public long l21295;
+    public long l21296;
+    public long l21297;
+    public long l21298;
+    public long l21299;
+    public long l21300;
+    public long l21301;
+    public long l21302;
+    public long l21303;
+    public long l21304;
+    public long l21305;
+    public long l21306;
+    public long l21307;
+    public long l21308;
+    public long l21309;
+    public long l21310;
+    public long l21311;
+    public long l21312;
+    public long l21313;
+    public long l21314;
+    public long l21315;
+    public long l21316;
+    public long l21317;
+    public long l21318;
+    public long l21319;
+    public long l21320;
+    public long l21321;
+    public long l21322;
+    public long l21323;
+    public long l21324;
+    public long l21325;
+    public long l21326;
+    public long l21327;
+    public long l21328;
+    public long l21329;
+    public long l21330;
+    public long l21331;
+    public long l21332;
+    public long l21333;
+    public long l21334;
+    public long l21335;
+    public long l21336;
+    public long l21337;
+    public long l21338;
+    public long l21339;
+    public long l21340;
+    public long l21341;
+    public long l21342;
+    public long l21343;
+    public long l21344;
+    public long l21345;
+    public long l21346;
+    public long l21347;
+    public long l21348;
+    public long l21349;
+    public long l21350;
+    public long l21351;
+    public long l21352;
+    public long l21353;
+    public long l21354;
+    public long l21355;
+    public long l21356;
+    public long l21357;
+    public long l21358;
+    public long l21359;
+    public long l21360;
+    public long l21361;
+    public long l21362;
+    public long l21363;
+    public long l21364;
+    public long l21365;
+    public long l21366;
+    public long l21367;
+    public long l21368;
+    public long l21369;
+    public long l21370;
+    public long l21371;
+    public long l21372;
+    public long l21373;
+    public long l21374;
+    public long l21375;
+    public long l21376;
+    public long l21377;
+    public long l21378;
+    public long l21379;
+    public long l21380;
+    public long l21381;
+    public long l21382;
+    public long l21383;
+    public long l21384;
+    public long l21385;
+    public long l21386;
+    public long l21387;
+    public long l21388;
+    public long l21389;
+    public long l21390;
+    public long l21391;
+    public long l21392;
+    public long l21393;
+    public long l21394;
+    public long l21395;
+    public long l21396;
+    public long l21397;
+    public long l21398;
+    public long l21399;
+    public long l21400;
+    public long l21401;
+    public long l21402;
+    public long l21403;
+    public long l21404;
+    public long l21405;
+    public long l21406;
+    public long l21407;
+    public long l21408;
+    public long l21409;
+    public long l21410;
+    public long l21411;
+    public long l21412;
+    public long l21413;
+    public long l21414;
+    public long l21415;
+    public long l21416;
+    public long l21417;
+    public long l21418;
+    public long l21419;
+    public long l21420;
+    public long l21421;
+    public long l21422;
+    public long l21423;
+    public long l21424;
+    public long l21425;
+    public long l21426;
+    public long l21427;
+    public long l21428;
+    public long l21429;
+    public long l21430;
+    public long l21431;
+    public long l21432;
+    public long l21433;
+    public long l21434;
+    public long l21435;
+    public long l21436;
+    public long l21437;
+    public long l21438;
+    public long l21439;
+    public long l21440;
+    public long l21441;
+    public long l21442;
+    public long l21443;
+    public long l21444;
+    public long l21445;
+    public long l21446;
+    public long l21447;
+    public long l21448;
+    public long l21449;
+    public long l21450;
+    public long l21451;
+    public long l21452;
+    public long l21453;
+    public long l21454;
+    public long l21455;
+    public long l21456;
+    public long l21457;
+    public long l21458;
+    public long l21459;
+    public long l21460;
+    public long l21461;
+    public long l21462;
+    public long l21463;
+    public long l21464;
+    public long l21465;
+    public long l21466;
+    public long l21467;
+    public long l21468;
+    public long l21469;
+    public long l21470;
+    public long l21471;
+    public long l21472;
+    public long l21473;
+    public long l21474;
+    public long l21475;
+    public long l21476;
+    public long l21477;
+    public long l21478;
+    public long l21479;
+    public long l21480;
+    public long l21481;
+    public long l21482;
+    public long l21483;
+    public long l21484;
+    public long l21485;
+    public long l21486;
+    public long l21487;
+    public long l21488;
+    public long l21489;
+    public long l21490;
+    public long l21491;
+    public long l21492;
+    public long l21493;
+    public long l21494;
+    public long l21495;
+    public long l21496;
+    public long l21497;
+    public long l21498;
+    public long l21499;
+    public long l21500;
+    public long l21501;
+    public long l21502;
+    public long l21503;
+    public long l21504;
+    public long l21505;
+    public long l21506;
+    public long l21507;
+    public long l21508;
+    public long l21509;
+    public long l21510;
+    public long l21511;
+    public long l21512;
+    public long l21513;
+    public long l21514;
+    public long l21515;
+    public long l21516;
+    public long l21517;
+    public long l21518;
+    public long l21519;
+    public long l21520;
+    public long l21521;
+    public long l21522;
+    public long l21523;
+    public long l21524;
+    public long l21525;
+    public long l21526;
+    public long l21527;
+    public long l21528;
+    public long l21529;
+    public long l21530;
+    public long l21531;
+    public long l21532;
+    public long l21533;
+    public long l21534;
+    public long l21535;
+    public long l21536;
+    public long l21537;
+    public long l21538;
+    public long l21539;
+    public long l21540;
+    public long l21541;
+    public long l21542;
+    public long l21543;
+    public long l21544;
+    public long l21545;
+    public long l21546;
+    public long l21547;
+    public long l21548;
+    public long l21549;
+    public long l21550;
+    public long l21551;
+    public long l21552;
+    public long l21553;
+    public long l21554;
+    public long l21555;
+    public long l21556;
+    public long l21557;
+    public long l21558;
+    public long l21559;
+    public long l21560;
+    public long l21561;
+    public long l21562;
+    public long l21563;
+    public long l21564;
+    public long l21565;
+    public long l21566;
+    public long l21567;
+    public long l21568;
+    public long l21569;
+    public long l21570;
+    public long l21571;
+    public long l21572;
+    public long l21573;
+    public long l21574;
+    public long l21575;
+    public long l21576;
+    public long l21577;
+    public long l21578;
+    public long l21579;
+    public long l21580;
+    public long l21581;
+    public long l21582;
+    public long l21583;
+    public long l21584;
+    public long l21585;
+    public long l21586;
+    public long l21587;
+    public long l21588;
+    public long l21589;
+    public long l21590;
+    public long l21591;
+    public long l21592;
+    public long l21593;
+    public long l21594;
+    public long l21595;
+    public long l21596;
+    public long l21597;
+    public long l21598;
+    public long l21599;
+    public long l21600;
+    public long l21601;
+    public long l21602;
+    public long l21603;
+    public long l21604;
+    public long l21605;
+    public long l21606;
+    public long l21607;
+    public long l21608;
+    public long l21609;
+    public long l21610;
+    public long l21611;
+    public long l21612;
+    public long l21613;
+    public long l21614;
+    public long l21615;
+    public long l21616;
+    public long l21617;
+    public long l21618;
+    public long l21619;
+    public long l21620;
+    public long l21621;
+    public long l21622;
+    public long l21623;
+    public long l21624;
+    public long l21625;
+    public long l21626;
+    public long l21627;
+    public long l21628;
+    public long l21629;
+    public long l21630;
+    public long l21631;
+    public long l21632;
+    public long l21633;
+    public long l21634;
+    public long l21635;
+    public long l21636;
+    public long l21637;
+    public long l21638;
+    public long l21639;
+    public long l21640;
+    public long l21641;
+    public long l21642;
+    public long l21643;
+    public long l21644;
+    public long l21645;
+    public long l21646;
+    public long l21647;
+    public long l21648;
+    public long l21649;
+    public long l21650;
+    public long l21651;
+    public long l21652;
+    public long l21653;
+    public long l21654;
+    public long l21655;
+    public long l21656;
+    public long l21657;
+    public long l21658;
+    public long l21659;
+    public long l21660;
+    public long l21661;
+    public long l21662;
+    public long l21663;
+    public long l21664;
+    public long l21665;
+    public long l21666;
+    public long l21667;
+    public long l21668;
+    public long l21669;
+    public long l21670;
+    public long l21671;
+    public long l21672;
+    public long l21673;
+    public long l21674;
+    public long l21675;
+    public long l21676;
+    public long l21677;
+    public long l21678;
+    public long l21679;
+    public long l21680;
+    public long l21681;
+    public long l21682;
+    public long l21683;
+    public long l21684;
+    public long l21685;
+    public long l21686;
+    public long l21687;
+    public long l21688;
+    public long l21689;
+    public long l21690;
+    public long l21691;
+    public long l21692;
+    public long l21693;
+    public long l21694;
+    public long l21695;
+    public long l21696;
+    public long l21697;
+    public long l21698;
+    public long l21699;
+    public long l21700;
+    public long l21701;
+    public long l21702;
+    public long l21703;
+    public long l21704;
+    public long l21705;
+    public long l21706;
+    public long l21707;
+    public long l21708;
+    public long l21709;
+    public long l21710;
+    public long l21711;
+    public long l21712;
+    public long l21713;
+    public long l21714;
+    public long l21715;
+    public long l21716;
+    public long l21717;
+    public long l21718;
+    public long l21719;
+    public long l21720;
+    public long l21721;
+    public long l21722;
+    public long l21723;
+    public long l21724;
+    public long l21725;
+    public long l21726;
+    public long l21727;
+    public long l21728;
+    public long l21729;
+    public long l21730;
+    public long l21731;
+    public long l21732;
+    public long l21733;
+    public long l21734;
+    public long l21735;
+    public long l21736;
+    public long l21737;
+    public long l21738;
+    public long l21739;
+    public long l21740;
+    public long l21741;
+    public long l21742;
+    public long l21743;
+    public long l21744;
+    public long l21745;
+    public long l21746;
+    public long l21747;
+    public long l21748;
+    public long l21749;
+    public long l21750;
+    public long l21751;
+    public long l21752;
+    public long l21753;
+    public long l21754;
+    public long l21755;
+    public long l21756;
+    public long l21757;
+    public long l21758;
+    public long l21759;
+    public long l21760;
+    public long l21761;
+    public long l21762;
+    public long l21763;
+    public long l21764;
+    public long l21765;
+    public long l21766;
+    public long l21767;
+    public long l21768;
+    public long l21769;
+    public long l21770;
+    public long l21771;
+    public long l21772;
+    public long l21773;
+    public long l21774;
+    public long l21775;
+    public long l21776;
+    public long l21777;
+    public long l21778;
+    public long l21779;
+    public long l21780;
+    public long l21781;
+    public long l21782;
+    public long l21783;
+    public long l21784;
+    public long l21785;
+    public long l21786;
+    public long l21787;
+    public long l21788;
+    public long l21789;
+    public long l21790;
+    public long l21791;
+    public long l21792;
+    public long l21793;
+    public long l21794;
+    public long l21795;
+    public long l21796;
+    public long l21797;
+    public long l21798;
+    public long l21799;
+    public long l21800;
+    public long l21801;
+    public long l21802;
+    public long l21803;
+    public long l21804;
+    public long l21805;
+    public long l21806;
+    public long l21807;
+    public long l21808;
+    public long l21809;
+    public long l21810;
+    public long l21811;
+    public long l21812;
+    public long l21813;
+    public long l21814;
+    public long l21815;
+    public long l21816;
+    public long l21817;
+    public long l21818;
+    public long l21819;
+    public long l21820;
+    public long l21821;
+    public long l21822;
+    public long l21823;
+    public long l21824;
+    public long l21825;
+    public long l21826;
+    public long l21827;
+    public long l21828;
+    public long l21829;
+    public long l21830;
+    public long l21831;
+    public long l21832;
+    public long l21833;
+    public long l21834;
+    public long l21835;
+    public long l21836;
+    public long l21837;
+    public long l21838;
+    public long l21839;
+    public long l21840;
+    public long l21841;
+    public long l21842;
+    public long l21843;
+    public long l21844;
+    public long l21845;
+    public long l21846;
+    public long l21847;
+    public long l21848;
+    public long l21849;
+    public long l21850;
+    public long l21851;
+    public long l21852;
+    public long l21853;
+    public long l21854;
+    public long l21855;
+    public long l21856;
+    public long l21857;
+    public long l21858;
+    public long l21859;
+    public long l21860;
+    public long l21861;
+    public long l21862;
+    public long l21863;
+    public long l21864;
+    public long l21865;
+    public long l21866;
+    public long l21867;
+    public long l21868;
+    public long l21869;
+    public long l21870;
+    public long l21871;
+    public long l21872;
+    public long l21873;
+    public long l21874;
+    public long l21875;
+    public long l21876;
+    public long l21877;
+    public long l21878;
+    public long l21879;
+    public long l21880;
+    public long l21881;
+    public long l21882;
+    public long l21883;
+    public long l21884;
+    public long l21885;
+    public long l21886;
+    public long l21887;
+    public long l21888;
+    public long l21889;
+    public long l21890;
+    public long l21891;
+    public long l21892;
+    public long l21893;
+    public long l21894;
+    public long l21895;
+    public long l21896;
+    public long l21897;
+    public long l21898;
+    public long l21899;
+    public long l21900;
+    public long l21901;
+    public long l21902;
+    public long l21903;
+    public long l21904;
+    public long l21905;
+    public long l21906;
+    public long l21907;
+    public long l21908;
+    public long l21909;
+    public long l21910;
+    public long l21911;
+    public long l21912;
+    public long l21913;
+    public long l21914;
+    public long l21915;
+    public long l21916;
+    public long l21917;
+    public long l21918;
+    public long l21919;
+    public long l21920;
+    public long l21921;
+    public long l21922;
+    public long l21923;
+    public long l21924;
+    public long l21925;
+    public long l21926;
+    public long l21927;
+    public long l21928;
+    public long l21929;
+    public long l21930;
+    public long l21931;
+    public long l21932;
+    public long l21933;
+    public long l21934;
+    public long l21935;
+    public long l21936;
+    public long l21937;
+    public long l21938;
+    public long l21939;
+    public long l21940;
+    public long l21941;
+    public long l21942;
+    public long l21943;
+    public long l21944;
+    public long l21945;
+    public long l21946;
+    public long l21947;
+    public long l21948;
+    public long l21949;
+    public long l21950;
+    public long l21951;
+    public long l21952;
+    public long l21953;
+    public long l21954;
+    public long l21955;
+    public long l21956;
+    public long l21957;
+    public long l21958;
+    public long l21959;
+    public long l21960;
+    public long l21961;
+    public long l21962;
+    public long l21963;
+    public long l21964;
+    public long l21965;
+    public long l21966;
+    public long l21967;
+    public long l21968;
+    public long l21969;
+    public long l21970;
+    public long l21971;
+    public long l21972;
+    public long l21973;
+    public long l21974;
+    public long l21975;
+    public long l21976;
+    public long l21977;
+    public long l21978;
+    public long l21979;
+    public long l21980;
+    public long l21981;
+    public long l21982;
+    public long l21983;
+    public long l21984;
+    public long l21985;
+    public long l21986;
+    public long l21987;
+    public long l21988;
+    public long l21989;
+    public long l21990;
+    public long l21991;
+    public long l21992;
+    public long l21993;
+    public long l21994;
+    public long l21995;
+    public long l21996;
+    public long l21997;
+    public long l21998;
+    public long l21999;
+    public long l22000;
+    public long l22001;
+    public long l22002;
+    public long l22003;
+    public long l22004;
+    public long l22005;
+    public long l22006;
+    public long l22007;
+    public long l22008;
+    public long l22009;
+    public long l22010;
+    public long l22011;
+    public long l22012;
+    public long l22013;
+    public long l22014;
+    public long l22015;
+    public long l22016;
+    public long l22017;
+    public long l22018;
+    public long l22019;
+    public long l22020;
+    public long l22021;
+    public long l22022;
+    public long l22023;
+    public long l22024;
+    public long l22025;
+    public long l22026;
+    public long l22027;
+    public long l22028;
+    public long l22029;
+    public long l22030;
+    public long l22031;
+    public long l22032;
+    public long l22033;
+    public long l22034;
+    public long l22035;
+    public long l22036;
+    public long l22037;
+    public long l22038;
+    public long l22039;
+    public long l22040;
+    public long l22041;
+    public long l22042;
+    public long l22043;
+    public long l22044;
+    public long l22045;
+    public long l22046;
+    public long l22047;
+    public long l22048;
+    public long l22049;
+    public long l22050;
+    public long l22051;
+    public long l22052;
+    public long l22053;
+    public long l22054;
+    public long l22055;
+    public long l22056;
+    public long l22057;
+    public long l22058;
+    public long l22059;
+    public long l22060;
+    public long l22061;
+    public long l22062;
+    public long l22063;
+    public long l22064;
+    public long l22065;
+    public long l22066;
+    public long l22067;
+    public long l22068;
+    public long l22069;
+    public long l22070;
+    public long l22071;
+    public long l22072;
+    public long l22073;
+    public long l22074;
+    public long l22075;
+    public long l22076;
+    public long l22077;
+    public long l22078;
+    public long l22079;
+    public long l22080;
+    public long l22081;
+    public long l22082;
+    public long l22083;
+    public long l22084;
+    public long l22085;
+    public long l22086;
+    public long l22087;
+    public long l22088;
+    public long l22089;
+    public long l22090;
+    public long l22091;
+    public long l22092;
+    public long l22093;
+    public long l22094;
+    public long l22095;
+    public long l22096;
+    public long l22097;
+    public long l22098;
+    public long l22099;
+    public long l22100;
+    public long l22101;
+    public long l22102;
+    public long l22103;
+    public long l22104;
+    public long l22105;
+    public long l22106;
+    public long l22107;
+    public long l22108;
+    public long l22109;
+    public long l22110;
+    public long l22111;
+    public long l22112;
+    public long l22113;
+    public long l22114;
+    public long l22115;
+    public long l22116;
+    public long l22117;
+    public long l22118;
+    public long l22119;
+    public long l22120;
+    public long l22121;
+    public long l22122;
+    public long l22123;
+    public long l22124;
+    public long l22125;
+    public long l22126;
+    public long l22127;
+    public long l22128;
+    public long l22129;
+    public long l22130;
+    public long l22131;
+    public long l22132;
+    public long l22133;
+    public long l22134;
+    public long l22135;
+    public long l22136;
+    public long l22137;
+    public long l22138;
+    public long l22139;
+    public long l22140;
+    public long l22141;
+    public long l22142;
+    public long l22143;
+    public long l22144;
+    public long l22145;
+    public long l22146;
+    public long l22147;
+    public long l22148;
+    public long l22149;
+    public long l22150;
+    public long l22151;
+    public long l22152;
+    public long l22153;
+    public long l22154;
+    public long l22155;
+    public long l22156;
+    public long l22157;
+    public long l22158;
+    public long l22159;
+    public long l22160;
+    public long l22161;
+    public long l22162;
+    public long l22163;
+    public long l22164;
+    public long l22165;
+    public long l22166;
+    public long l22167;
+    public long l22168;
+    public long l22169;
+    public long l22170;
+    public long l22171;
+    public long l22172;
+    public long l22173;
+    public long l22174;
+    public long l22175;
+    public long l22176;
+    public long l22177;
+    public long l22178;
+    public long l22179;
+    public long l22180;
+    public long l22181;
+    public long l22182;
+    public long l22183;
+    public long l22184;
+    public long l22185;
+    public long l22186;
+    public long l22187;
+    public long l22188;
+    public long l22189;
+    public long l22190;
+    public long l22191;
+    public long l22192;
+    public long l22193;
+    public long l22194;
+    public long l22195;
+    public long l22196;
+    public long l22197;
+    public long l22198;
+    public long l22199;
+    public long l22200;
+    public long l22201;
+    public long l22202;
+    public long l22203;
+    public long l22204;
+    public long l22205;
+    public long l22206;
+    public long l22207;
+    public long l22208;
+    public long l22209;
+    public long l22210;
+    public long l22211;
+    public long l22212;
+    public long l22213;
+    public long l22214;
+    public long l22215;
+    public long l22216;
+    public long l22217;
+    public long l22218;
+    public long l22219;
+    public long l22220;
+    public long l22221;
+    public long l22222;
+    public long l22223;
+    public long l22224;
+    public long l22225;
+    public long l22226;
+    public long l22227;
+    public long l22228;
+    public long l22229;
+    public long l22230;
+    public long l22231;
+    public long l22232;
+    public long l22233;
+    public long l22234;
+    public long l22235;
+    public long l22236;
+    public long l22237;
+    public long l22238;
+    public long l22239;
+    public long l22240;
+    public long l22241;
+    public long l22242;
+    public long l22243;
+    public long l22244;
+    public long l22245;
+    public long l22246;
+    public long l22247;
+    public long l22248;
+    public long l22249;
+    public long l22250;
+    public long l22251;
+    public long l22252;
+    public long l22253;
+    public long l22254;
+    public long l22255;
+    public long l22256;
+    public long l22257;
+    public long l22258;
+    public long l22259;
+    public long l22260;
+    public long l22261;
+    public long l22262;
+    public long l22263;
+    public long l22264;
+    public long l22265;
+    public long l22266;
+    public long l22267;
+    public long l22268;
+    public long l22269;
+    public long l22270;
+    public long l22271;
+    public long l22272;
+    public long l22273;
+    public long l22274;
+    public long l22275;
+    public long l22276;
+    public long l22277;
+    public long l22278;
+    public long l22279;
+    public long l22280;
+    public long l22281;
+    public long l22282;
+    public long l22283;
+    public long l22284;
+    public long l22285;
+    public long l22286;
+    public long l22287;
+    public long l22288;
+    public long l22289;
+    public long l22290;
+    public long l22291;
+    public long l22292;
+    public long l22293;
+    public long l22294;
+    public long l22295;
+    public long l22296;
+    public long l22297;
+    public long l22298;
+    public long l22299;
+    public long l22300;
+    public long l22301;
+    public long l22302;
+    public long l22303;
+    public long l22304;
+    public long l22305;
+    public long l22306;
+    public long l22307;
+    public long l22308;
+    public long l22309;
+    public long l22310;
+    public long l22311;
+    public long l22312;
+    public long l22313;
+    public long l22314;
+    public long l22315;
+    public long l22316;
+    public long l22317;
+    public long l22318;
+    public long l22319;
+    public long l22320;
+    public long l22321;
+    public long l22322;
+    public long l22323;
+    public long l22324;
+    public long l22325;
+    public long l22326;
+    public long l22327;
+    public long l22328;
+    public long l22329;
+    public long l22330;
+    public long l22331;
+    public long l22332;
+    public long l22333;
+    public long l22334;
+    public long l22335;
+    public long l22336;
+    public long l22337;
+    public long l22338;
+    public long l22339;
+    public long l22340;
+    public long l22341;
+    public long l22342;
+    public long l22343;
+    public long l22344;
+    public long l22345;
+    public long l22346;
+    public long l22347;
+    public long l22348;
+    public long l22349;
+    public long l22350;
+    public long l22351;
+    public long l22352;
+    public long l22353;
+    public long l22354;
+    public long l22355;
+    public long l22356;
+    public long l22357;
+    public long l22358;
+    public long l22359;
+    public long l22360;
+    public long l22361;
+    public long l22362;
+    public long l22363;
+    public long l22364;
+    public long l22365;
+    public long l22366;
+    public long l22367;
+    public long l22368;
+    public long l22369;
+    public long l22370;
+    public long l22371;
+    public long l22372;
+    public long l22373;
+    public long l22374;
+    public long l22375;
+    public long l22376;
+    public long l22377;
+    public long l22378;
+    public long l22379;
+    public long l22380;
+    public long l22381;
+    public long l22382;
+    public long l22383;
+    public long l22384;
+    public long l22385;
+    public long l22386;
+    public long l22387;
+    public long l22388;
+    public long l22389;
+    public long l22390;
+    public long l22391;
+    public long l22392;
+    public long l22393;
+    public long l22394;
+    public long l22395;
+    public long l22396;
+    public long l22397;
+    public long l22398;
+    public long l22399;
+    public long l22400;
+    public long l22401;
+    public long l22402;
+    public long l22403;
+    public long l22404;
+    public long l22405;
+    public long l22406;
+    public long l22407;
+    public long l22408;
+    public long l22409;
+    public long l22410;
+    public long l22411;
+    public long l22412;
+    public long l22413;
+    public long l22414;
+    public long l22415;
+    public long l22416;
+    public long l22417;
+    public long l22418;
+    public long l22419;
+    public long l22420;
+    public long l22421;
+    public long l22422;
+    public long l22423;
+    public long l22424;
+    public long l22425;
+    public long l22426;
+    public long l22427;
+    public long l22428;
+    public long l22429;
+    public long l22430;
+    public long l22431;
+    public long l22432;
+    public long l22433;
+    public long l22434;
+    public long l22435;
+    public long l22436;
+    public long l22437;
+    public long l22438;
+    public long l22439;
+    public long l22440;
+    public long l22441;
+    public long l22442;
+    public long l22443;
+    public long l22444;
+    public long l22445;
+    public long l22446;
+    public long l22447;
+    public long l22448;
+    public long l22449;
+    public long l22450;
+    public long l22451;
+    public long l22452;
+    public long l22453;
+    public long l22454;
+    public long l22455;
+    public long l22456;
+    public long l22457;
+    public long l22458;
+    public long l22459;
+    public long l22460;
+    public long l22461;
+    public long l22462;
+    public long l22463;
+    public long l22464;
+    public long l22465;
+    public long l22466;
+    public long l22467;
+    public long l22468;
+    public long l22469;
+    public long l22470;
+    public long l22471;
+    public long l22472;
+    public long l22473;
+    public long l22474;
+    public long l22475;
+    public long l22476;
+    public long l22477;
+    public long l22478;
+    public long l22479;
+    public long l22480;
+    public long l22481;
+    public long l22482;
+    public long l22483;
+    public long l22484;
+    public long l22485;
+    public long l22486;
+    public long l22487;
+    public long l22488;
+    public long l22489;
+    public long l22490;
+    public long l22491;
+    public long l22492;
+    public long l22493;
+    public long l22494;
+    public long l22495;
+    public long l22496;
+    public long l22497;
+    public long l22498;
+    public long l22499;
+    public long l22500;
+    public long l22501;
+    public long l22502;
+    public long l22503;
+    public long l22504;
+    public long l22505;
+    public long l22506;
+    public long l22507;
+    public long l22508;
+    public long l22509;
+    public long l22510;
+    public long l22511;
+    public long l22512;
+    public long l22513;
+    public long l22514;
+    public long l22515;
+    public long l22516;
+    public long l22517;
+    public long l22518;
+    public long l22519;
+    public long l22520;
+    public long l22521;
+    public long l22522;
+    public long l22523;
+    public long l22524;
+    public long l22525;
+    public long l22526;
+    public long l22527;
+    public long l22528;
+    public long l22529;
+    public long l22530;
+    public long l22531;
+    public long l22532;
+    public long l22533;
+    public long l22534;
+    public long l22535;
+    public long l22536;
+    public long l22537;
+    public long l22538;
+    public long l22539;
+    public long l22540;
+    public long l22541;
+    public long l22542;
+    public long l22543;
+    public long l22544;
+    public long l22545;
+    public long l22546;
+    public long l22547;
+    public long l22548;
+    public long l22549;
+    public long l22550;
+    public long l22551;
+    public long l22552;
+    public long l22553;
+    public long l22554;
+    public long l22555;
+    public long l22556;
+    public long l22557;
+    public long l22558;
+    public long l22559;
+    public long l22560;
+    public long l22561;
+    public long l22562;
+    public long l22563;
+    public long l22564;
+    public long l22565;
+    public long l22566;
+    public long l22567;
+    public long l22568;
+    public long l22569;
+    public long l22570;
+    public long l22571;
+    public long l22572;
+    public long l22573;
+    public long l22574;
+    public long l22575;
+    public long l22576;
+    public long l22577;
+    public long l22578;
+    public long l22579;
+    public long l22580;
+    public long l22581;
+    public long l22582;
+    public long l22583;
+    public long l22584;
+    public long l22585;
+    public long l22586;
+    public long l22587;
+    public long l22588;
+    public long l22589;
+    public long l22590;
+    public long l22591;
+    public long l22592;
+    public long l22593;
+    public long l22594;
+    public long l22595;
+    public long l22596;
+    public long l22597;
+    public long l22598;
+    public long l22599;
+    public long l22600;
+    public long l22601;
+    public long l22602;
+    public long l22603;
+    public long l22604;
+    public long l22605;
+    public long l22606;
+    public long l22607;
+    public long l22608;
+    public long l22609;
+    public long l22610;
+    public long l22611;
+    public long l22612;
+    public long l22613;
+    public long l22614;
+    public long l22615;
+    public long l22616;
+    public long l22617;
+    public long l22618;
+    public long l22619;
+    public long l22620;
+    public long l22621;
+    public long l22622;
+    public long l22623;
+    public long l22624;
+    public long l22625;
+    public long l22626;
+    public long l22627;
+    public long l22628;
+    public long l22629;
+    public long l22630;
+    public long l22631;
+    public long l22632;
+    public long l22633;
+    public long l22634;
+    public long l22635;
+    public long l22636;
+    public long l22637;
+    public long l22638;
+    public long l22639;
+    public long l22640;
+    public long l22641;
+    public long l22642;
+    public long l22643;
+    public long l22644;
+    public long l22645;
+    public long l22646;
+    public long l22647;
+    public long l22648;
+    public long l22649;
+    public long l22650;
+    public long l22651;
+    public long l22652;
+    public long l22653;
+    public long l22654;
+    public long l22655;
+    public long l22656;
+    public long l22657;
+    public long l22658;
+    public long l22659;
+    public long l22660;
+    public long l22661;
+    public long l22662;
+    public long l22663;
+    public long l22664;
+    public long l22665;
+    public long l22666;
+    public long l22667;
+    public long l22668;
+    public long l22669;
+    public long l22670;
+    public long l22671;
+    public long l22672;
+    public long l22673;
+    public long l22674;
+    public long l22675;
+    public long l22676;
+    public long l22677;
+    public long l22678;
+    public long l22679;
+    public long l22680;
+    public long l22681;
+    public long l22682;
+    public long l22683;
+    public long l22684;
+    public long l22685;
+    public long l22686;
+    public long l22687;
+    public long l22688;
+    public long l22689;
+    public long l22690;
+    public long l22691;
+    public long l22692;
+    public long l22693;
+    public long l22694;
+    public long l22695;
+    public long l22696;
+    public long l22697;
+    public long l22698;
+    public long l22699;
+    public long l22700;
+    public long l22701;
+    public long l22702;
+    public long l22703;
+    public long l22704;
+    public long l22705;
+    public long l22706;
+    public long l22707;
+    public long l22708;
+    public long l22709;
+    public long l22710;
+    public long l22711;
+    public long l22712;
+    public long l22713;
+    public long l22714;
+    public long l22715;
+    public long l22716;
+    public long l22717;
+    public long l22718;
+    public long l22719;
+    public long l22720;
+    public long l22721;
+    public long l22722;
+    public long l22723;
+    public long l22724;
+    public long l22725;
+    public long l22726;
+    public long l22727;
+    public long l22728;
+    public long l22729;
+    public long l22730;
+    public long l22731;
+    public long l22732;
+    public long l22733;
+    public long l22734;
+    public long l22735;
+    public long l22736;
+    public long l22737;
+    public long l22738;
+    public long l22739;
+    public long l22740;
+    public long l22741;
+    public long l22742;
+    public long l22743;
+    public long l22744;
+    public long l22745;
+    public long l22746;
+    public long l22747;
+    public long l22748;
+    public long l22749;
+    public long l22750;
+    public long l22751;
+    public long l22752;
+    public long l22753;
+    public long l22754;
+    public long l22755;
+    public long l22756;
+    public long l22757;
+    public long l22758;
+    public long l22759;
+    public long l22760;
+    public long l22761;
+    public long l22762;
+    public long l22763;
+    public long l22764;
+    public long l22765;
+    public long l22766;
+    public long l22767;
+    public long l22768;
+    public long l22769;
+    public long l22770;
+    public long l22771;
+    public long l22772;
+    public long l22773;
+    public long l22774;
+    public long l22775;
+    public long l22776;
+    public long l22777;
+    public long l22778;
+    public long l22779;
+    public long l22780;
+    public long l22781;
+    public long l22782;
+    public long l22783;
+    public long l22784;
+    public long l22785;
+    public long l22786;
+    public long l22787;
+    public long l22788;
+    public long l22789;
+    public long l22790;
+    public long l22791;
+    public long l22792;
+    public long l22793;
+    public long l22794;
+    public long l22795;
+    public long l22796;
+    public long l22797;
+    public long l22798;
+    public long l22799;
+    public long l22800;
+    public long l22801;
+    public long l22802;
+    public long l22803;
+    public long l22804;
+    public long l22805;
+    public long l22806;
+    public long l22807;
+    public long l22808;
+    public long l22809;
+    public long l22810;
+    public long l22811;
+    public long l22812;
+    public long l22813;
+    public long l22814;
+    public long l22815;
+    public long l22816;
+    public long l22817;
+    public long l22818;
+    public long l22819;
+    public long l22820;
+    public long l22821;
+    public long l22822;
+    public long l22823;
+    public long l22824;
+    public long l22825;
+    public long l22826;
+    public long l22827;
+    public long l22828;
+    public long l22829;
+    public long l22830;
+    public long l22831;
+    public long l22832;
+    public long l22833;
+    public long l22834;
+    public long l22835;
+    public long l22836;
+    public long l22837;
+    public long l22838;
+    public long l22839;
+    public long l22840;
+    public long l22841;
+    public long l22842;
+    public long l22843;
+    public long l22844;
+    public long l22845;
+    public long l22846;
+    public long l22847;
+    public long l22848;
+    public long l22849;
+    public long l22850;
+    public long l22851;
+    public long l22852;
+    public long l22853;
+    public long l22854;
+    public long l22855;
+    public long l22856;
+    public long l22857;
+    public long l22858;
+    public long l22859;
+    public long l22860;
+    public long l22861;
+    public long l22862;
+    public long l22863;
+    public long l22864;
+    public long l22865;
+    public long l22866;
+    public long l22867;
+    public long l22868;
+    public long l22869;
+    public long l22870;
+    public long l22871;
+    public long l22872;
+    public long l22873;
+    public long l22874;
+    public long l22875;
+    public long l22876;
+    public long l22877;
+    public long l22878;
+    public long l22879;
+    public long l22880;
+    public long l22881;
+    public long l22882;
+    public long l22883;
+    public long l22884;
+    public long l22885;
+    public long l22886;
+    public long l22887;
+    public long l22888;
+    public long l22889;
+    public long l22890;
+    public long l22891;
+    public long l22892;
+    public long l22893;
+    public long l22894;
+    public long l22895;
+    public long l22896;
+    public long l22897;
+    public long l22898;
+    public long l22899;
+    public long l22900;
+    public long l22901;
+    public long l22902;
+    public long l22903;
+    public long l22904;
+    public long l22905;
+    public long l22906;
+    public long l22907;
+    public long l22908;
+    public long l22909;
+    public long l22910;
+    public long l22911;
+    public long l22912;
+    public long l22913;
+    public long l22914;
+    public long l22915;
+    public long l22916;
+    public long l22917;
+    public long l22918;
+    public long l22919;
+    public long l22920;
+    public long l22921;
+    public long l22922;
+    public long l22923;
+    public long l22924;
+    public long l22925;
+    public long l22926;
+    public long l22927;
+    public long l22928;
+    public long l22929;
+    public long l22930;
+    public long l22931;
+    public long l22932;
+    public long l22933;
+    public long l22934;
+    public long l22935;
+    public long l22936;
+    public long l22937;
+    public long l22938;
+    public long l22939;
+    public long l22940;
+    public long l22941;
+    public long l22942;
+    public long l22943;
+    public long l22944;
+    public long l22945;
+    public long l22946;
+    public long l22947;
+    public long l22948;
+    public long l22949;
+    public long l22950;
+    public long l22951;
+    public long l22952;
+    public long l22953;
+    public long l22954;
+    public long l22955;
+    public long l22956;
+    public long l22957;
+    public long l22958;
+    public long l22959;
+    public long l22960;
+    public long l22961;
+    public long l22962;
+    public long l22963;
+    public long l22964;
+    public long l22965;
+    public long l22966;
+    public long l22967;
+    public long l22968;
+    public long l22969;
+    public long l22970;
+    public long l22971;
+    public long l22972;
+    public long l22973;
+    public long l22974;
+    public long l22975;
+    public long l22976;
+    public long l22977;
+    public long l22978;
+    public long l22979;
+    public long l22980;
+    public long l22981;
+    public long l22982;
+    public long l22983;
+    public long l22984;
+    public long l22985;
+    public long l22986;
+    public long l22987;
+    public long l22988;
+    public long l22989;
+    public long l22990;
+    public long l22991;
+    public long l22992;
+    public long l22993;
+    public long l22994;
+    public long l22995;
+    public long l22996;
+    public long l22997;
+    public long l22998;
+    public long l22999;
+    public long l23000;
+    public long l23001;
+    public long l23002;
+    public long l23003;
+    public long l23004;
+    public long l23005;
+    public long l23006;
+    public long l23007;
+    public long l23008;
+    public long l23009;
+    public long l23010;
+    public long l23011;
+    public long l23012;
+    public long l23013;
+    public long l23014;
+    public long l23015;
+    public long l23016;
+    public long l23017;
+    public long l23018;
+    public long l23019;
+    public long l23020;
+    public long l23021;
+    public long l23022;
+    public long l23023;
+    public long l23024;
+    public long l23025;
+    public long l23026;
+    public long l23027;
+    public long l23028;
+    public long l23029;
+    public long l23030;
+    public long l23031;
+    public long l23032;
+    public long l23033;
+    public long l23034;
+    public long l23035;
+    public long l23036;
+    public long l23037;
+    public long l23038;
+    public long l23039;
+    public long l23040;
+    public long l23041;
+    public long l23042;
+    public long l23043;
+    public long l23044;
+    public long l23045;
+    public long l23046;
+    public long l23047;
+    public long l23048;
+    public long l23049;
+    public long l23050;
+    public long l23051;
+    public long l23052;
+    public long l23053;
+    public long l23054;
+    public long l23055;
+    public long l23056;
+    public long l23057;
+    public long l23058;
+    public long l23059;
+    public long l23060;
+    public long l23061;
+    public long l23062;
+    public long l23063;
+    public long l23064;
+    public long l23065;
+    public long l23066;
+    public long l23067;
+    public long l23068;
+    public long l23069;
+    public long l23070;
+    public long l23071;
+    public long l23072;
+    public long l23073;
+    public long l23074;
+    public long l23075;
+    public long l23076;
+    public long l23077;
+    public long l23078;
+    public long l23079;
+    public long l23080;
+    public long l23081;
+    public long l23082;
+    public long l23083;
+    public long l23084;
+    public long l23085;
+    public long l23086;
+    public long l23087;
+    public long l23088;
+    public long l23089;
+    public long l23090;
+    public long l23091;
+    public long l23092;
+    public long l23093;
+    public long l23094;
+    public long l23095;
+    public long l23096;
+    public long l23097;
+    public long l23098;
+    public long l23099;
+    public long l23100;
+    public long l23101;
+    public long l23102;
+    public long l23103;
+    public long l23104;
+    public long l23105;
+    public long l23106;
+    public long l23107;
+    public long l23108;
+    public long l23109;
+    public long l23110;
+    public long l23111;
+    public long l23112;
+    public long l23113;
+    public long l23114;
+    public long l23115;
+    public long l23116;
+    public long l23117;
+    public long l23118;
+    public long l23119;
+    public long l23120;
+    public long l23121;
+    public long l23122;
+    public long l23123;
+    public long l23124;
+    public long l23125;
+    public long l23126;
+    public long l23127;
+    public long l23128;
+    public long l23129;
+    public long l23130;
+    public long l23131;
+    public long l23132;
+    public long l23133;
+    public long l23134;
+    public long l23135;
+    public long l23136;
+    public long l23137;
+    public long l23138;
+    public long l23139;
+    public long l23140;
+    public long l23141;
+    public long l23142;
+    public long l23143;
+    public long l23144;
+    public long l23145;
+    public long l23146;
+    public long l23147;
+    public long l23148;
+    public long l23149;
+    public long l23150;
+    public long l23151;
+    public long l23152;
+    public long l23153;
+    public long l23154;
+    public long l23155;
+    public long l23156;
+    public long l23157;
+    public long l23158;
+    public long l23159;
+    public long l23160;
+    public long l23161;
+    public long l23162;
+    public long l23163;
+    public long l23164;
+    public long l23165;
+    public long l23166;
+    public long l23167;
+    public long l23168;
+    public long l23169;
+    public long l23170;
+    public long l23171;
+    public long l23172;
+    public long l23173;
+    public long l23174;
+    public long l23175;
+    public long l23176;
+    public long l23177;
+    public long l23178;
+    public long l23179;
+    public long l23180;
+    public long l23181;
+    public long l23182;
+    public long l23183;
+    public long l23184;
+    public long l23185;
+    public long l23186;
+    public long l23187;
+    public long l23188;
+    public long l23189;
+    public long l23190;
+    public long l23191;
+    public long l23192;
+    public long l23193;
+    public long l23194;
+    public long l23195;
+    public long l23196;
+    public long l23197;
+    public long l23198;
+    public long l23199;
+    public long l23200;
+    public long l23201;
+    public long l23202;
+    public long l23203;
+    public long l23204;
+    public long l23205;
+    public long l23206;
+    public long l23207;
+    public long l23208;
+    public long l23209;
+    public long l23210;
+    public long l23211;
+    public long l23212;
+    public long l23213;
+    public long l23214;
+    public long l23215;
+    public long l23216;
+    public long l23217;
+    public long l23218;
+    public long l23219;
+    public long l23220;
+    public long l23221;
+    public long l23222;
+    public long l23223;
+    public long l23224;
+    public long l23225;
+    public long l23226;
+    public long l23227;
+    public long l23228;
+    public long l23229;
+    public long l23230;
+    public long l23231;
+    public long l23232;
+    public long l23233;
+    public long l23234;
+    public long l23235;
+    public long l23236;
+    public long l23237;
+    public long l23238;
+    public long l23239;
+    public long l23240;
+    public long l23241;
+    public long l23242;
+    public long l23243;
+    public long l23244;
+    public long l23245;
+    public long l23246;
+    public long l23247;
+    public long l23248;
+    public long l23249;
+    public long l23250;
+    public long l23251;
+    public long l23252;
+    public long l23253;
+    public long l23254;
+    public long l23255;
+    public long l23256;
+    public long l23257;
+    public long l23258;
+    public long l23259;
+    public long l23260;
+    public long l23261;
+    public long l23262;
+    public long l23263;
+    public long l23264;
+    public long l23265;
+    public long l23266;
+    public long l23267;
+    public long l23268;
+    public long l23269;
+    public long l23270;
+    public long l23271;
+    public long l23272;
+    public long l23273;
+    public long l23274;
+    public long l23275;
+    public long l23276;
+    public long l23277;
+    public long l23278;
+    public long l23279;
+    public long l23280;
+    public long l23281;
+    public long l23282;
+    public long l23283;
+    public long l23284;
+    public long l23285;
+    public long l23286;
+    public long l23287;
+    public long l23288;
+    public long l23289;
+    public long l23290;
+    public long l23291;
+    public long l23292;
+    public long l23293;
+    public long l23294;
+    public long l23295;
+    public long l23296;
+    public long l23297;
+    public long l23298;
+    public long l23299;
+    public long l23300;
+    public long l23301;
+    public long l23302;
+    public long l23303;
+    public long l23304;
+    public long l23305;
+    public long l23306;
+    public long l23307;
+    public long l23308;
+    public long l23309;
+    public long l23310;
+    public long l23311;
+    public long l23312;
+    public long l23313;
+    public long l23314;
+    public long l23315;
+    public long l23316;
+    public long l23317;
+    public long l23318;
+    public long l23319;
+    public long l23320;
+    public long l23321;
+    public long l23322;
+    public long l23323;
+    public long l23324;
+    public long l23325;
+    public long l23326;
+    public long l23327;
+    public long l23328;
+    public long l23329;
+    public long l23330;
+    public long l23331;
+    public long l23332;
+    public long l23333;
+    public long l23334;
+    public long l23335;
+    public long l23336;
+    public long l23337;
+    public long l23338;
+    public long l23339;
+    public long l23340;
+    public long l23341;
+    public long l23342;
+    public long l23343;
+    public long l23344;
+    public long l23345;
+    public long l23346;
+    public long l23347;
+    public long l23348;
+    public long l23349;
+    public long l23350;
+    public long l23351;
+    public long l23352;
+    public long l23353;
+    public long l23354;
+    public long l23355;
+    public long l23356;
+    public long l23357;
+    public long l23358;
+    public long l23359;
+    public long l23360;
+    public long l23361;
+    public long l23362;
+    public long l23363;
+    public long l23364;
+    public long l23365;
+    public long l23366;
+    public long l23367;
+    public long l23368;
+    public long l23369;
+    public long l23370;
+    public long l23371;
+    public long l23372;
+    public long l23373;
+    public long l23374;
+    public long l23375;
+    public long l23376;
+    public long l23377;
+    public long l23378;
+    public long l23379;
+    public long l23380;
+    public long l23381;
+    public long l23382;
+    public long l23383;
+    public long l23384;
+    public long l23385;
+    public long l23386;
+    public long l23387;
+    public long l23388;
+    public long l23389;
+    public long l23390;
+    public long l23391;
+    public long l23392;
+    public long l23393;
+    public long l23394;
+    public long l23395;
+    public long l23396;
+    public long l23397;
+    public long l23398;
+    public long l23399;
+    public long l23400;
+    public long l23401;
+    public long l23402;
+    public long l23403;
+    public long l23404;
+    public long l23405;
+    public long l23406;
+    public long l23407;
+    public long l23408;
+    public long l23409;
+    public long l23410;
+    public long l23411;
+    public long l23412;
+    public long l23413;
+    public long l23414;
+    public long l23415;
+    public long l23416;
+    public long l23417;
+    public long l23418;
+    public long l23419;
+    public long l23420;
+    public long l23421;
+    public long l23422;
+    public long l23423;
+    public long l23424;
+    public long l23425;
+    public long l23426;
+    public long l23427;
+    public long l23428;
+    public long l23429;
+    public long l23430;
+    public long l23431;
+    public long l23432;
+    public long l23433;
+    public long l23434;
+    public long l23435;
+    public long l23436;
+    public long l23437;
+    public long l23438;
+    public long l23439;
+    public long l23440;
+    public long l23441;
+    public long l23442;
+    public long l23443;
+    public long l23444;
+    public long l23445;
+    public long l23446;
+    public long l23447;
+    public long l23448;
+    public long l23449;
+    public long l23450;
+    public long l23451;
+    public long l23452;
+    public long l23453;
+    public long l23454;
+    public long l23455;
+    public long l23456;
+    public long l23457;
+    public long l23458;
+    public long l23459;
+    public long l23460;
+    public long l23461;
+    public long l23462;
+    public long l23463;
+    public long l23464;
+    public long l23465;
+    public long l23466;
+    public long l23467;
+    public long l23468;
+    public long l23469;
+    public long l23470;
+    public long l23471;
+    public long l23472;
+    public long l23473;
+    public long l23474;
+    public long l23475;
+    public long l23476;
+    public long l23477;
+    public long l23478;
+    public long l23479;
+    public long l23480;
+    public long l23481;
+    public long l23482;
+    public long l23483;
+    public long l23484;
+    public long l23485;
+    public long l23486;
+    public long l23487;
+    public long l23488;
+    public long l23489;
+    public long l23490;
+    public long l23491;
+    public long l23492;
+    public long l23493;
+    public long l23494;
+    public long l23495;
+    public long l23496;
+    public long l23497;
+    public long l23498;
+    public long l23499;
+    public long l23500;
+    public long l23501;
+    public long l23502;
+    public long l23503;
+    public long l23504;
+    public long l23505;
+    public long l23506;
+    public long l23507;
+    public long l23508;
+    public long l23509;
+    public long l23510;
+    public long l23511;
+    public long l23512;
+    public long l23513;
+    public long l23514;
+    public long l23515;
+    public long l23516;
+    public long l23517;
+    public long l23518;
+    public long l23519;
+    public long l23520;
+    public long l23521;
+    public long l23522;
+    public long l23523;
+    public long l23524;
+    public long l23525;
+    public long l23526;
+    public long l23527;
+    public long l23528;
+    public long l23529;
+    public long l23530;
+    public long l23531;
+    public long l23532;
+    public long l23533;
+    public long l23534;
+    public long l23535;
+    public long l23536;
+    public long l23537;
+    public long l23538;
+    public long l23539;
+    public long l23540;
+    public long l23541;
+    public long l23542;
+    public long l23543;
+    public long l23544;
+    public long l23545;
+    public long l23546;
+    public long l23547;
+    public long l23548;
+    public long l23549;
+    public long l23550;
+    public long l23551;
+    public long l23552;
+    public long l23553;
+    public long l23554;
+    public long l23555;
+    public long l23556;
+    public long l23557;
+    public long l23558;
+    public long l23559;
+    public long l23560;
+    public long l23561;
+    public long l23562;
+    public long l23563;
+    public long l23564;
+    public long l23565;
+    public long l23566;
+    public long l23567;
+    public long l23568;
+    public long l23569;
+    public long l23570;
+    public long l23571;
+    public long l23572;
+    public long l23573;
+    public long l23574;
+    public long l23575;
+    public long l23576;
+    public long l23577;
+    public long l23578;
+    public long l23579;
+    public long l23580;
+    public long l23581;
+    public long l23582;
+    public long l23583;
+    public long l23584;
+    public long l23585;
+    public long l23586;
+    public long l23587;
+    public long l23588;
+    public long l23589;
+    public long l23590;
+    public long l23591;
+    public long l23592;
+    public long l23593;
+    public long l23594;
+    public long l23595;
+    public long l23596;
+    public long l23597;
+    public long l23598;
+    public long l23599;
+    public long l23600;
+    public long l23601;
+    public long l23602;
+    public long l23603;
+    public long l23604;
+    public long l23605;
+    public long l23606;
+    public long l23607;
+    public long l23608;
+    public long l23609;
+    public long l23610;
+    public long l23611;
+    public long l23612;
+    public long l23613;
+    public long l23614;
+    public long l23615;
+    public long l23616;
+    public long l23617;
+    public long l23618;
+    public long l23619;
+    public long l23620;
+    public long l23621;
+    public long l23622;
+    public long l23623;
+    public long l23624;
+    public long l23625;
+    public long l23626;
+    public long l23627;
+    public long l23628;
+    public long l23629;
+    public long l23630;
+    public long l23631;
+    public long l23632;
+    public long l23633;
+    public long l23634;
+    public long l23635;
+    public long l23636;
+    public long l23637;
+    public long l23638;
+    public long l23639;
+    public long l23640;
+    public long l23641;
+    public long l23642;
+    public long l23643;
+    public long l23644;
+    public long l23645;
+    public long l23646;
+    public long l23647;
+    public long l23648;
+    public long l23649;
+    public long l23650;
+    public long l23651;
+    public long l23652;
+    public long l23653;
+    public long l23654;
+    public long l23655;
+    public long l23656;
+    public long l23657;
+    public long l23658;
+    public long l23659;
+    public long l23660;
+    public long l23661;
+    public long l23662;
+    public long l23663;
+    public long l23664;
+    public long l23665;
+    public long l23666;
+    public long l23667;
+    public long l23668;
+    public long l23669;
+    public long l23670;
+    public long l23671;
+    public long l23672;
+    public long l23673;
+    public long l23674;
+    public long l23675;
+    public long l23676;
+    public long l23677;
+    public long l23678;
+    public long l23679;
+    public long l23680;
+    public long l23681;
+    public long l23682;
+    public long l23683;
+    public long l23684;
+    public long l23685;
+    public long l23686;
+    public long l23687;
+    public long l23688;
+    public long l23689;
+    public long l23690;
+    public long l23691;
+    public long l23692;
+    public long l23693;
+    public long l23694;
+    public long l23695;
+    public long l23696;
+    public long l23697;
+    public long l23698;
+    public long l23699;
+    public long l23700;
+    public long l23701;
+    public long l23702;
+    public long l23703;
+    public long l23704;
+    public long l23705;
+    public long l23706;
+    public long l23707;
+    public long l23708;
+    public long l23709;
+    public long l23710;
+    public long l23711;
+    public long l23712;
+    public long l23713;
+    public long l23714;
+    public long l23715;
+    public long l23716;
+    public long l23717;
+    public long l23718;
+    public long l23719;
+    public long l23720;
+    public long l23721;
+    public long l23722;
+    public long l23723;
+    public long l23724;
+    public long l23725;
+    public long l23726;
+    public long l23727;
+    public long l23728;
+    public long l23729;
+    public long l23730;
+    public long l23731;
+    public long l23732;
+    public long l23733;
+    public long l23734;
+    public long l23735;
+    public long l23736;
+    public long l23737;
+    public long l23738;
+    public long l23739;
+    public long l23740;
+    public long l23741;
+    public long l23742;
+    public long l23743;
+    public long l23744;
+    public long l23745;
+    public long l23746;
+    public long l23747;
+    public long l23748;
+    public long l23749;
+    public long l23750;
+    public long l23751;
+    public long l23752;
+    public long l23753;
+    public long l23754;
+    public long l23755;
+    public long l23756;
+    public long l23757;
+    public long l23758;
+    public long l23759;
+    public long l23760;
+    public long l23761;
+    public long l23762;
+    public long l23763;
+    public long l23764;
+    public long l23765;
+    public long l23766;
+    public long l23767;
+    public long l23768;
+    public long l23769;
+    public long l23770;
+    public long l23771;
+    public long l23772;
+    public long l23773;
+    public long l23774;
+    public long l23775;
+    public long l23776;
+    public long l23777;
+    public long l23778;
+    public long l23779;
+    public long l23780;
+    public long l23781;
+    public long l23782;
+    public long l23783;
+    public long l23784;
+    public long l23785;
+    public long l23786;
+    public long l23787;
+    public long l23788;
+    public long l23789;
+    public long l23790;
+    public long l23791;
+    public long l23792;
+    public long l23793;
+    public long l23794;
+    public long l23795;
+    public long l23796;
+    public long l23797;
+    public long l23798;
+    public long l23799;
+    public long l23800;
+    public long l23801;
+    public long l23802;
+    public long l23803;
+    public long l23804;
+    public long l23805;
+    public long l23806;
+    public long l23807;
+    public long l23808;
+    public long l23809;
+    public long l23810;
+    public long l23811;
+    public long l23812;
+    public long l23813;
+    public long l23814;
+    public long l23815;
+    public long l23816;
+    public long l23817;
+    public long l23818;
+    public long l23819;
+    public long l23820;
+    public long l23821;
+    public long l23822;
+    public long l23823;
+    public long l23824;
+    public long l23825;
+    public long l23826;
+    public long l23827;
+    public long l23828;
+    public long l23829;
+    public long l23830;
+    public long l23831;
+    public long l23832;
+    public long l23833;
+    public long l23834;
+    public long l23835;
+    public long l23836;
+    public long l23837;
+    public long l23838;
+    public long l23839;
+    public long l23840;
+    public long l23841;
+    public long l23842;
+    public long l23843;
+    public long l23844;
+    public long l23845;
+    public long l23846;
+    public long l23847;
+    public long l23848;
+    public long l23849;
+    public long l23850;
+    public long l23851;
+    public long l23852;
+    public long l23853;
+    public long l23854;
+    public long l23855;
+    public long l23856;
+    public long l23857;
+    public long l23858;
+    public long l23859;
+    public long l23860;
+    public long l23861;
+    public long l23862;
+    public long l23863;
+    public long l23864;
+    public long l23865;
+    public long l23866;
+    public long l23867;
+    public long l23868;
+    public long l23869;
+    public long l23870;
+    public long l23871;
+    public long l23872;
+    public long l23873;
+    public long l23874;
+    public long l23875;
+    public long l23876;
+    public long l23877;
+    public long l23878;
+    public long l23879;
+    public long l23880;
+    public long l23881;
+    public long l23882;
+    public long l23883;
+    public long l23884;
+    public long l23885;
+    public long l23886;
+    public long l23887;
+    public long l23888;
+    public long l23889;
+    public long l23890;
+    public long l23891;
+    public long l23892;
+    public long l23893;
+    public long l23894;
+    public long l23895;
+    public long l23896;
+    public long l23897;
+    public long l23898;
+    public long l23899;
+    public long l23900;
+    public long l23901;
+    public long l23902;
+    public long l23903;
+    public long l23904;
+    public long l23905;
+    public long l23906;
+    public long l23907;
+    public long l23908;
+    public long l23909;
+    public long l23910;
+    public long l23911;
+    public long l23912;
+    public long l23913;
+    public long l23914;
+    public long l23915;
+    public long l23916;
+    public long l23917;
+    public long l23918;
+    public long l23919;
+    public long l23920;
+    public long l23921;
+    public long l23922;
+    public long l23923;
+    public long l23924;
+    public long l23925;
+    public long l23926;
+    public long l23927;
+    public long l23928;
+    public long l23929;
+    public long l23930;
+    public long l23931;
+    public long l23932;
+    public long l23933;
+    public long l23934;
+    public long l23935;
+    public long l23936;
+    public long l23937;
+    public long l23938;
+    public long l23939;
+    public long l23940;
+    public long l23941;
+    public long l23942;
+    public long l23943;
+    public long l23944;
+    public long l23945;
+    public long l23946;
+    public long l23947;
+    public long l23948;
+    public long l23949;
+    public long l23950;
+    public long l23951;
+    public long l23952;
+    public long l23953;
+    public long l23954;
+    public long l23955;
+    public long l23956;
+    public long l23957;
+    public long l23958;
+    public long l23959;
+    public long l23960;
+    public long l23961;
+    public long l23962;
+    public long l23963;
+    public long l23964;
+    public long l23965;
+    public long l23966;
+    public long l23967;
+    public long l23968;
+    public long l23969;
+    public long l23970;
+    public long l23971;
+    public long l23972;
+    public long l23973;
+    public long l23974;
+    public long l23975;
+    public long l23976;
+    public long l23977;
+    public long l23978;
+    public long l23979;
+    public long l23980;
+    public long l23981;
+    public long l23982;
+    public long l23983;
+    public long l23984;
+    public long l23985;
+    public long l23986;
+    public long l23987;
+    public long l23988;
+    public long l23989;
+    public long l23990;
+    public long l23991;
+    public long l23992;
+    public long l23993;
+    public long l23994;
+    public long l23995;
+    public long l23996;
+    public long l23997;
+    public long l23998;
+    public long l23999;
+    public long l24000;
+    public long l24001;
+    public long l24002;
+    public long l24003;
+    public long l24004;
+    public long l24005;
+    public long l24006;
+    public long l24007;
+    public long l24008;
+    public long l24009;
+    public long l24010;
+    public long l24011;
+    public long l24012;
+    public long l24013;
+    public long l24014;
+    public long l24015;
+    public long l24016;
+    public long l24017;
+    public long l24018;
+    public long l24019;
+    public long l24020;
+    public long l24021;
+    public long l24022;
+    public long l24023;
+    public long l24024;
+    public long l24025;
+    public long l24026;
+    public long l24027;
+    public long l24028;
+    public long l24029;
+    public long l24030;
+    public long l24031;
+    public long l24032;
+    public long l24033;
+    public long l24034;
+    public long l24035;
+    public long l24036;
+    public long l24037;
+    public long l24038;
+    public long l24039;
+    public long l24040;
+    public long l24041;
+    public long l24042;
+    public long l24043;
+    public long l24044;
+    public long l24045;
+    public long l24046;
+    public long l24047;
+    public long l24048;
+    public long l24049;
+    public long l24050;
+    public long l24051;
+    public long l24052;
+    public long l24053;
+    public long l24054;
+    public long l24055;
+    public long l24056;
+    public long l24057;
+    public long l24058;
+    public long l24059;
+    public long l24060;
+    public long l24061;
+    public long l24062;
+    public long l24063;
+    public long l24064;
+    public long l24065;
+    public long l24066;
+    public long l24067;
+    public long l24068;
+    public long l24069;
+    public long l24070;
+    public long l24071;
+    public long l24072;
+    public long l24073;
+    public long l24074;
+    public long l24075;
+    public long l24076;
+    public long l24077;
+    public long l24078;
+    public long l24079;
+    public long l24080;
+    public long l24081;
+    public long l24082;
+    public long l24083;
+    public long l24084;
+    public long l24085;
+    public long l24086;
+    public long l24087;
+    public long l24088;
+    public long l24089;
+    public long l24090;
+    public long l24091;
+    public long l24092;
+    public long l24093;
+    public long l24094;
+    public long l24095;
+    public long l24096;
+    public long l24097;
+    public long l24098;
+    public long l24099;
+    public long l24100;
+    public long l24101;
+    public long l24102;
+    public long l24103;
+    public long l24104;
+    public long l24105;
+    public long l24106;
+    public long l24107;
+    public long l24108;
+    public long l24109;
+    public long l24110;
+    public long l24111;
+    public long l24112;
+    public long l24113;
+    public long l24114;
+    public long l24115;
+    public long l24116;
+    public long l24117;
+    public long l24118;
+    public long l24119;
+    public long l24120;
+    public long l24121;
+    public long l24122;
+    public long l24123;
+    public long l24124;
+    public long l24125;
+    public long l24126;
+    public long l24127;
+    public long l24128;
+    public long l24129;
+    public long l24130;
+    public long l24131;
+    public long l24132;
+    public long l24133;
+    public long l24134;
+    public long l24135;
+    public long l24136;
+    public long l24137;
+    public long l24138;
+    public long l24139;
+    public long l24140;
+    public long l24141;
+    public long l24142;
+    public long l24143;
+    public long l24144;
+    public long l24145;
+    public long l24146;
+    public long l24147;
+    public long l24148;
+    public long l24149;
+    public long l24150;
+    public long l24151;
+    public long l24152;
+    public long l24153;
+    public long l24154;
+    public long l24155;
+    public long l24156;
+    public long l24157;
+    public long l24158;
+    public long l24159;
+    public long l24160;
+    public long l24161;
+    public long l24162;
+    public long l24163;
+    public long l24164;
+    public long l24165;
+    public long l24166;
+    public long l24167;
+    public long l24168;
+    public long l24169;
+    public long l24170;
+    public long l24171;
+    public long l24172;
+    public long l24173;
+    public long l24174;
+    public long l24175;
+    public long l24176;
+    public long l24177;
+    public long l24178;
+    public long l24179;
+    public long l24180;
+    public long l24181;
+    public long l24182;
+    public long l24183;
+    public long l24184;
+    public long l24185;
+    public long l24186;
+    public long l24187;
+    public long l24188;
+    public long l24189;
+    public long l24190;
+    public long l24191;
+    public long l24192;
+    public long l24193;
+    public long l24194;
+    public long l24195;
+    public long l24196;
+    public long l24197;
+    public long l24198;
+    public long l24199;
+    public long l24200;
+    public long l24201;
+    public long l24202;
+    public long l24203;
+    public long l24204;
+    public long l24205;
+    public long l24206;
+    public long l24207;
+    public long l24208;
+    public long l24209;
+    public long l24210;
+    public long l24211;
+    public long l24212;
+    public long l24213;
+    public long l24214;
+    public long l24215;
+    public long l24216;
+    public long l24217;
+    public long l24218;
+    public long l24219;
+    public long l24220;
+    public long l24221;
+    public long l24222;
+    public long l24223;
+    public long l24224;
+    public long l24225;
+    public long l24226;
+    public long l24227;
+    public long l24228;
+    public long l24229;
+    public long l24230;
+    public long l24231;
+    public long l24232;
+    public long l24233;
+    public long l24234;
+    public long l24235;
+    public long l24236;
+    public long l24237;
+    public long l24238;
+    public long l24239;
+    public long l24240;
+    public long l24241;
+    public long l24242;
+    public long l24243;
+    public long l24244;
+    public long l24245;
+    public long l24246;
+    public long l24247;
+    public long l24248;
+    public long l24249;
+    public long l24250;
+    public long l24251;
+    public long l24252;
+    public long l24253;
+    public long l24254;
+    public long l24255;
+    public long l24256;
+    public long l24257;
+    public long l24258;
+    public long l24259;
+    public long l24260;
+    public long l24261;
+    public long l24262;
+    public long l24263;
+    public long l24264;
+    public long l24265;
+    public long l24266;
+    public long l24267;
+    public long l24268;
+    public long l24269;
+    public long l24270;
+    public long l24271;
+    public long l24272;
+    public long l24273;
+    public long l24274;
+    public long l24275;
+    public long l24276;
+    public long l24277;
+    public long l24278;
+    public long l24279;
+    public long l24280;
+    public long l24281;
+    public long l24282;
+    public long l24283;
+    public long l24284;
+    public long l24285;
+    public long l24286;
+    public long l24287;
+    public long l24288;
+    public long l24289;
+    public long l24290;
+    public long l24291;
+    public long l24292;
+    public long l24293;
+    public long l24294;
+    public long l24295;
+    public long l24296;
+    public long l24297;
+    public long l24298;
+    public long l24299;
+    public long l24300;
+    public long l24301;
+    public long l24302;
+    public long l24303;
+    public long l24304;
+    public long l24305;
+    public long l24306;
+    public long l24307;
+    public long l24308;
+    public long l24309;
+    public long l24310;
+    public long l24311;
+    public long l24312;
+    public long l24313;
+    public long l24314;
+    public long l24315;
+    public long l24316;
+    public long l24317;
+    public long l24318;
+    public long l24319;
+    public long l24320;
+    public long l24321;
+    public long l24322;
+    public long l24323;
+    public long l24324;
+    public long l24325;
+    public long l24326;
+    public long l24327;
+    public long l24328;
+    public long l24329;
+    public long l24330;
+    public long l24331;
+    public long l24332;
+    public long l24333;
+    public long l24334;
+    public long l24335;
+    public long l24336;
+    public long l24337;
+    public long l24338;
+    public long l24339;
+    public long l24340;
+    public long l24341;
+    public long l24342;
+    public long l24343;
+    public long l24344;
+    public long l24345;
+    public long l24346;
+    public long l24347;
+    public long l24348;
+    public long l24349;
+    public long l24350;
+    public long l24351;
+    public long l24352;
+    public long l24353;
+    public long l24354;
+    public long l24355;
+    public long l24356;
+    public long l24357;
+    public long l24358;
+    public long l24359;
+    public long l24360;
+    public long l24361;
+    public long l24362;
+    public long l24363;
+    public long l24364;
+    public long l24365;
+    public long l24366;
+    public long l24367;
+    public long l24368;
+    public long l24369;
+    public long l24370;
+    public long l24371;
+    public long l24372;
+    public long l24373;
+    public long l24374;
+    public long l24375;
+    public long l24376;
+    public long l24377;
+    public long l24378;
+    public long l24379;
+    public long l24380;
+    public long l24381;
+    public long l24382;
+    public long l24383;
+    public long l24384;
+    public long l24385;
+    public long l24386;
+    public long l24387;
+    public long l24388;
+    public long l24389;
+    public long l24390;
+    public long l24391;
+    public long l24392;
+    public long l24393;
+    public long l24394;
+    public long l24395;
+    public long l24396;
+    public long l24397;
+    public long l24398;
+    public long l24399;
+    public long l24400;
+    public long l24401;
+    public long l24402;
+    public long l24403;
+    public long l24404;
+    public long l24405;
+    public long l24406;
+    public long l24407;
+    public long l24408;
+    public long l24409;
+    public long l24410;
+    public long l24411;
+    public long l24412;
+    public long l24413;
+    public long l24414;
+    public long l24415;
+    public long l24416;
+    public long l24417;
+    public long l24418;
+    public long l24419;
+    public long l24420;
+    public long l24421;
+    public long l24422;
+    public long l24423;
+    public long l24424;
+    public long l24425;
+    public long l24426;
+    public long l24427;
+    public long l24428;
+    public long l24429;
+    public long l24430;
+    public long l24431;
+    public long l24432;
+    public long l24433;
+    public long l24434;
+    public long l24435;
+    public long l24436;
+    public long l24437;
+    public long l24438;
+    public long l24439;
+    public long l24440;
+    public long l24441;
+    public long l24442;
+    public long l24443;
+    public long l24444;
+    public long l24445;
+    public long l24446;
+    public long l24447;
+    public long l24448;
+    public long l24449;
+    public long l24450;
+    public long l24451;
+    public long l24452;
+    public long l24453;
+    public long l24454;
+    public long l24455;
+    public long l24456;
+    public long l24457;
+    public long l24458;
+    public long l24459;
+    public long l24460;
+    public long l24461;
+    public long l24462;
+    public long l24463;
+    public long l24464;
+    public long l24465;
+    public long l24466;
+    public long l24467;
+    public long l24468;
+    public long l24469;
+    public long l24470;
+    public long l24471;
+    public long l24472;
+    public long l24473;
+    public long l24474;
+    public long l24475;
+    public long l24476;
+    public long l24477;
+    public long l24478;
+    public long l24479;
+    public long l24480;
+    public long l24481;
+    public long l24482;
+    public long l24483;
+    public long l24484;
+    public long l24485;
+    public long l24486;
+    public long l24487;
+    public long l24488;
+    public long l24489;
+    public long l24490;
+    public long l24491;
+    public long l24492;
+    public long l24493;
+    public long l24494;
+    public long l24495;
+    public long l24496;
+    public long l24497;
+    public long l24498;
+    public long l24499;
+    public long l24500;
+    public long l24501;
+    public long l24502;
+    public long l24503;
+    public long l24504;
+    public long l24505;
+    public long l24506;
+    public long l24507;
+    public long l24508;
+    public long l24509;
+    public long l24510;
+    public long l24511;
+    public long l24512;
+    public long l24513;
+    public long l24514;
+    public long l24515;
+    public long l24516;
+    public long l24517;
+    public long l24518;
+    public long l24519;
+    public long l24520;
+    public long l24521;
+    public long l24522;
+    public long l24523;
+    public long l24524;
+    public long l24525;
+    public long l24526;
+    public long l24527;
+    public long l24528;
+    public long l24529;
+    public long l24530;
+    public long l24531;
+    public long l24532;
+    public long l24533;
+    public long l24534;
+    public long l24535;
+    public long l24536;
+    public long l24537;
+    public long l24538;
+    public long l24539;
+    public long l24540;
+    public long l24541;
+    public long l24542;
+    public long l24543;
+    public long l24544;
+    public long l24545;
+    public long l24546;
+    public long l24547;
+    public long l24548;
+    public long l24549;
+    public long l24550;
+    public long l24551;
+    public long l24552;
+    public long l24553;
+    public long l24554;
+    public long l24555;
+    public long l24556;
+    public long l24557;
+    public long l24558;
+    public long l24559;
+    public long l24560;
+    public long l24561;
+    public long l24562;
+    public long l24563;
+    public long l24564;
+    public long l24565;
+    public long l24566;
+    public long l24567;
+    public long l24568;
+    public long l24569;
+    public long l24570;
+    public long l24571;
+    public long l24572;
+    public long l24573;
+    public long l24574;
+    public long l24575;
+    public long l24576;
+    public long l24577;
+    public long l24578;
+    public long l24579;
+    public long l24580;
+    public long l24581;
+    public long l24582;
+    public long l24583;
+    public long l24584;
+    public long l24585;
+    public long l24586;
+    public long l24587;
+    public long l24588;
+    public long l24589;
+    public long l24590;
+    public long l24591;
+    public long l24592;
+    public long l24593;
+    public long l24594;
+    public long l24595;
+    public long l24596;
+    public long l24597;
+    public long l24598;
+    public long l24599;
+    public long l24600;
+    public long l24601;
+    public long l24602;
+    public long l24603;
+    public long l24604;
+    public long l24605;
+    public long l24606;
+    public long l24607;
+    public long l24608;
+    public long l24609;
+    public long l24610;
+    public long l24611;
+    public long l24612;
+    public long l24613;
+    public long l24614;
+    public long l24615;
+    public long l24616;
+    public long l24617;
+    public long l24618;
+    public long l24619;
+    public long l24620;
+    public long l24621;
+    public long l24622;
+    public long l24623;
+    public long l24624;
+    public long l24625;
+    public long l24626;
+    public long l24627;
+    public long l24628;
+    public long l24629;
+    public long l24630;
+    public long l24631;
+    public long l24632;
+    public long l24633;
+    public long l24634;
+    public long l24635;
+    public long l24636;
+    public long l24637;
+    public long l24638;
+    public long l24639;
+    public long l24640;
+    public long l24641;
+    public long l24642;
+    public long l24643;
+    public long l24644;
+    public long l24645;
+    public long l24646;
+    public long l24647;
+    public long l24648;
+    public long l24649;
+    public long l24650;
+    public long l24651;
+    public long l24652;
+    public long l24653;
+    public long l24654;
+    public long l24655;
+    public long l24656;
+    public long l24657;
+    public long l24658;
+    public long l24659;
+    public long l24660;
+    public long l24661;
+    public long l24662;
+    public long l24663;
+    public long l24664;
+    public long l24665;
+    public long l24666;
+    public long l24667;
+    public long l24668;
+    public long l24669;
+    public long l24670;
+    public long l24671;
+    public long l24672;
+    public long l24673;
+    public long l24674;
+    public long l24675;
+    public long l24676;
+    public long l24677;
+    public long l24678;
+    public long l24679;
+    public long l24680;
+    public long l24681;
+    public long l24682;
+    public long l24683;
+    public long l24684;
+    public long l24685;
+    public long l24686;
+    public long l24687;
+    public long l24688;
+    public long l24689;
+    public long l24690;
+    public long l24691;
+    public long l24692;
+    public long l24693;
+    public long l24694;
+    public long l24695;
+    public long l24696;
+    public long l24697;
+    public long l24698;
+    public long l24699;
+    public long l24700;
+    public long l24701;
+    public long l24702;
+    public long l24703;
+    public long l24704;
+    public long l24705;
+    public long l24706;
+    public long l24707;
+    public long l24708;
+    public long l24709;
+    public long l24710;
+    public long l24711;
+    public long l24712;
+    public long l24713;
+    public long l24714;
+    public long l24715;
+    public long l24716;
+    public long l24717;
+    public long l24718;
+    public long l24719;
+    public long l24720;
+    public long l24721;
+    public long l24722;
+    public long l24723;
+    public long l24724;
+    public long l24725;
+    public long l24726;
+    public long l24727;
+    public long l24728;
+    public long l24729;
+    public long l24730;
+    public long l24731;
+    public long l24732;
+    public long l24733;
+    public long l24734;
+    public long l24735;
+    public long l24736;
+    public long l24737;
+    public long l24738;
+    public long l24739;
+    public long l24740;
+    public long l24741;
+    public long l24742;
+    public long l24743;
+    public long l24744;
+    public long l24745;
+    public long l24746;
+    public long l24747;
+    public long l24748;
+    public long l24749;
+    public long l24750;
+    public long l24751;
+    public long l24752;
+    public long l24753;
+    public long l24754;
+    public long l24755;
+    public long l24756;
+    public long l24757;
+    public long l24758;
+    public long l24759;
+    public long l24760;
+    public long l24761;
+    public long l24762;
+    public long l24763;
+    public long l24764;
+    public long l24765;
+    public long l24766;
+    public long l24767;
+    public long l24768;
+    public long l24769;
+    public long l24770;
+    public long l24771;
+    public long l24772;
+    public long l24773;
+    public long l24774;
+    public long l24775;
+    public long l24776;
+    public long l24777;
+    public long l24778;
+    public long l24779;
+    public long l24780;
+    public long l24781;
+    public long l24782;
+    public long l24783;
+    public long l24784;
+    public long l24785;
+    public long l24786;
+    public long l24787;
+    public long l24788;
+    public long l24789;
+    public long l24790;
+    public long l24791;
+    public long l24792;
+    public long l24793;
+    public long l24794;
+    public long l24795;
+    public long l24796;
+    public long l24797;
+    public long l24798;
+    public long l24799;
+    public long l24800;
+    public long l24801;
+    public long l24802;
+    public long l24803;
+    public long l24804;
+    public long l24805;
+    public long l24806;
+    public long l24807;
+    public long l24808;
+    public long l24809;
+    public long l24810;
+    public long l24811;
+    public long l24812;
+    public long l24813;
+    public long l24814;
+    public long l24815;
+    public long l24816;
+    public long l24817;
+    public long l24818;
+    public long l24819;
+    public long l24820;
+    public long l24821;
+    public long l24822;
+    public long l24823;
+    public long l24824;
+    public long l24825;
+    public long l24826;
+    public long l24827;
+    public long l24828;
+    public long l24829;
+    public long l24830;
+    public long l24831;
+    public long l24832;
+    public long l24833;
+    public long l24834;
+    public long l24835;
+    public long l24836;
+    public long l24837;
+    public long l24838;
+    public long l24839;
+    public long l24840;
+    public long l24841;
+    public long l24842;
+    public long l24843;
+    public long l24844;
+    public long l24845;
+    public long l24846;
+    public long l24847;
+    public long l24848;
+    public long l24849;
+    public long l24850;
+    public long l24851;
+    public long l24852;
+    public long l24853;
+    public long l24854;
+    public long l24855;
+    public long l24856;
+    public long l24857;
+    public long l24858;
+    public long l24859;
+    public long l24860;
+    public long l24861;
+    public long l24862;
+    public long l24863;
+    public long l24864;
+    public long l24865;
+    public long l24866;
+    public long l24867;
+    public long l24868;
+    public long l24869;
+    public long l24870;
+    public long l24871;
+    public long l24872;
+    public long l24873;
+    public long l24874;
+    public long l24875;
+    public long l24876;
+    public long l24877;
+    public long l24878;
+    public long l24879;
+    public long l24880;
+    public long l24881;
+    public long l24882;
+    public long l24883;
+    public long l24884;
+    public long l24885;
+    public long l24886;
+    public long l24887;
+    public long l24888;
+    public long l24889;
+    public long l24890;
+    public long l24891;
+    public long l24892;
+    public long l24893;
+    public long l24894;
+    public long l24895;
+    public long l24896;
+    public long l24897;
+    public long l24898;
+    public long l24899;
+    public long l24900;
+    public long l24901;
+    public long l24902;
+    public long l24903;
+    public long l24904;
+    public long l24905;
+    public long l24906;
+    public long l24907;
+    public long l24908;
+    public long l24909;
+    public long l24910;
+    public long l24911;
+    public long l24912;
+    public long l24913;
+    public long l24914;
+    public long l24915;
+    public long l24916;
+    public long l24917;
+    public long l24918;
+    public long l24919;
+    public long l24920;
+    public long l24921;
+    public long l24922;
+    public long l24923;
+    public long l24924;
+    public long l24925;
+    public long l24926;
+    public long l24927;
+    public long l24928;
+    public long l24929;
+    public long l24930;
+    public long l24931;
+    public long l24932;
+    public long l24933;
+    public long l24934;
+    public long l24935;
+    public long l24936;
+    public long l24937;
+    public long l24938;
+    public long l24939;
+    public long l24940;
+    public long l24941;
+    public long l24942;
+    public long l24943;
+    public long l24944;
+    public long l24945;
+    public long l24946;
+    public long l24947;
+    public long l24948;
+    public long l24949;
+    public long l24950;
+    public long l24951;
+    public long l24952;
+    public long l24953;
+    public long l24954;
+    public long l24955;
+    public long l24956;
+    public long l24957;
+    public long l24958;
+    public long l24959;
+    public long l24960;
+    public long l24961;
+    public long l24962;
+    public long l24963;
+    public long l24964;
+    public long l24965;
+    public long l24966;
+    public long l24967;
+    public long l24968;
+    public long l24969;
+    public long l24970;
+    public long l24971;
+    public long l24972;
+    public long l24973;
+    public long l24974;
+    public long l24975;
+    public long l24976;
+    public long l24977;
+    public long l24978;
+    public long l24979;
+    public long l24980;
+    public long l24981;
+    public long l24982;
+    public long l24983;
+    public long l24984;
+    public long l24985;
+    public long l24986;
+    public long l24987;
+    public long l24988;
+    public long l24989;
+    public long l24990;
+    public long l24991;
+    public long l24992;
+    public long l24993;
+    public long l24994;
+    public long l24995;
+    public long l24996;
+    public long l24997;
+    public long l24998;
+    public long l24999;
+    public long l25000;
+    public long l25001;
+    public long l25002;
+    public long l25003;
+    public long l25004;
+    public long l25005;
+    public long l25006;
+    public long l25007;
+    public long l25008;
+    public long l25009;
+    public long l25010;
+    public long l25011;
+    public long l25012;
+    public long l25013;
+    public long l25014;
+    public long l25015;
+    public long l25016;
+    public long l25017;
+    public long l25018;
+    public long l25019;
+    public long l25020;
+    public long l25021;
+    public long l25022;
+    public long l25023;
+    public long l25024;
+    public long l25025;
+    public long l25026;
+    public long l25027;
+    public long l25028;
+    public long l25029;
+    public long l25030;
+    public long l25031;
+    public long l25032;
+    public long l25033;
+    public long l25034;
+    public long l25035;
+    public long l25036;
+    public long l25037;
+    public long l25038;
+    public long l25039;
+    public long l25040;
+    public long l25041;
+    public long l25042;
+    public long l25043;
+    public long l25044;
+    public long l25045;
+    public long l25046;
+    public long l25047;
+    public long l25048;
+    public long l25049;
+    public long l25050;
+    public long l25051;
+    public long l25052;
+    public long l25053;
+    public long l25054;
+    public long l25055;
+    public long l25056;
+    public long l25057;
+    public long l25058;
+    public long l25059;
+    public long l25060;
+    public long l25061;
+    public long l25062;
+    public long l25063;
+    public long l25064;
+    public long l25065;
+    public long l25066;
+    public long l25067;
+    public long l25068;
+    public long l25069;
+    public long l25070;
+    public long l25071;
+    public long l25072;
+    public long l25073;
+    public long l25074;
+    public long l25075;
+    public long l25076;
+    public long l25077;
+    public long l25078;
+    public long l25079;
+    public long l25080;
+    public long l25081;
+    public long l25082;
+    public long l25083;
+    public long l25084;
+    public long l25085;
+    public long l25086;
+    public long l25087;
+    public long l25088;
+    public long l25089;
+    public long l25090;
+    public long l25091;
+    public long l25092;
+    public long l25093;
+    public long l25094;
+    public long l25095;
+    public long l25096;
+    public long l25097;
+    public long l25098;
+    public long l25099;
+    public long l25100;
+    public long l25101;
+    public long l25102;
+    public long l25103;
+    public long l25104;
+    public long l25105;
+    public long l25106;
+    public long l25107;
+    public long l25108;
+    public long l25109;
+    public long l25110;
+    public long l25111;
+    public long l25112;
+    public long l25113;
+    public long l25114;
+    public long l25115;
+    public long l25116;
+    public long l25117;
+    public long l25118;
+    public long l25119;
+    public long l25120;
+    public long l25121;
+    public long l25122;
+    public long l25123;
+    public long l25124;
+    public long l25125;
+    public long l25126;
+    public long l25127;
+    public long l25128;
+    public long l25129;
+    public long l25130;
+    public long l25131;
+    public long l25132;
+    public long l25133;
+    public long l25134;
+    public long l25135;
+    public long l25136;
+    public long l25137;
+    public long l25138;
+    public long l25139;
+    public long l25140;
+    public long l25141;
+    public long l25142;
+    public long l25143;
+    public long l25144;
+    public long l25145;
+    public long l25146;
+    public long l25147;
+    public long l25148;
+    public long l25149;
+    public long l25150;
+    public long l25151;
+    public long l25152;
+    public long l25153;
+    public long l25154;
+    public long l25155;
+    public long l25156;
+    public long l25157;
+    public long l25158;
+    public long l25159;
+    public long l25160;
+    public long l25161;
+    public long l25162;
+    public long l25163;
+    public long l25164;
+    public long l25165;
+    public long l25166;
+    public long l25167;
+    public long l25168;
+    public long l25169;
+    public long l25170;
+    public long l25171;
+    public long l25172;
+    public long l25173;
+    public long l25174;
+    public long l25175;
+    public long l25176;
+    public long l25177;
+    public long l25178;
+    public long l25179;
+    public long l25180;
+    public long l25181;
+    public long l25182;
+    public long l25183;
+    public long l25184;
+    public long l25185;
+    public long l25186;
+    public long l25187;
+    public long l25188;
+    public long l25189;
+    public long l25190;
+    public long l25191;
+    public long l25192;
+    public long l25193;
+    public long l25194;
+    public long l25195;
+    public long l25196;
+    public long l25197;
+    public long l25198;
+    public long l25199;
+    public long l25200;
+    public long l25201;
+    public long l25202;
+    public long l25203;
+    public long l25204;
+    public long l25205;
+    public long l25206;
+    public long l25207;
+    public long l25208;
+    public long l25209;
+    public long l25210;
+    public long l25211;
+    public long l25212;
+    public long l25213;
+    public long l25214;
+    public long l25215;
+    public long l25216;
+    public long l25217;
+    public long l25218;
+    public long l25219;
+    public long l25220;
+    public long l25221;
+    public long l25222;
+    public long l25223;
+    public long l25224;
+    public long l25225;
+    public long l25226;
+    public long l25227;
+    public long l25228;
+    public long l25229;
+    public long l25230;
+    public long l25231;
+    public long l25232;
+    public long l25233;
+    public long l25234;
+    public long l25235;
+    public long l25236;
+    public long l25237;
+    public long l25238;
+    public long l25239;
+    public long l25240;
+    public long l25241;
+    public long l25242;
+    public long l25243;
+    public long l25244;
+    public long l25245;
+    public long l25246;
+    public long l25247;
+    public long l25248;
+    public long l25249;
+    public long l25250;
+    public long l25251;
+    public long l25252;
+    public long l25253;
+    public long l25254;
+    public long l25255;
+    public long l25256;
+    public long l25257;
+    public long l25258;
+    public long l25259;
+    public long l25260;
+    public long l25261;
+    public long l25262;
+    public long l25263;
+    public long l25264;
+    public long l25265;
+    public long l25266;
+    public long l25267;
+    public long l25268;
+    public long l25269;
+    public long l25270;
+    public long l25271;
+    public long l25272;
+    public long l25273;
+    public long l25274;
+    public long l25275;
+    public long l25276;
+    public long l25277;
+    public long l25278;
+    public long l25279;
+    public long l25280;
+    public long l25281;
+    public long l25282;
+    public long l25283;
+    public long l25284;
+    public long l25285;
+    public long l25286;
+    public long l25287;
+    public long l25288;
+    public long l25289;
+    public long l25290;
+    public long l25291;
+    public long l25292;
+    public long l25293;
+    public long l25294;
+    public long l25295;
+    public long l25296;
+    public long l25297;
+    public long l25298;
+    public long l25299;
+    public long l25300;
+    public long l25301;
+    public long l25302;
+    public long l25303;
+    public long l25304;
+    public long l25305;
+    public long l25306;
+    public long l25307;
+    public long l25308;
+    public long l25309;
+    public long l25310;
+    public long l25311;
+    public long l25312;
+    public long l25313;
+    public long l25314;
+    public long l25315;
+    public long l25316;
+    public long l25317;
+    public long l25318;
+    public long l25319;
+    public long l25320;
+    public long l25321;
+    public long l25322;
+    public long l25323;
+    public long l25324;
+    public long l25325;
+    public long l25326;
+    public long l25327;
+    public long l25328;
+    public long l25329;
+    public long l25330;
+    public long l25331;
+    public long l25332;
+    public long l25333;
+    public long l25334;
+    public long l25335;
+    public long l25336;
+    public long l25337;
+    public long l25338;
+    public long l25339;
+    public long l25340;
+    public long l25341;
+    public long l25342;
+    public long l25343;
+    public long l25344;
+    public long l25345;
+    public long l25346;
+    public long l25347;
+    public long l25348;
+    public long l25349;
+    public long l25350;
+    public long l25351;
+    public long l25352;
+    public long l25353;
+    public long l25354;
+    public long l25355;
+    public long l25356;
+    public long l25357;
+    public long l25358;
+    public long l25359;
+    public long l25360;
+    public long l25361;
+    public long l25362;
+    public long l25363;
+    public long l25364;
+    public long l25365;
+    public long l25366;
+    public long l25367;
+    public long l25368;
+    public long l25369;
+    public long l25370;
+    public long l25371;
+    public long l25372;
+    public long l25373;
+    public long l25374;
+    public long l25375;
+    public long l25376;
+    public long l25377;
+    public long l25378;
+    public long l25379;
+    public long l25380;
+    public long l25381;
+    public long l25382;
+    public long l25383;
+    public long l25384;
+    public long l25385;
+    public long l25386;
+    public long l25387;
+    public long l25388;
+    public long l25389;
+    public long l25390;
+    public long l25391;
+    public long l25392;
+    public long l25393;
+    public long l25394;
+    public long l25395;
+    public long l25396;
+    public long l25397;
+    public long l25398;
+    public long l25399;
+    public long l25400;
+    public long l25401;
+    public long l25402;
+    public long l25403;
+    public long l25404;
+    public long l25405;
+    public long l25406;
+    public long l25407;
+    public long l25408;
+    public long l25409;
+    public long l25410;
+    public long l25411;
+    public long l25412;
+    public long l25413;
+    public long l25414;
+    public long l25415;
+    public long l25416;
+    public long l25417;
+    public long l25418;
+    public long l25419;
+    public long l25420;
+    public long l25421;
+    public long l25422;
+    public long l25423;
+    public long l25424;
+    public long l25425;
+    public long l25426;
+    public long l25427;
+    public long l25428;
+    public long l25429;
+    public long l25430;
+    public long l25431;
+    public long l25432;
+    public long l25433;
+    public long l25434;
+    public long l25435;
+    public long l25436;
+    public long l25437;
+    public long l25438;
+    public long l25439;
+    public long l25440;
+    public long l25441;
+    public long l25442;
+    public long l25443;
+    public long l25444;
+    public long l25445;
+    public long l25446;
+    public long l25447;
+    public long l25448;
+    public long l25449;
+    public long l25450;
+    public long l25451;
+    public long l25452;
+    public long l25453;
+    public long l25454;
+    public long l25455;
+    public long l25456;
+    public long l25457;
+    public long l25458;
+    public long l25459;
+    public long l25460;
+    public long l25461;
+    public long l25462;
+    public long l25463;
+    public long l25464;
+    public long l25465;
+    public long l25466;
+    public long l25467;
+    public long l25468;
+    public long l25469;
+    public long l25470;
+    public long l25471;
+    public long l25472;
+    public long l25473;
+    public long l25474;
+    public long l25475;
+    public long l25476;
+    public long l25477;
+    public long l25478;
+    public long l25479;
+    public long l25480;
+    public long l25481;
+    public long l25482;
+    public long l25483;
+    public long l25484;
+    public long l25485;
+    public long l25486;
+    public long l25487;
+    public long l25488;
+    public long l25489;
+    public long l25490;
+    public long l25491;
+    public long l25492;
+    public long l25493;
+    public long l25494;
+    public long l25495;
+    public long l25496;
+    public long l25497;
+    public long l25498;
+    public long l25499;
+    public long l25500;
+    public long l25501;
+    public long l25502;
+    public long l25503;
+    public long l25504;
+    public long l25505;
+    public long l25506;
+    public long l25507;
+    public long l25508;
+    public long l25509;
+    public long l25510;
+    public long l25511;
+    public long l25512;
+    public long l25513;
+    public long l25514;
+    public long l25515;
+    public long l25516;
+    public long l25517;
+    public long l25518;
+    public long l25519;
+    public long l25520;
+    public long l25521;
+    public long l25522;
+    public long l25523;
+    public long l25524;
+    public long l25525;
+    public long l25526;
+    public long l25527;
+    public long l25528;
+    public long l25529;
+    public long l25530;
+    public long l25531;
+    public long l25532;
+    public long l25533;
+    public long l25534;
+    public long l25535;
+    public long l25536;
+    public long l25537;
+    public long l25538;
+    public long l25539;
+    public long l25540;
+    public long l25541;
+    public long l25542;
+    public long l25543;
+    public long l25544;
+    public long l25545;
+    public long l25546;
+    public long l25547;
+    public long l25548;
+    public long l25549;
+    public long l25550;
+    public long l25551;
+    public long l25552;
+    public long l25553;
+    public long l25554;
+    public long l25555;
+    public long l25556;
+    public long l25557;
+    public long l25558;
+    public long l25559;
+    public long l25560;
+    public long l25561;
+    public long l25562;
+    public long l25563;
+    public long l25564;
+    public long l25565;
+    public long l25566;
+    public long l25567;
+    public long l25568;
+    public long l25569;
+    public long l25570;
+    public long l25571;
+    public long l25572;
+    public long l25573;
+    public long l25574;
+    public long l25575;
+    public long l25576;
+    public long l25577;
+    public long l25578;
+    public long l25579;
+    public long l25580;
+    public long l25581;
+    public long l25582;
+    public long l25583;
+    public long l25584;
+    public long l25585;
+    public long l25586;
+    public long l25587;
+    public long l25588;
+    public long l25589;
+    public long l25590;
+    public long l25591;
+    public long l25592;
+    public long l25593;
+    public long l25594;
+    public long l25595;
+    public long l25596;
+    public long l25597;
+    public long l25598;
+    public long l25599;
+    public long l25600;
+    public long l25601;
+    public long l25602;
+    public long l25603;
+    public long l25604;
+    public long l25605;
+    public long l25606;
+    public long l25607;
+    public long l25608;
+    public long l25609;
+    public long l25610;
+    public long l25611;
+    public long l25612;
+    public long l25613;
+    public long l25614;
+    public long l25615;
+    public long l25616;
+    public long l25617;
+    public long l25618;
+    public long l25619;
+    public long l25620;
+    public long l25621;
+    public long l25622;
+    public long l25623;
+    public long l25624;
+    public long l25625;
+    public long l25626;
+    public long l25627;
+    public long l25628;
+    public long l25629;
+    public long l25630;
+    public long l25631;
+    public long l25632;
+    public long l25633;
+    public long l25634;
+    public long l25635;
+    public long l25636;
+    public long l25637;
+    public long l25638;
+    public long l25639;
+    public long l25640;
+    public long l25641;
+    public long l25642;
+    public long l25643;
+    public long l25644;
+    public long l25645;
+    public long l25646;
+    public long l25647;
+    public long l25648;
+    public long l25649;
+    public long l25650;
+    public long l25651;
+    public long l25652;
+    public long l25653;
+    public long l25654;
+    public long l25655;
+    public long l25656;
+    public long l25657;
+    public long l25658;
+    public long l25659;
+    public long l25660;
+    public long l25661;
+    public long l25662;
+    public long l25663;
+    public long l25664;
+    public long l25665;
+    public long l25666;
+    public long l25667;
+    public long l25668;
+    public long l25669;
+    public long l25670;
+    public long l25671;
+    public long l25672;
+    public long l25673;
+    public long l25674;
+    public long l25675;
+    public long l25676;
+    public long l25677;
+    public long l25678;
+    public long l25679;
+    public long l25680;
+    public long l25681;
+    public long l25682;
+    public long l25683;
+    public long l25684;
+    public long l25685;
+    public long l25686;
+    public long l25687;
+    public long l25688;
+    public long l25689;
+    public long l25690;
+    public long l25691;
+    public long l25692;
+    public long l25693;
+    public long l25694;
+    public long l25695;
+    public long l25696;
+    public long l25697;
+    public long l25698;
+    public long l25699;
+    public long l25700;
+    public long l25701;
+    public long l25702;
+    public long l25703;
+    public long l25704;
+    public long l25705;
+    public long l25706;
+    public long l25707;
+    public long l25708;
+    public long l25709;
+    public long l25710;
+    public long l25711;
+    public long l25712;
+    public long l25713;
+    public long l25714;
+    public long l25715;
+    public long l25716;
+    public long l25717;
+    public long l25718;
+    public long l25719;
+    public long l25720;
+    public long l25721;
+    public long l25722;
+    public long l25723;
+    public long l25724;
+    public long l25725;
+    public long l25726;
+    public long l25727;
+    public long l25728;
+    public long l25729;
+    public long l25730;
+    public long l25731;
+    public long l25732;
+    public long l25733;
+    public long l25734;
+    public long l25735;
+    public long l25736;
+    public long l25737;
+    public long l25738;
+    public long l25739;
+    public long l25740;
+    public long l25741;
+    public long l25742;
+    public long l25743;
+    public long l25744;
+    public long l25745;
+    public long l25746;
+    public long l25747;
+    public long l25748;
+    public long l25749;
+    public long l25750;
+    public long l25751;
+    public long l25752;
+    public long l25753;
+    public long l25754;
+    public long l25755;
+    public long l25756;
+    public long l25757;
+    public long l25758;
+    public long l25759;
+    public long l25760;
+    public long l25761;
+    public long l25762;
+    public long l25763;
+    public long l25764;
+    public long l25765;
+    public long l25766;
+    public long l25767;
+    public long l25768;
+    public long l25769;
+    public long l25770;
+    public long l25771;
+    public long l25772;
+    public long l25773;
+    public long l25774;
+    public long l25775;
+    public long l25776;
+    public long l25777;
+    public long l25778;
+    public long l25779;
+    public long l25780;
+    public long l25781;
+    public long l25782;
+    public long l25783;
+    public long l25784;
+    public long l25785;
+    public long l25786;
+    public long l25787;
+    public long l25788;
+    public long l25789;
+    public long l25790;
+    public long l25791;
+    public long l25792;
+    public long l25793;
+    public long l25794;
+    public long l25795;
+    public long l25796;
+    public long l25797;
+    public long l25798;
+    public long l25799;
+    public long l25800;
+    public long l25801;
+    public long l25802;
+    public long l25803;
+    public long l25804;
+    public long l25805;
+    public long l25806;
+    public long l25807;
+    public long l25808;
+    public long l25809;
+    public long l25810;
+    public long l25811;
+    public long l25812;
+    public long l25813;
+    public long l25814;
+    public long l25815;
+    public long l25816;
+    public long l25817;
+    public long l25818;
+    public long l25819;
+    public long l25820;
+    public long l25821;
+    public long l25822;
+    public long l25823;
+    public long l25824;
+    public long l25825;
+    public long l25826;
+    public long l25827;
+    public long l25828;
+    public long l25829;
+    public long l25830;
+    public long l25831;
+    public long l25832;
+    public long l25833;
+    public long l25834;
+    public long l25835;
+    public long l25836;
+    public long l25837;
+    public long l25838;
+    public long l25839;
+    public long l25840;
+    public long l25841;
+    public long l25842;
+    public long l25843;
+    public long l25844;
+    public long l25845;
+    public long l25846;
+    public long l25847;
+    public long l25848;
+    public long l25849;
+    public long l25850;
+    public long l25851;
+    public long l25852;
+    public long l25853;
+    public long l25854;
+    public long l25855;
+    public long l25856;
+    public long l25857;
+    public long l25858;
+    public long l25859;
+    public long l25860;
+    public long l25861;
+    public long l25862;
+    public long l25863;
+    public long l25864;
+    public long l25865;
+    public long l25866;
+    public long l25867;
+    public long l25868;
+    public long l25869;
+    public long l25870;
+    public long l25871;
+    public long l25872;
+    public long l25873;
+    public long l25874;
+    public long l25875;
+    public long l25876;
+    public long l25877;
+    public long l25878;
+    public long l25879;
+    public long l25880;
+    public long l25881;
+    public long l25882;
+    public long l25883;
+    public long l25884;
+    public long l25885;
+    public long l25886;
+    public long l25887;
+    public long l25888;
+    public long l25889;
+    public long l25890;
+    public long l25891;
+    public long l25892;
+    public long l25893;
+    public long l25894;
+    public long l25895;
+    public long l25896;
+    public long l25897;
+    public long l25898;
+    public long l25899;
+    public long l25900;
+    public long l25901;
+    public long l25902;
+    public long l25903;
+    public long l25904;
+    public long l25905;
+    public long l25906;
+    public long l25907;
+    public long l25908;
+    public long l25909;
+    public long l25910;
+    public long l25911;
+    public long l25912;
+    public long l25913;
+    public long l25914;
+    public long l25915;
+    public long l25916;
+    public long l25917;
+    public long l25918;
+    public long l25919;
+    public long l25920;
+    public long l25921;
+    public long l25922;
+    public long l25923;
+    public long l25924;
+    public long l25925;
+    public long l25926;
+    public long l25927;
+    public long l25928;
+    public long l25929;
+    public long l25930;
+    public long l25931;
+    public long l25932;
+    public long l25933;
+    public long l25934;
+    public long l25935;
+    public long l25936;
+    public long l25937;
+    public long l25938;
+    public long l25939;
+    public long l25940;
+    public long l25941;
+    public long l25942;
+    public long l25943;
+    public long l25944;
+    public long l25945;
+    public long l25946;
+    public long l25947;
+    public long l25948;
+    public long l25949;
+    public long l25950;
+    public long l25951;
+    public long l25952;
+    public long l25953;
+    public long l25954;
+    public long l25955;
+    public long l25956;
+    public long l25957;
+    public long l25958;
+    public long l25959;
+    public long l25960;
+    public long l25961;
+    public long l25962;
+    public long l25963;
+    public long l25964;
+    public long l25965;
+    public long l25966;
+    public long l25967;
+    public long l25968;
+    public long l25969;
+    public long l25970;
+    public long l25971;
+    public long l25972;
+    public long l25973;
+    public long l25974;
+    public long l25975;
+    public long l25976;
+    public long l25977;
+    public long l25978;
+    public long l25979;
+    public long l25980;
+    public long l25981;
+    public long l25982;
+    public long l25983;
+    public long l25984;
+    public long l25985;
+    public long l25986;
+    public long l25987;
+    public long l25988;
+    public long l25989;
+    public long l25990;
+    public long l25991;
+    public long l25992;
+    public long l25993;
+    public long l25994;
+    public long l25995;
+    public long l25996;
+    public long l25997;
+    public long l25998;
+    public long l25999;
+    public long l26000;
+    public long l26001;
+    public long l26002;
+    public long l26003;
+    public long l26004;
+    public long l26005;
+    public long l26006;
+    public long l26007;
+    public long l26008;
+    public long l26009;
+    public long l26010;
+    public long l26011;
+    public long l26012;
+    public long l26013;
+    public long l26014;
+    public long l26015;
+    public long l26016;
+    public long l26017;
+    public long l26018;
+    public long l26019;
+    public long l26020;
+    public long l26021;
+    public long l26022;
+    public long l26023;
+    public long l26024;
+    public long l26025;
+    public long l26026;
+    public long l26027;
+    public long l26028;
+    public long l26029;
+    public long l26030;
+    public long l26031;
+    public long l26032;
+    public long l26033;
+    public long l26034;
+    public long l26035;
+    public long l26036;
+    public long l26037;
+    public long l26038;
+    public long l26039;
+    public long l26040;
+    public long l26041;
+    public long l26042;
+    public long l26043;
+    public long l26044;
+    public long l26045;
+    public long l26046;
+    public long l26047;
+    public long l26048;
+    public long l26049;
+    public long l26050;
+    public long l26051;
+    public long l26052;
+    public long l26053;
+    public long l26054;
+    public long l26055;
+    public long l26056;
+    public long l26057;
+    public long l26058;
+    public long l26059;
+    public long l26060;
+    public long l26061;
+    public long l26062;
+    public long l26063;
+    public long l26064;
+    public long l26065;
+    public long l26066;
+    public long l26067;
+    public long l26068;
+    public long l26069;
+    public long l26070;
+    public long l26071;
+    public long l26072;
+    public long l26073;
+    public long l26074;
+    public long l26075;
+    public long l26076;
+    public long l26077;
+    public long l26078;
+    public long l26079;
+    public long l26080;
+    public long l26081;
+    public long l26082;
+    public long l26083;
+    public long l26084;
+    public long l26085;
+    public long l26086;
+    public long l26087;
+    public long l26088;
+    public long l26089;
+    public long l26090;
+    public long l26091;
+    public long l26092;
+    public long l26093;
+    public long l26094;
+    public long l26095;
+    public long l26096;
+    public long l26097;
+    public long l26098;
+    public long l26099;
+    public long l26100;
+    public long l26101;
+    public long l26102;
+    public long l26103;
+    public long l26104;
+    public long l26105;
+    public long l26106;
+    public long l26107;
+    public long l26108;
+    public long l26109;
+    public long l26110;
+    public long l26111;
+    public long l26112;
+    public long l26113;
+    public long l26114;
+    public long l26115;
+    public long l26116;
+    public long l26117;
+    public long l26118;
+    public long l26119;
+    public long l26120;
+    public long l26121;
+    public long l26122;
+    public long l26123;
+    public long l26124;
+    public long l26125;
+    public long l26126;
+    public long l26127;
+    public long l26128;
+    public long l26129;
+    public long l26130;
+    public long l26131;
+    public long l26132;
+    public long l26133;
+    public long l26134;
+    public long l26135;
+    public long l26136;
+    public long l26137;
+    public long l26138;
+    public long l26139;
+    public long l26140;
+    public long l26141;
+    public long l26142;
+    public long l26143;
+    public long l26144;
+    public long l26145;
+    public long l26146;
+    public long l26147;
+    public long l26148;
+    public long l26149;
+    public long l26150;
+    public long l26151;
+    public long l26152;
+    public long l26153;
+    public long l26154;
+    public long l26155;
+    public long l26156;
+    public long l26157;
+    public long l26158;
+    public long l26159;
+    public long l26160;
+    public long l26161;
+    public long l26162;
+    public long l26163;
+    public long l26164;
+    public long l26165;
+    public long l26166;
+    public long l26167;
+    public long l26168;
+    public long l26169;
+    public long l26170;
+    public long l26171;
+    public long l26172;
+    public long l26173;
+    public long l26174;
+    public long l26175;
+    public long l26176;
+    public long l26177;
+    public long l26178;
+    public long l26179;
+    public long l26180;
+    public long l26181;
+    public long l26182;
+    public long l26183;
+    public long l26184;
+    public long l26185;
+    public long l26186;
+    public long l26187;
+    public long l26188;
+    public long l26189;
+    public long l26190;
+    public long l26191;
+    public long l26192;
+    public long l26193;
+    public long l26194;
+    public long l26195;
+    public long l26196;
+    public long l26197;
+    public long l26198;
+    public long l26199;
+    public long l26200;
+    public long l26201;
+    public long l26202;
+    public long l26203;
+    public long l26204;
+    public long l26205;
+    public long l26206;
+    public long l26207;
+    public long l26208;
+    public long l26209;
+    public long l26210;
+    public long l26211;
+    public long l26212;
+    public long l26213;
+    public long l26214;
+    public long l26215;
+    public long l26216;
+    public long l26217;
+    public long l26218;
+    public long l26219;
+    public long l26220;
+    public long l26221;
+    public long l26222;
+    public long l26223;
+    public long l26224;
+    public long l26225;
+    public long l26226;
+    public long l26227;
+    public long l26228;
+    public long l26229;
+    public long l26230;
+    public long l26231;
+    public long l26232;
+    public long l26233;
+    public long l26234;
+    public long l26235;
+    public long l26236;
+    public long l26237;
+    public long l26238;
+    public long l26239;
+    public long l26240;
+    public long l26241;
+    public long l26242;
+    public long l26243;
+    public long l26244;
+    public long l26245;
+    public long l26246;
+    public long l26247;
+    public long l26248;
+    public long l26249;
+    public long l26250;
+    public long l26251;
+    public long l26252;
+    public long l26253;
+    public long l26254;
+    public long l26255;
+    public long l26256;
+    public long l26257;
+    public long l26258;
+    public long l26259;
+    public long l26260;
+    public long l26261;
+    public long l26262;
+    public long l26263;
+    public long l26264;
+    public long l26265;
+    public long l26266;
+    public long l26267;
+    public long l26268;
+    public long l26269;
+    public long l26270;
+    public long l26271;
+    public long l26272;
+    public long l26273;
+    public long l26274;
+    public long l26275;
+    public long l26276;
+    public long l26277;
+    public long l26278;
+    public long l26279;
+    public long l26280;
+    public long l26281;
+    public long l26282;
+    public long l26283;
+    public long l26284;
+    public long l26285;
+    public long l26286;
+    public long l26287;
+    public long l26288;
+    public long l26289;
+    public long l26290;
+    public long l26291;
+    public long l26292;
+    public long l26293;
+    public long l26294;
+    public long l26295;
+    public long l26296;
+    public long l26297;
+    public long l26298;
+    public long l26299;
+    public long l26300;
+    public long l26301;
+    public long l26302;
+    public long l26303;
+    public long l26304;
+    public long l26305;
+    public long l26306;
+    public long l26307;
+    public long l26308;
+    public long l26309;
+    public long l26310;
+    public long l26311;
+    public long l26312;
+    public long l26313;
+    public long l26314;
+    public long l26315;
+    public long l26316;
+    public long l26317;
+    public long l26318;
+    public long l26319;
+    public long l26320;
+    public long l26321;
+    public long l26322;
+    public long l26323;
+    public long l26324;
+    public long l26325;
+    public long l26326;
+    public long l26327;
+    public long l26328;
+    public long l26329;
+    public long l26330;
+    public long l26331;
+    public long l26332;
+    public long l26333;
+    public long l26334;
+    public long l26335;
+    public long l26336;
+    public long l26337;
+    public long l26338;
+    public long l26339;
+    public long l26340;
+    public long l26341;
+    public long l26342;
+    public long l26343;
+    public long l26344;
+    public long l26345;
+    public long l26346;
+    public long l26347;
+    public long l26348;
+    public long l26349;
+    public long l26350;
+    public long l26351;
+    public long l26352;
+    public long l26353;
+    public long l26354;
+    public long l26355;
+    public long l26356;
+    public long l26357;
+    public long l26358;
+    public long l26359;
+    public long l26360;
+    public long l26361;
+    public long l26362;
+    public long l26363;
+    public long l26364;
+    public long l26365;
+    public long l26366;
+    public long l26367;
+    public long l26368;
+    public long l26369;
+    public long l26370;
+    public long l26371;
+    public long l26372;
+    public long l26373;
+    public long l26374;
+    public long l26375;
+    public long l26376;
+    public long l26377;
+    public long l26378;
+    public long l26379;
+    public long l26380;
+    public long l26381;
+    public long l26382;
+    public long l26383;
+    public long l26384;
+    public long l26385;
+    public long l26386;
+    public long l26387;
+    public long l26388;
+    public long l26389;
+    public long l26390;
+    public long l26391;
+    public long l26392;
+    public long l26393;
+    public long l26394;
+    public long l26395;
+    public long l26396;
+    public long l26397;
+    public long l26398;
+    public long l26399;
+    public long l26400;
+    public long l26401;
+    public long l26402;
+    public long l26403;
+    public long l26404;
+    public long l26405;
+    public long l26406;
+    public long l26407;
+    public long l26408;
+    public long l26409;
+    public long l26410;
+    public long l26411;
+    public long l26412;
+    public long l26413;
+    public long l26414;
+    public long l26415;
+    public long l26416;
+    public long l26417;
+    public long l26418;
+    public long l26419;
+    public long l26420;
+    public long l26421;
+    public long l26422;
+    public long l26423;
+    public long l26424;
+    public long l26425;
+    public long l26426;
+    public long l26427;
+    public long l26428;
+    public long l26429;
+    public long l26430;
+    public long l26431;
+    public long l26432;
+    public long l26433;
+    public long l26434;
+    public long l26435;
+    public long l26436;
+    public long l26437;
+    public long l26438;
+    public long l26439;
+    public long l26440;
+    public long l26441;
+    public long l26442;
+    public long l26443;
+    public long l26444;
+    public long l26445;
+    public long l26446;
+    public long l26447;
+    public long l26448;
+    public long l26449;
+    public long l26450;
+    public long l26451;
+    public long l26452;
+    public long l26453;
+    public long l26454;
+    public long l26455;
+    public long l26456;
+    public long l26457;
+    public long l26458;
+    public long l26459;
+    public long l26460;
+    public long l26461;
+    public long l26462;
+    public long l26463;
+    public long l26464;
+    public long l26465;
+    public long l26466;
+    public long l26467;
+    public long l26468;
+    public long l26469;
+    public long l26470;
+    public long l26471;
+    public long l26472;
+    public long l26473;
+    public long l26474;
+    public long l26475;
+    public long l26476;
+    public long l26477;
+    public long l26478;
+    public long l26479;
+    public long l26480;
+    public long l26481;
+    public long l26482;
+    public long l26483;
+    public long l26484;
+    public long l26485;
+    public long l26486;
+    public long l26487;
+    public long l26488;
+    public long l26489;
+    public long l26490;
+    public long l26491;
+    public long l26492;
+    public long l26493;
+    public long l26494;
+    public long l26495;
+    public long l26496;
+    public long l26497;
+    public long l26498;
+    public long l26499;
+    public long l26500;
+    public long l26501;
+    public long l26502;
+    public long l26503;
+    public long l26504;
+    public long l26505;
+    public long l26506;
+    public long l26507;
+    public long l26508;
+    public long l26509;
+    public long l26510;
+    public long l26511;
+    public long l26512;
+    public long l26513;
+    public long l26514;
+    public long l26515;
+    public long l26516;
+    public long l26517;
+    public long l26518;
+    public long l26519;
+    public long l26520;
+    public long l26521;
+    public long l26522;
+    public long l26523;
+    public long l26524;
+    public long l26525;
+    public long l26526;
+    public long l26527;
+    public long l26528;
+    public long l26529;
+    public long l26530;
+    public long l26531;
+    public long l26532;
+    public long l26533;
+    public long l26534;
+    public long l26535;
+    public long l26536;
+    public long l26537;
+    public long l26538;
+    public long l26539;
+    public long l26540;
+    public long l26541;
+    public long l26542;
+    public long l26543;
+    public long l26544;
+    public long l26545;
+    public long l26546;
+    public long l26547;
+    public long l26548;
+    public long l26549;
+    public long l26550;
+    public long l26551;
+    public long l26552;
+    public long l26553;
+    public long l26554;
+    public long l26555;
+    public long l26556;
+    public long l26557;
+    public long l26558;
+    public long l26559;
+    public long l26560;
+    public long l26561;
+    public long l26562;
+    public long l26563;
+    public long l26564;
+    public long l26565;
+    public long l26566;
+    public long l26567;
+    public long l26568;
+    public long l26569;
+    public long l26570;
+    public long l26571;
+    public long l26572;
+    public long l26573;
+    public long l26574;
+    public long l26575;
+    public long l26576;
+    public long l26577;
+    public long l26578;
+    public long l26579;
+    public long l26580;
+    public long l26581;
+    public long l26582;
+    public long l26583;
+    public long l26584;
+    public long l26585;
+    public long l26586;
+    public long l26587;
+    public long l26588;
+    public long l26589;
+    public long l26590;
+    public long l26591;
+    public long l26592;
+    public long l26593;
+    public long l26594;
+    public long l26595;
+    public long l26596;
+    public long l26597;
+    public long l26598;
+    public long l26599;
+    public long l26600;
+    public long l26601;
+    public long l26602;
+    public long l26603;
+    public long l26604;
+    public long l26605;
+    public long l26606;
+    public long l26607;
+    public long l26608;
+    public long l26609;
+    public long l26610;
+    public long l26611;
+    public long l26612;
+    public long l26613;
+    public long l26614;
+    public long l26615;
+    public long l26616;
+    public long l26617;
+    public long l26618;
+    public long l26619;
+    public long l26620;
+    public long l26621;
+    public long l26622;
+    public long l26623;
+    public long l26624;
+    public long l26625;
+    public long l26626;
+    public long l26627;
+    public long l26628;
+    public long l26629;
+    public long l26630;
+    public long l26631;
+    public long l26632;
+    public long l26633;
+    public long l26634;
+    public long l26635;
+    public long l26636;
+    public long l26637;
+    public long l26638;
+    public long l26639;
+    public long l26640;
+    public long l26641;
+    public long l26642;
+    public long l26643;
+    public long l26644;
+    public long l26645;
+    public long l26646;
+    public long l26647;
+    public long l26648;
+    public long l26649;
+    public long l26650;
+    public long l26651;
+    public long l26652;
+    public long l26653;
+    public long l26654;
+    public long l26655;
+    public long l26656;
+    public long l26657;
+    public long l26658;
+    public long l26659;
+    public long l26660;
+    public long l26661;
+    public long l26662;
+    public long l26663;
+    public long l26664;
+    public long l26665;
+    public long l26666;
+    public long l26667;
+    public long l26668;
+    public long l26669;
+    public long l26670;
+    public long l26671;
+    public long l26672;
+    public long l26673;
+    public long l26674;
+    public long l26675;
+    public long l26676;
+    public long l26677;
+    public long l26678;
+    public long l26679;
+    public long l26680;
+    public long l26681;
+    public long l26682;
+    public long l26683;
+    public long l26684;
+    public long l26685;
+    public long l26686;
+    public long l26687;
+    public long l26688;
+    public long l26689;
+    public long l26690;
+    public long l26691;
+    public long l26692;
+    public long l26693;
+    public long l26694;
+    public long l26695;
+    public long l26696;
+    public long l26697;
+    public long l26698;
+    public long l26699;
+    public long l26700;
+    public long l26701;
+    public long l26702;
+    public long l26703;
+    public long l26704;
+    public long l26705;
+    public long l26706;
+    public long l26707;
+    public long l26708;
+    public long l26709;
+    public long l26710;
+    public long l26711;
+    public long l26712;
+    public long l26713;
+    public long l26714;
+    public long l26715;
+    public long l26716;
+    public long l26717;
+    public long l26718;
+    public long l26719;
+    public long l26720;
+    public long l26721;
+    public long l26722;
+    public long l26723;
+    public long l26724;
+    public long l26725;
+    public long l26726;
+    public long l26727;
+    public long l26728;
+    public long l26729;
+    public long l26730;
+    public long l26731;
+    public long l26732;
+    public long l26733;
+    public long l26734;
+    public long l26735;
+    public long l26736;
+    public long l26737;
+    public long l26738;
+    public long l26739;
+    public long l26740;
+    public long l26741;
+    public long l26742;
+    public long l26743;
+    public long l26744;
+    public long l26745;
+    public long l26746;
+    public long l26747;
+    public long l26748;
+    public long l26749;
+    public long l26750;
+    public long l26751;
+    public long l26752;
+    public long l26753;
+    public long l26754;
+    public long l26755;
+    public long l26756;
+    public long l26757;
+    public long l26758;
+    public long l26759;
+    public long l26760;
+    public long l26761;
+    public long l26762;
+    public long l26763;
+    public long l26764;
+    public long l26765;
+    public long l26766;
+    public long l26767;
+    public long l26768;
+    public long l26769;
+    public long l26770;
+    public long l26771;
+    public long l26772;
+    public long l26773;
+    public long l26774;
+    public long l26775;
+    public long l26776;
+    public long l26777;
+    public long l26778;
+    public long l26779;
+    public long l26780;
+    public long l26781;
+    public long l26782;
+    public long l26783;
+    public long l26784;
+    public long l26785;
+    public long l26786;
+    public long l26787;
+    public long l26788;
+    public long l26789;
+    public long l26790;
+    public long l26791;
+    public long l26792;
+    public long l26793;
+    public long l26794;
+    public long l26795;
+    public long l26796;
+    public long l26797;
+    public long l26798;
+    public long l26799;
+    public long l26800;
+    public long l26801;
+    public long l26802;
+    public long l26803;
+    public long l26804;
+    public long l26805;
+    public long l26806;
+    public long l26807;
+    public long l26808;
+    public long l26809;
+    public long l26810;
+    public long l26811;
+    public long l26812;
+    public long l26813;
+    public long l26814;
+    public long l26815;
+    public long l26816;
+    public long l26817;
+    public long l26818;
+    public long l26819;
+    public long l26820;
+    public long l26821;
+    public long l26822;
+    public long l26823;
+    public long l26824;
+    public long l26825;
+    public long l26826;
+    public long l26827;
+    public long l26828;
+    public long l26829;
+    public long l26830;
+    public long l26831;
+    public long l26832;
+    public long l26833;
+    public long l26834;
+    public long l26835;
+    public long l26836;
+    public long l26837;
+    public long l26838;
+    public long l26839;
+    public long l26840;
+    public long l26841;
+    public long l26842;
+    public long l26843;
+    public long l26844;
+    public long l26845;
+    public long l26846;
+    public long l26847;
+    public long l26848;
+    public long l26849;
+    public long l26850;
+    public long l26851;
+    public long l26852;
+    public long l26853;
+    public long l26854;
+    public long l26855;
+    public long l26856;
+    public long l26857;
+    public long l26858;
+    public long l26859;
+    public long l26860;
+    public long l26861;
+    public long l26862;
+    public long l26863;
+    public long l26864;
+    public long l26865;
+    public long l26866;
+    public long l26867;
+    public long l26868;
+    public long l26869;
+    public long l26870;
+    public long l26871;
+    public long l26872;
+    public long l26873;
+    public long l26874;
+    public long l26875;
+    public long l26876;
+    public long l26877;
+    public long l26878;
+    public long l26879;
+    public long l26880;
+    public long l26881;
+    public long l26882;
+    public long l26883;
+    public long l26884;
+    public long l26885;
+    public long l26886;
+    public long l26887;
+    public long l26888;
+    public long l26889;
+    public long l26890;
+    public long l26891;
+    public long l26892;
+    public long l26893;
+    public long l26894;
+    public long l26895;
+    public long l26896;
+    public long l26897;
+    public long l26898;
+    public long l26899;
+    public long l26900;
+    public long l26901;
+    public long l26902;
+    public long l26903;
+    public long l26904;
+    public long l26905;
+    public long l26906;
+    public long l26907;
+    public long l26908;
+    public long l26909;
+    public long l26910;
+    public long l26911;
+    public long l26912;
+    public long l26913;
+    public long l26914;
+    public long l26915;
+    public long l26916;
+    public long l26917;
+    public long l26918;
+    public long l26919;
+    public long l26920;
+    public long l26921;
+    public long l26922;
+    public long l26923;
+    public long l26924;
+    public long l26925;
+    public long l26926;
+    public long l26927;
+    public long l26928;
+    public long l26929;
+    public long l26930;
+    public long l26931;
+    public long l26932;
+    public long l26933;
+    public long l26934;
+    public long l26935;
+    public long l26936;
+    public long l26937;
+    public long l26938;
+    public long l26939;
+    public long l26940;
+    public long l26941;
+    public long l26942;
+    public long l26943;
+    public long l26944;
+    public long l26945;
+    public long l26946;
+    public long l26947;
+    public long l26948;
+    public long l26949;
+    public long l26950;
+    public long l26951;
+    public long l26952;
+    public long l26953;
+    public long l26954;
+    public long l26955;
+    public long l26956;
+    public long l26957;
+    public long l26958;
+    public long l26959;
+    public long l26960;
+    public long l26961;
+    public long l26962;
+    public long l26963;
+    public long l26964;
+    public long l26965;
+    public long l26966;
+    public long l26967;
+    public long l26968;
+    public long l26969;
+    public long l26970;
+    public long l26971;
+    public long l26972;
+    public long l26973;
+    public long l26974;
+    public long l26975;
+    public long l26976;
+    public long l26977;
+    public long l26978;
+    public long l26979;
+    public long l26980;
+    public long l26981;
+    public long l26982;
+    public long l26983;
+    public long l26984;
+    public long l26985;
+    public long l26986;
+    public long l26987;
+    public long l26988;
+    public long l26989;
+    public long l26990;
+    public long l26991;
+    public long l26992;
+    public long l26993;
+    public long l26994;
+    public long l26995;
+    public long l26996;
+    public long l26997;
+    public long l26998;
+    public long l26999;
+    public long l27000;
+    public long l27001;
+    public long l27002;
+    public long l27003;
+    public long l27004;
+    public long l27005;
+    public long l27006;
+    public long l27007;
+    public long l27008;
+    public long l27009;
+    public long l27010;
+    public long l27011;
+    public long l27012;
+    public long l27013;
+    public long l27014;
+    public long l27015;
+    public long l27016;
+    public long l27017;
+    public long l27018;
+    public long l27019;
+    public long l27020;
+    public long l27021;
+    public long l27022;
+    public long l27023;
+    public long l27024;
+    public long l27025;
+    public long l27026;
+    public long l27027;
+    public long l27028;
+    public long l27029;
+    public long l27030;
+    public long l27031;
+    public long l27032;
+    public long l27033;
+    public long l27034;
+    public long l27035;
+    public long l27036;
+    public long l27037;
+    public long l27038;
+    public long l27039;
+    public long l27040;
+    public long l27041;
+    public long l27042;
+    public long l27043;
+    public long l27044;
+    public long l27045;
+    public long l27046;
+    public long l27047;
+    public long l27048;
+    public long l27049;
+    public long l27050;
+    public long l27051;
+    public long l27052;
+    public long l27053;
+    public long l27054;
+    public long l27055;
+    public long l27056;
+    public long l27057;
+    public long l27058;
+    public long l27059;
+    public long l27060;
+    public long l27061;
+    public long l27062;
+    public long l27063;
+    public long l27064;
+    public long l27065;
+    public long l27066;
+    public long l27067;
+    public long l27068;
+    public long l27069;
+    public long l27070;
+    public long l27071;
+    public long l27072;
+    public long l27073;
+    public long l27074;
+    public long l27075;
+    public long l27076;
+    public long l27077;
+    public long l27078;
+    public long l27079;
+    public long l27080;
+    public long l27081;
+    public long l27082;
+    public long l27083;
+    public long l27084;
+    public long l27085;
+    public long l27086;
+    public long l27087;
+    public long l27088;
+    public long l27089;
+    public long l27090;
+    public long l27091;
+    public long l27092;
+    public long l27093;
+    public long l27094;
+    public long l27095;
+    public long l27096;
+    public long l27097;
+    public long l27098;
+    public long l27099;
+    public long l27100;
+    public long l27101;
+    public long l27102;
+    public long l27103;
+    public long l27104;
+    public long l27105;
+    public long l27106;
+    public long l27107;
+    public long l27108;
+    public long l27109;
+    public long l27110;
+    public long l27111;
+    public long l27112;
+    public long l27113;
+    public long l27114;
+    public long l27115;
+    public long l27116;
+    public long l27117;
+    public long l27118;
+    public long l27119;
+    public long l27120;
+    public long l27121;
+    public long l27122;
+    public long l27123;
+    public long l27124;
+    public long l27125;
+    public long l27126;
+    public long l27127;
+    public long l27128;
+    public long l27129;
+    public long l27130;
+    public long l27131;
+    public long l27132;
+    public long l27133;
+    public long l27134;
+    public long l27135;
+    public long l27136;
+    public long l27137;
+    public long l27138;
+    public long l27139;
+    public long l27140;
+    public long l27141;
+    public long l27142;
+    public long l27143;
+    public long l27144;
+    public long l27145;
+    public long l27146;
+    public long l27147;
+    public long l27148;
+    public long l27149;
+    public long l27150;
+    public long l27151;
+    public long l27152;
+    public long l27153;
+    public long l27154;
+    public long l27155;
+    public long l27156;
+    public long l27157;
+    public long l27158;
+    public long l27159;
+    public long l27160;
+    public long l27161;
+    public long l27162;
+    public long l27163;
+    public long l27164;
+    public long l27165;
+    public long l27166;
+    public long l27167;
+    public long l27168;
+    public long l27169;
+    public long l27170;
+    public long l27171;
+    public long l27172;
+    public long l27173;
+    public long l27174;
+    public long l27175;
+    public long l27176;
+    public long l27177;
+    public long l27178;
+    public long l27179;
+    public long l27180;
+    public long l27181;
+    public long l27182;
+    public long l27183;
+    public long l27184;
+    public long l27185;
+    public long l27186;
+    public long l27187;
+    public long l27188;
+    public long l27189;
+    public long l27190;
+    public long l27191;
+    public long l27192;
+    public long l27193;
+    public long l27194;
+    public long l27195;
+    public long l27196;
+    public long l27197;
+    public long l27198;
+    public long l27199;
+    public long l27200;
+    public long l27201;
+    public long l27202;
+    public long l27203;
+    public long l27204;
+    public long l27205;
+    public long l27206;
+    public long l27207;
+    public long l27208;
+    public long l27209;
+    public long l27210;
+    public long l27211;
+    public long l27212;
+    public long l27213;
+    public long l27214;
+    public long l27215;
+    public long l27216;
+    public long l27217;
+    public long l27218;
+    public long l27219;
+    public long l27220;
+    public long l27221;
+    public long l27222;
+    public long l27223;
+    public long l27224;
+    public long l27225;
+    public long l27226;
+    public long l27227;
+    public long l27228;
+    public long l27229;
+    public long l27230;
+    public long l27231;
+    public long l27232;
+    public long l27233;
+    public long l27234;
+    public long l27235;
+    public long l27236;
+    public long l27237;
+    public long l27238;
+    public long l27239;
+    public long l27240;
+    public long l27241;
+    public long l27242;
+    public long l27243;
+    public long l27244;
+    public long l27245;
+    public long l27246;
+    public long l27247;
+    public long l27248;
+    public long l27249;
+    public long l27250;
+    public long l27251;
+    public long l27252;
+    public long l27253;
+    public long l27254;
+    public long l27255;
+    public long l27256;
+    public long l27257;
+    public long l27258;
+    public long l27259;
+    public long l27260;
+    public long l27261;
+    public long l27262;
+    public long l27263;
+    public long l27264;
+    public long l27265;
+    public long l27266;
+    public long l27267;
+    public long l27268;
+    public long l27269;
+    public long l27270;
+    public long l27271;
+    public long l27272;
+    public long l27273;
+    public long l27274;
+    public long l27275;
+    public long l27276;
+    public long l27277;
+    public long l27278;
+    public long l27279;
+    public long l27280;
+    public long l27281;
+    public long l27282;
+    public long l27283;
+    public long l27284;
+    public long l27285;
+    public long l27286;
+    public long l27287;
+    public long l27288;
+    public long l27289;
+    public long l27290;
+    public long l27291;
+    public long l27292;
+    public long l27293;
+    public long l27294;
+    public long l27295;
+    public long l27296;
+    public long l27297;
+    public long l27298;
+    public long l27299;
+    public long l27300;
+    public long l27301;
+    public long l27302;
+    public long l27303;
+    public long l27304;
+    public long l27305;
+    public long l27306;
+    public long l27307;
+    public long l27308;
+    public long l27309;
+    public long l27310;
+    public long l27311;
+    public long l27312;
+    public long l27313;
+    public long l27314;
+    public long l27315;
+    public long l27316;
+    public long l27317;
+    public long l27318;
+    public long l27319;
+    public long l27320;
+    public long l27321;
+    public long l27322;
+    public long l27323;
+    public long l27324;
+    public long l27325;
+    public long l27326;
+    public long l27327;
+    public long l27328;
+    public long l27329;
+    public long l27330;
+    public long l27331;
+    public long l27332;
+    public long l27333;
+    public long l27334;
+    public long l27335;
+    public long l27336;
+    public long l27337;
+    public long l27338;
+    public long l27339;
+    public long l27340;
+    public long l27341;
+    public long l27342;
+    public long l27343;
+    public long l27344;
+    public long l27345;
+    public long l27346;
+    public long l27347;
+    public long l27348;
+    public long l27349;
+    public long l27350;
+    public long l27351;
+    public long l27352;
+    public long l27353;
+    public long l27354;
+    public long l27355;
+    public long l27356;
+    public long l27357;
+    public long l27358;
+    public long l27359;
+    public long l27360;
+    public long l27361;
+    public long l27362;
+    public long l27363;
+    public long l27364;
+    public long l27365;
+    public long l27366;
+    public long l27367;
+    public long l27368;
+    public long l27369;
+    public long l27370;
+    public long l27371;
+    public long l27372;
+    public long l27373;
+    public long l27374;
+    public long l27375;
+    public long l27376;
+    public long l27377;
+    public long l27378;
+    public long l27379;
+    public long l27380;
+    public long l27381;
+    public long l27382;
+    public long l27383;
+    public long l27384;
+    public long l27385;
+    public long l27386;
+    public long l27387;
+    public long l27388;
+    public long l27389;
+    public long l27390;
+    public long l27391;
+    public long l27392;
+    public long l27393;
+    public long l27394;
+    public long l27395;
+    public long l27396;
+    public long l27397;
+    public long l27398;
+    public long l27399;
+    public long l27400;
+    public long l27401;
+    public long l27402;
+    public long l27403;
+    public long l27404;
+    public long l27405;
+    public long l27406;
+    public long l27407;
+    public long l27408;
+    public long l27409;
+    public long l27410;
+    public long l27411;
+    public long l27412;
+    public long l27413;
+    public long l27414;
+    public long l27415;
+    public long l27416;
+    public long l27417;
+    public long l27418;
+    public long l27419;
+    public long l27420;
+    public long l27421;
+    public long l27422;
+    public long l27423;
+    public long l27424;
+    public long l27425;
+    public long l27426;
+    public long l27427;
+    public long l27428;
+    public long l27429;
+    public long l27430;
+    public long l27431;
+    public long l27432;
+    public long l27433;
+    public long l27434;
+    public long l27435;
+    public long l27436;
+    public long l27437;
+    public long l27438;
+    public long l27439;
+    public long l27440;
+    public long l27441;
+    public long l27442;
+    public long l27443;
+    public long l27444;
+    public long l27445;
+    public long l27446;
+    public long l27447;
+    public long l27448;
+    public long l27449;
+    public long l27450;
+    public long l27451;
+    public long l27452;
+    public long l27453;
+    public long l27454;
+    public long l27455;
+    public long l27456;
+    public long l27457;
+    public long l27458;
+    public long l27459;
+    public long l27460;
+    public long l27461;
+    public long l27462;
+    public long l27463;
+    public long l27464;
+    public long l27465;
+    public long l27466;
+    public long l27467;
+    public long l27468;
+    public long l27469;
+    public long l27470;
+    public long l27471;
+    public long l27472;
+    public long l27473;
+    public long l27474;
+    public long l27475;
+    public long l27476;
+    public long l27477;
+    public long l27478;
+    public long l27479;
+    public long l27480;
+    public long l27481;
+    public long l27482;
+    public long l27483;
+    public long l27484;
+    public long l27485;
+    public long l27486;
+    public long l27487;
+    public long l27488;
+    public long l27489;
+    public long l27490;
+    public long l27491;
+    public long l27492;
+    public long l27493;
+    public long l27494;
+    public long l27495;
+    public long l27496;
+    public long l27497;
+    public long l27498;
+    public long l27499;
+    public long l27500;
+    public long l27501;
+    public long l27502;
+    public long l27503;
+    public long l27504;
+    public long l27505;
+    public long l27506;
+    public long l27507;
+    public long l27508;
+    public long l27509;
+    public long l27510;
+    public long l27511;
+    public long l27512;
+    public long l27513;
+    public long l27514;
+    public long l27515;
+    public long l27516;
+    public long l27517;
+    public long l27518;
+    public long l27519;
+    public long l27520;
+    public long l27521;
+    public long l27522;
+    public long l27523;
+    public long l27524;
+    public long l27525;
+    public long l27526;
+    public long l27527;
+    public long l27528;
+    public long l27529;
+    public long l27530;
+    public long l27531;
+    public long l27532;
+    public long l27533;
+    public long l27534;
+    public long l27535;
+    public long l27536;
+    public long l27537;
+    public long l27538;
+    public long l27539;
+    public long l27540;
+    public long l27541;
+    public long l27542;
+    public long l27543;
+    public long l27544;
+    public long l27545;
+    public long l27546;
+    public long l27547;
+    public long l27548;
+    public long l27549;
+    public long l27550;
+    public long l27551;
+    public long l27552;
+    public long l27553;
+    public long l27554;
+    public long l27555;
+    public long l27556;
+    public long l27557;
+    public long l27558;
+    public long l27559;
+    public long l27560;
+    public long l27561;
+    public long l27562;
+    public long l27563;
+    public long l27564;
+    public long l27565;
+    public long l27566;
+    public long l27567;
+    public long l27568;
+    public long l27569;
+    public long l27570;
+    public long l27571;
+    public long l27572;
+    public long l27573;
+    public long l27574;
+    public long l27575;
+    public long l27576;
+    public long l27577;
+    public long l27578;
+    public long l27579;
+    public long l27580;
+    public long l27581;
+    public long l27582;
+    public long l27583;
+    public long l27584;
+    public long l27585;
+    public long l27586;
+    public long l27587;
+    public long l27588;
+    public long l27589;
+    public long l27590;
+    public long l27591;
+    public long l27592;
+    public long l27593;
+    public long l27594;
+    public long l27595;
+    public long l27596;
+    public long l27597;
+    public long l27598;
+    public long l27599;
+    public long l27600;
+    public long l27601;
+    public long l27602;
+    public long l27603;
+    public long l27604;
+    public long l27605;
+    public long l27606;
+    public long l27607;
+    public long l27608;
+    public long l27609;
+    public long l27610;
+    public long l27611;
+    public long l27612;
+    public long l27613;
+    public long l27614;
+    public long l27615;
+    public long l27616;
+    public long l27617;
+    public long l27618;
+    public long l27619;
+    public long l27620;
+    public long l27621;
+    public long l27622;
+    public long l27623;
+    public long l27624;
+    public long l27625;
+    public long l27626;
+    public long l27627;
+    public long l27628;
+    public long l27629;
+    public long l27630;
+    public long l27631;
+    public long l27632;
+    public long l27633;
+    public long l27634;
+    public long l27635;
+    public long l27636;
+    public long l27637;
+    public long l27638;
+    public long l27639;
+    public long l27640;
+    public long l27641;
+    public long l27642;
+    public long l27643;
+    public long l27644;
+    public long l27645;
+    public long l27646;
+    public long l27647;
+    public long l27648;
+    public long l27649;
+    public long l27650;
+    public long l27651;
+    public long l27652;
+    public long l27653;
+    public long l27654;
+    public long l27655;
+    public long l27656;
+    public long l27657;
+    public long l27658;
+    public long l27659;
+    public long l27660;
+    public long l27661;
+    public long l27662;
+    public long l27663;
+    public long l27664;
+    public long l27665;
+    public long l27666;
+    public long l27667;
+    public long l27668;
+    public long l27669;
+    public long l27670;
+    public long l27671;
+    public long l27672;
+    public long l27673;
+    public long l27674;
+    public long l27675;
+    public long l27676;
+    public long l27677;
+    public long l27678;
+    public long l27679;
+    public long l27680;
+    public long l27681;
+    public long l27682;
+    public long l27683;
+    public long l27684;
+    public long l27685;
+    public long l27686;
+    public long l27687;
+    public long l27688;
+    public long l27689;
+    public long l27690;
+    public long l27691;
+    public long l27692;
+    public long l27693;
+    public long l27694;
+    public long l27695;
+    public long l27696;
+    public long l27697;
+    public long l27698;
+    public long l27699;
+    public long l27700;
+    public long l27701;
+    public long l27702;
+    public long l27703;
+    public long l27704;
+    public long l27705;
+    public long l27706;
+    public long l27707;
+    public long l27708;
+    public long l27709;
+    public long l27710;
+    public long l27711;
+    public long l27712;
+    public long l27713;
+    public long l27714;
+    public long l27715;
+    public long l27716;
+    public long l27717;
+    public long l27718;
+    public long l27719;
+    public long l27720;
+    public long l27721;
+    public long l27722;
+    public long l27723;
+    public long l27724;
+    public long l27725;
+    public long l27726;
+    public long l27727;
+    public long l27728;
+    public long l27729;
+    public long l27730;
+    public long l27731;
+    public long l27732;
+    public long l27733;
+    public long l27734;
+    public long l27735;
+    public long l27736;
+    public long l27737;
+    public long l27738;
+    public long l27739;
+    public long l27740;
+    public long l27741;
+    public long l27742;
+    public long l27743;
+    public long l27744;
+    public long l27745;
+    public long l27746;
+    public long l27747;
+    public long l27748;
+    public long l27749;
+    public long l27750;
+    public long l27751;
+    public long l27752;
+    public long l27753;
+    public long l27754;
+    public long l27755;
+    public long l27756;
+    public long l27757;
+    public long l27758;
+    public long l27759;
+    public long l27760;
+    public long l27761;
+    public long l27762;
+    public long l27763;
+    public long l27764;
+    public long l27765;
+    public long l27766;
+    public long l27767;
+    public long l27768;
+    public long l27769;
+    public long l27770;
+    public long l27771;
+    public long l27772;
+    public long l27773;
+    public long l27774;
+    public long l27775;
+    public long l27776;
+    public long l27777;
+    public long l27778;
+    public long l27779;
+    public long l27780;
+    public long l27781;
+    public long l27782;
+    public long l27783;
+    public long l27784;
+    public long l27785;
+    public long l27786;
+    public long l27787;
+    public long l27788;
+    public long l27789;
+    public long l27790;
+    public long l27791;
+    public long l27792;
+    public long l27793;
+    public long l27794;
+    public long l27795;
+    public long l27796;
+    public long l27797;
+    public long l27798;
+    public long l27799;
+    public long l27800;
+    public long l27801;
+    public long l27802;
+    public long l27803;
+    public long l27804;
+    public long l27805;
+    public long l27806;
+    public long l27807;
+    public long l27808;
+    public long l27809;
+    public long l27810;
+    public long l27811;
+    public long l27812;
+    public long l27813;
+    public long l27814;
+    public long l27815;
+    public long l27816;
+    public long l27817;
+    public long l27818;
+    public long l27819;
+    public long l27820;
+    public long l27821;
+    public long l27822;
+    public long l27823;
+    public long l27824;
+    public long l27825;
+    public long l27826;
+    public long l27827;
+    public long l27828;
+    public long l27829;
+    public long l27830;
+    public long l27831;
+    public long l27832;
+    public long l27833;
+    public long l27834;
+    public long l27835;
+    public long l27836;
+    public long l27837;
+    public long l27838;
+    public long l27839;
+    public long l27840;
+    public long l27841;
+    public long l27842;
+    public long l27843;
+    public long l27844;
+    public long l27845;
+    public long l27846;
+    public long l27847;
+    public long l27848;
+    public long l27849;
+    public long l27850;
+    public long l27851;
+    public long l27852;
+    public long l27853;
+    public long l27854;
+    public long l27855;
+    public long l27856;
+    public long l27857;
+    public long l27858;
+    public long l27859;
+    public long l27860;
+    public long l27861;
+    public long l27862;
+    public long l27863;
+    public long l27864;
+    public long l27865;
+    public long l27866;
+    public long l27867;
+    public long l27868;
+    public long l27869;
+    public long l27870;
+    public long l27871;
+    public long l27872;
+    public long l27873;
+    public long l27874;
+    public long l27875;
+    public long l27876;
+    public long l27877;
+    public long l27878;
+    public long l27879;
+    public long l27880;
+    public long l27881;
+    public long l27882;
+    public long l27883;
+    public long l27884;
+    public long l27885;
+    public long l27886;
+    public long l27887;
+    public long l27888;
+    public long l27889;
+    public long l27890;
+    public long l27891;
+    public long l27892;
+    public long l27893;
+    public long l27894;
+    public long l27895;
+    public long l27896;
+    public long l27897;
+    public long l27898;
+    public long l27899;
+    public long l27900;
+    public long l27901;
+    public long l27902;
+    public long l27903;
+    public long l27904;
+    public long l27905;
+    public long l27906;
+    public long l27907;
+    public long l27908;
+    public long l27909;
+    public long l27910;
+    public long l27911;
+    public long l27912;
+    public long l27913;
+    public long l27914;
+    public long l27915;
+    public long l27916;
+    public long l27917;
+    public long l27918;
+    public long l27919;
+    public long l27920;
+    public long l27921;
+    public long l27922;
+    public long l27923;
+    public long l27924;
+    public long l27925;
+    public long l27926;
+    public long l27927;
+    public long l27928;
+    public long l27929;
+    public long l27930;
+    public long l27931;
+    public long l27932;
+    public long l27933;
+    public long l27934;
+    public long l27935;
+    public long l27936;
+    public long l27937;
+    public long l27938;
+    public long l27939;
+    public long l27940;
+    public long l27941;
+    public long l27942;
+    public long l27943;
+    public long l27944;
+    public long l27945;
+    public long l27946;
+    public long l27947;
+    public long l27948;
+    public long l27949;
+    public long l27950;
+    public long l27951;
+    public long l27952;
+    public long l27953;
+    public long l27954;
+    public long l27955;
+    public long l27956;
+    public long l27957;
+    public long l27958;
+    public long l27959;
+    public long l27960;
+    public long l27961;
+    public long l27962;
+    public long l27963;
+    public long l27964;
+    public long l27965;
+    public long l27966;
+    public long l27967;
+    public long l27968;
+    public long l27969;
+    public long l27970;
+    public long l27971;
+    public long l27972;
+    public long l27973;
+    public long l27974;
+    public long l27975;
+    public long l27976;
+    public long l27977;
+    public long l27978;
+    public long l27979;
+    public long l27980;
+    public long l27981;
+    public long l27982;
+    public long l27983;
+    public long l27984;
+    public long l27985;
+    public long l27986;
+    public long l27987;
+    public long l27988;
+    public long l27989;
+    public long l27990;
+    public long l27991;
+    public long l27992;
+    public long l27993;
+    public long l27994;
+    public long l27995;
+    public long l27996;
+    public long l27997;
+    public long l27998;
+    public long l27999;
+    public long l28000;
+    public long l28001;
+    public long l28002;
+    public long l28003;
+    public long l28004;
+    public long l28005;
+    public long l28006;
+    public long l28007;
+    public long l28008;
+    public long l28009;
+    public long l28010;
+    public long l28011;
+    public long l28012;
+    public long l28013;
+    public long l28014;
+    public long l28015;
+    public long l28016;
+    public long l28017;
+    public long l28018;
+    public long l28019;
+    public long l28020;
+    public long l28021;
+    public long l28022;
+    public long l28023;
+    public long l28024;
+    public long l28025;
+    public long l28026;
+    public long l28027;
+    public long l28028;
+    public long l28029;
+    public long l28030;
+    public long l28031;
+    public long l28032;
+    public long l28033;
+    public long l28034;
+    public long l28035;
+    public long l28036;
+    public long l28037;
+    public long l28038;
+    public long l28039;
+    public long l28040;
+    public long l28041;
+    public long l28042;
+    public long l28043;
+    public long l28044;
+    public long l28045;
+    public long l28046;
+    public long l28047;
+    public long l28048;
+    public long l28049;
+    public long l28050;
+    public long l28051;
+    public long l28052;
+    public long l28053;
+    public long l28054;
+    public long l28055;
+    public long l28056;
+    public long l28057;
+    public long l28058;
+    public long l28059;
+    public long l28060;
+    public long l28061;
+    public long l28062;
+    public long l28063;
+    public long l28064;
+    public long l28065;
+    public long l28066;
+    public long l28067;
+    public long l28068;
+    public long l28069;
+    public long l28070;
+    public long l28071;
+    public long l28072;
+    public long l28073;
+    public long l28074;
+    public long l28075;
+    public long l28076;
+    public long l28077;
+    public long l28078;
+    public long l28079;
+    public long l28080;
+    public long l28081;
+    public long l28082;
+    public long l28083;
+    public long l28084;
+    public long l28085;
+    public long l28086;
+    public long l28087;
+    public long l28088;
+    public long l28089;
+    public long l28090;
+    public long l28091;
+    public long l28092;
+    public long l28093;
+    public long l28094;
+    public long l28095;
+    public long l28096;
+    public long l28097;
+    public long l28098;
+    public long l28099;
+    public long l28100;
+    public long l28101;
+    public long l28102;
+    public long l28103;
+    public long l28104;
+    public long l28105;
+    public long l28106;
+    public long l28107;
+    public long l28108;
+    public long l28109;
+    public long l28110;
+    public long l28111;
+    public long l28112;
+    public long l28113;
+    public long l28114;
+    public long l28115;
+    public long l28116;
+    public long l28117;
+    public long l28118;
+    public long l28119;
+    public long l28120;
+    public long l28121;
+    public long l28122;
+    public long l28123;
+    public long l28124;
+    public long l28125;
+    public long l28126;
+    public long l28127;
+    public long l28128;
+    public long l28129;
+    public long l28130;
+    public long l28131;
+    public long l28132;
+    public long l28133;
+    public long l28134;
+    public long l28135;
+    public long l28136;
+    public long l28137;
+    public long l28138;
+    public long l28139;
+    public long l28140;
+    public long l28141;
+    public long l28142;
+    public long l28143;
+    public long l28144;
+    public long l28145;
+    public long l28146;
+    public long l28147;
+    public long l28148;
+    public long l28149;
+    public long l28150;
+    public long l28151;
+    public long l28152;
+    public long l28153;
+    public long l28154;
+    public long l28155;
+    public long l28156;
+    public long l28157;
+    public long l28158;
+    public long l28159;
+    public long l28160;
+    public long l28161;
+    public long l28162;
+    public long l28163;
+    public long l28164;
+    public long l28165;
+    public long l28166;
+    public long l28167;
+    public long l28168;
+    public long l28169;
+    public long l28170;
+    public long l28171;
+    public long l28172;
+    public long l28173;
+    public long l28174;
+    public long l28175;
+    public long l28176;
+    public long l28177;
+    public long l28178;
+    public long l28179;
+    public long l28180;
+    public long l28181;
+    public long l28182;
+    public long l28183;
+    public long l28184;
+    public long l28185;
+    public long l28186;
+    public long l28187;
+    public long l28188;
+    public long l28189;
+    public long l28190;
+    public long l28191;
+    public long l28192;
+    public long l28193;
+    public long l28194;
+    public long l28195;
+    public long l28196;
+    public long l28197;
+    public long l28198;
+    public long l28199;
+    public long l28200;
+    public long l28201;
+    public long l28202;
+    public long l28203;
+    public long l28204;
+    public long l28205;
+    public long l28206;
+    public long l28207;
+    public long l28208;
+    public long l28209;
+    public long l28210;
+    public long l28211;
+    public long l28212;
+    public long l28213;
+    public long l28214;
+    public long l28215;
+    public long l28216;
+    public long l28217;
+    public long l28218;
+    public long l28219;
+    public long l28220;
+    public long l28221;
+    public long l28222;
+    public long l28223;
+    public long l28224;
+    public long l28225;
+    public long l28226;
+    public long l28227;
+    public long l28228;
+    public long l28229;
+    public long l28230;
+    public long l28231;
+    public long l28232;
+    public long l28233;
+    public long l28234;
+    public long l28235;
+    public long l28236;
+    public long l28237;
+    public long l28238;
+    public long l28239;
+    public long l28240;
+    public long l28241;
+    public long l28242;
+    public long l28243;
+    public long l28244;
+    public long l28245;
+    public long l28246;
+    public long l28247;
+    public long l28248;
+    public long l28249;
+    public long l28250;
+    public long l28251;
+    public long l28252;
+    public long l28253;
+    public long l28254;
+    public long l28255;
+    public long l28256;
+    public long l28257;
+    public long l28258;
+    public long l28259;
+    public long l28260;
+    public long l28261;
+    public long l28262;
+    public long l28263;
+    public long l28264;
+    public long l28265;
+    public long l28266;
+    public long l28267;
+    public long l28268;
+    public long l28269;
+    public long l28270;
+    public long l28271;
+    public long l28272;
+    public long l28273;
+    public long l28274;
+    public long l28275;
+    public long l28276;
+    public long l28277;
+    public long l28278;
+    public long l28279;
+    public long l28280;
+    public long l28281;
+    public long l28282;
+    public long l28283;
+    public long l28284;
+    public long l28285;
+    public long l28286;
+    public long l28287;
+    public long l28288;
+    public long l28289;
+    public long l28290;
+    public long l28291;
+    public long l28292;
+    public long l28293;
+    public long l28294;
+    public long l28295;
+    public long l28296;
+    public long l28297;
+    public long l28298;
+    public long l28299;
+    public long l28300;
+    public long l28301;
+    public long l28302;
+    public long l28303;
+    public long l28304;
+    public long l28305;
+    public long l28306;
+    public long l28307;
+    public long l28308;
+    public long l28309;
+    public long l28310;
+    public long l28311;
+    public long l28312;
+    public long l28313;
+    public long l28314;
+    public long l28315;
+    public long l28316;
+    public long l28317;
+    public long l28318;
+    public long l28319;
+    public long l28320;
+    public long l28321;
+    public long l28322;
+    public long l28323;
+    public long l28324;
+    public long l28325;
+    public long l28326;
+    public long l28327;
+    public long l28328;
+    public long l28329;
+    public long l28330;
+    public long l28331;
+    public long l28332;
+    public long l28333;
+    public long l28334;
+    public long l28335;
+    public long l28336;
+    public long l28337;
+    public long l28338;
+    public long l28339;
+    public long l28340;
+    public long l28341;
+    public long l28342;
+    public long l28343;
+    public long l28344;
+    public long l28345;
+    public long l28346;
+    public long l28347;
+    public long l28348;
+    public long l28349;
+    public long l28350;
+    public long l28351;
+    public long l28352;
+    public long l28353;
+    public long l28354;
+    public long l28355;
+    public long l28356;
+    public long l28357;
+    public long l28358;
+    public long l28359;
+    public long l28360;
+    public long l28361;
+    public long l28362;
+    public long l28363;
+    public long l28364;
+    public long l28365;
+    public long l28366;
+    public long l28367;
+    public long l28368;
+    public long l28369;
+    public long l28370;
+    public long l28371;
+    public long l28372;
+    public long l28373;
+    public long l28374;
+    public long l28375;
+    public long l28376;
+    public long l28377;
+    public long l28378;
+    public long l28379;
+    public long l28380;
+    public long l28381;
+    public long l28382;
+    public long l28383;
+    public long l28384;
+    public long l28385;
+    public long l28386;
+    public long l28387;
+    public long l28388;
+    public long l28389;
+    public long l28390;
+    public long l28391;
+    public long l28392;
+    public long l28393;
+    public long l28394;
+    public long l28395;
+    public long l28396;
+    public long l28397;
+    public long l28398;
+    public long l28399;
+    public long l28400;
+    public long l28401;
+    public long l28402;
+    public long l28403;
+    public long l28404;
+    public long l28405;
+    public long l28406;
+    public long l28407;
+    public long l28408;
+    public long l28409;
+    public long l28410;
+    public long l28411;
+    public long l28412;
+    public long l28413;
+    public long l28414;
+    public long l28415;
+    public long l28416;
+    public long l28417;
+    public long l28418;
+    public long l28419;
+    public long l28420;
+    public long l28421;
+    public long l28422;
+    public long l28423;
+    public long l28424;
+    public long l28425;
+    public long l28426;
+    public long l28427;
+    public long l28428;
+    public long l28429;
+    public long l28430;
+    public long l28431;
+    public long l28432;
+    public long l28433;
+    public long l28434;
+    public long l28435;
+    public long l28436;
+    public long l28437;
+    public long l28438;
+    public long l28439;
+    public long l28440;
+    public long l28441;
+    public long l28442;
+    public long l28443;
+    public long l28444;
+    public long l28445;
+    public long l28446;
+    public long l28447;
+    public long l28448;
+    public long l28449;
+    public long l28450;
+    public long l28451;
+    public long l28452;
+    public long l28453;
+    public long l28454;
+    public long l28455;
+    public long l28456;
+    public long l28457;
+    public long l28458;
+    public long l28459;
+    public long l28460;
+    public long l28461;
+    public long l28462;
+    public long l28463;
+    public long l28464;
+    public long l28465;
+    public long l28466;
+    public long l28467;
+    public long l28468;
+    public long l28469;
+    public long l28470;
+    public long l28471;
+    public long l28472;
+    public long l28473;
+    public long l28474;
+    public long l28475;
+    public long l28476;
+    public long l28477;
+    public long l28478;
+    public long l28479;
+    public long l28480;
+    public long l28481;
+    public long l28482;
+    public long l28483;
+    public long l28484;
+    public long l28485;
+    public long l28486;
+    public long l28487;
+    public long l28488;
+    public long l28489;
+    public long l28490;
+    public long l28491;
+    public long l28492;
+    public long l28493;
+    public long l28494;
+    public long l28495;
+    public long l28496;
+    public long l28497;
+    public long l28498;
+    public long l28499;
+    public long l28500;
+    public long l28501;
+    public long l28502;
+    public long l28503;
+    public long l28504;
+    public long l28505;
+    public long l28506;
+    public long l28507;
+    public long l28508;
+    public long l28509;
+    public long l28510;
+    public long l28511;
+    public long l28512;
+    public long l28513;
+    public long l28514;
+    public long l28515;
+    public long l28516;
+    public long l28517;
+    public long l28518;
+    public long l28519;
+    public long l28520;
+    public long l28521;
+    public long l28522;
+    public long l28523;
+    public long l28524;
+    public long l28525;
+    public long l28526;
+    public long l28527;
+    public long l28528;
+    public long l28529;
+    public long l28530;
+    public long l28531;
+    public long l28532;
+    public long l28533;
+    public long l28534;
+    public long l28535;
+    public long l28536;
+    public long l28537;
+    public long l28538;
+    public long l28539;
+    public long l28540;
+    public long l28541;
+    public long l28542;
+    public long l28543;
+    public long l28544;
+    public long l28545;
+    public long l28546;
+    public long l28547;
+    public long l28548;
+    public long l28549;
+    public long l28550;
+    public long l28551;
+    public long l28552;
+    public long l28553;
+    public long l28554;
+    public long l28555;
+    public long l28556;
+    public long l28557;
+    public long l28558;
+    public long l28559;
+    public long l28560;
+    public long l28561;
+    public long l28562;
+    public long l28563;
+    public long l28564;
+    public long l28565;
+    public long l28566;
+    public long l28567;
+    public long l28568;
+    public long l28569;
+    public long l28570;
+    public long l28571;
+    public long l28572;
+    public long l28573;
+    public long l28574;
+    public long l28575;
+    public long l28576;
+    public long l28577;
+    public long l28578;
+    public long l28579;
+    public long l28580;
+    public long l28581;
+    public long l28582;
+    public long l28583;
+    public long l28584;
+    public long l28585;
+    public long l28586;
+    public long l28587;
+    public long l28588;
+    public long l28589;
+    public long l28590;
+    public long l28591;
+    public long l28592;
+    public long l28593;
+    public long l28594;
+    public long l28595;
+    public long l28596;
+    public long l28597;
+    public long l28598;
+    public long l28599;
+    public long l28600;
+    public long l28601;
+    public long l28602;
+    public long l28603;
+    public long l28604;
+    public long l28605;
+    public long l28606;
+    public long l28607;
+    public long l28608;
+    public long l28609;
+    public long l28610;
+    public long l28611;
+    public long l28612;
+    public long l28613;
+    public long l28614;
+    public long l28615;
+    public long l28616;
+    public long l28617;
+    public long l28618;
+    public long l28619;
+    public long l28620;
+    public long l28621;
+    public long l28622;
+    public long l28623;
+    public long l28624;
+    public long l28625;
+    public long l28626;
+    public long l28627;
+    public long l28628;
+    public long l28629;
+    public long l28630;
+    public long l28631;
+    public long l28632;
+    public long l28633;
+    public long l28634;
+    public long l28635;
+    public long l28636;
+    public long l28637;
+    public long l28638;
+    public long l28639;
+    public long l28640;
+    public long l28641;
+    public long l28642;
+    public long l28643;
+    public long l28644;
+    public long l28645;
+    public long l28646;
+    public long l28647;
+    public long l28648;
+    public long l28649;
+    public long l28650;
+    public long l28651;
+    public long l28652;
+    public long l28653;
+    public long l28654;
+    public long l28655;
+    public long l28656;
+    public long l28657;
+    public long l28658;
+    public long l28659;
+    public long l28660;
+    public long l28661;
+    public long l28662;
+    public long l28663;
+    public long l28664;
+    public long l28665;
+    public long l28666;
+    public long l28667;
+    public long l28668;
+    public long l28669;
+    public long l28670;
+    public long l28671;
+    public long l28672;
+    public long l28673;
+    public long l28674;
+    public long l28675;
+    public long l28676;
+    public long l28677;
+    public long l28678;
+    public long l28679;
+    public long l28680;
+    public long l28681;
+    public long l28682;
+    public long l28683;
+    public long l28684;
+    public long l28685;
+    public long l28686;
+    public long l28687;
+    public long l28688;
+    public long l28689;
+    public long l28690;
+    public long l28691;
+    public long l28692;
+    public long l28693;
+    public long l28694;
+    public long l28695;
+    public long l28696;
+    public long l28697;
+    public long l28698;
+    public long l28699;
+    public long l28700;
+    public long l28701;
+    public long l28702;
+    public long l28703;
+    public long l28704;
+    public long l28705;
+    public long l28706;
+    public long l28707;
+    public long l28708;
+    public long l28709;
+    public long l28710;
+    public long l28711;
+    public long l28712;
+    public long l28713;
+    public long l28714;
+    public long l28715;
+    public long l28716;
+    public long l28717;
+    public long l28718;
+    public long l28719;
+    public long l28720;
+    public long l28721;
+    public long l28722;
+    public long l28723;
+    public long l28724;
+    public long l28725;
+    public long l28726;
+    public long l28727;
+    public long l28728;
+    public long l28729;
+    public long l28730;
+    public long l28731;
+    public long l28732;
+    public long l28733;
+    public long l28734;
+    public long l28735;
+    public long l28736;
+    public long l28737;
+    public long l28738;
+    public long l28739;
+    public long l28740;
+    public long l28741;
+    public long l28742;
+    public long l28743;
+    public long l28744;
+    public long l28745;
+    public long l28746;
+    public long l28747;
+    public long l28748;
+    public long l28749;
+    public long l28750;
+    public long l28751;
+    public long l28752;
+    public long l28753;
+    public long l28754;
+    public long l28755;
+    public long l28756;
+    public long l28757;
+    public long l28758;
+    public long l28759;
+    public long l28760;
+    public long l28761;
+    public long l28762;
+    public long l28763;
+    public long l28764;
+    public long l28765;
+    public long l28766;
+    public long l28767;
+    public long l28768;
+    public long l28769;
+    public long l28770;
+    public long l28771;
+    public long l28772;
+    public long l28773;
+    public long l28774;
+    public long l28775;
+    public long l28776;
+    public long l28777;
+    public long l28778;
+    public long l28779;
+    public long l28780;
+    public long l28781;
+    public long l28782;
+    public long l28783;
+    public long l28784;
+    public long l28785;
+    public long l28786;
+    public long l28787;
+    public long l28788;
+    public long l28789;
+    public long l28790;
+    public long l28791;
+    public long l28792;
+    public long l28793;
+    public long l28794;
+    public long l28795;
+    public long l28796;
+    public long l28797;
+    public long l28798;
+    public long l28799;
+    public long l28800;
+    public long l28801;
+    public long l28802;
+    public long l28803;
+    public long l28804;
+    public long l28805;
+    public long l28806;
+    public long l28807;
+    public long l28808;
+    public long l28809;
+    public long l28810;
+    public long l28811;
+    public long l28812;
+    public long l28813;
+    public long l28814;
+    public long l28815;
+    public long l28816;
+    public long l28817;
+    public long l28818;
+    public long l28819;
+    public long l28820;
+    public long l28821;
+    public long l28822;
+    public long l28823;
+    public long l28824;
+    public long l28825;
+    public long l28826;
+    public long l28827;
+    public long l28828;
+    public long l28829;
+    public long l28830;
+    public long l28831;
+    public long l28832;
+    public long l28833;
+    public long l28834;
+    public long l28835;
+    public long l28836;
+    public long l28837;
+    public long l28838;
+    public long l28839;
+    public long l28840;
+    public long l28841;
+    public long l28842;
+    public long l28843;
+    public long l28844;
+    public long l28845;
+    public long l28846;
+    public long l28847;
+    public long l28848;
+    public long l28849;
+    public long l28850;
+    public long l28851;
+    public long l28852;
+    public long l28853;
+    public long l28854;
+    public long l28855;
+    public long l28856;
+    public long l28857;
+    public long l28858;
+    public long l28859;
+    public long l28860;
+    public long l28861;
+    public long l28862;
+    public long l28863;
+    public long l28864;
+    public long l28865;
+    public long l28866;
+    public long l28867;
+    public long l28868;
+    public long l28869;
+    public long l28870;
+    public long l28871;
+    public long l28872;
+    public long l28873;
+    public long l28874;
+    public long l28875;
+    public long l28876;
+    public long l28877;
+    public long l28878;
+    public long l28879;
+    public long l28880;
+    public long l28881;
+    public long l28882;
+    public long l28883;
+    public long l28884;
+    public long l28885;
+    public long l28886;
+    public long l28887;
+    public long l28888;
+    public long l28889;
+    public long l28890;
+    public long l28891;
+    public long l28892;
+    public long l28893;
+    public long l28894;
+    public long l28895;
+    public long l28896;
+    public long l28897;
+    public long l28898;
+    public long l28899;
+    public long l28900;
+    public long l28901;
+    public long l28902;
+    public long l28903;
+    public long l28904;
+    public long l28905;
+    public long l28906;
+    public long l28907;
+    public long l28908;
+    public long l28909;
+    public long l28910;
+    public long l28911;
+    public long l28912;
+    public long l28913;
+    public long l28914;
+    public long l28915;
+    public long l28916;
+    public long l28917;
+    public long l28918;
+    public long l28919;
+    public long l28920;
+    public long l28921;
+    public long l28922;
+    public long l28923;
+    public long l28924;
+    public long l28925;
+    public long l28926;
+    public long l28927;
+    public long l28928;
+    public long l28929;
+    public long l28930;
+    public long l28931;
+    public long l28932;
+    public long l28933;
+    public long l28934;
+    public long l28935;
+    public long l28936;
+    public long l28937;
+    public long l28938;
+    public long l28939;
+    public long l28940;
+    public long l28941;
+    public long l28942;
+    public long l28943;
+    public long l28944;
+    public long l28945;
+    public long l28946;
+    public long l28947;
+    public long l28948;
+    public long l28949;
+    public long l28950;
+    public long l28951;
+    public long l28952;
+    public long l28953;
+    public long l28954;
+    public long l28955;
+    public long l28956;
+    public long l28957;
+    public long l28958;
+    public long l28959;
+    public long l28960;
+    public long l28961;
+    public long l28962;
+    public long l28963;
+    public long l28964;
+    public long l28965;
+    public long l28966;
+    public long l28967;
+    public long l28968;
+    public long l28969;
+    public long l28970;
+    public long l28971;
+    public long l28972;
+    public long l28973;
+    public long l28974;
+    public long l28975;
+    public long l28976;
+    public long l28977;
+    public long l28978;
+    public long l28979;
+    public long l28980;
+    public long l28981;
+    public long l28982;
+    public long l28983;
+    public long l28984;
+    public long l28985;
+    public long l28986;
+    public long l28987;
+    public long l28988;
+    public long l28989;
+    public long l28990;
+    public long l28991;
+    public long l28992;
+    public long l28993;
+    public long l28994;
+    public long l28995;
+    public long l28996;
+    public long l28997;
+    public long l28998;
+    public long l28999;
+    public long l29000;
+    public long l29001;
+    public long l29002;
+    public long l29003;
+    public long l29004;
+    public long l29005;
+    public long l29006;
+    public long l29007;
+    public long l29008;
+    public long l29009;
+    public long l29010;
+    public long l29011;
+    public long l29012;
+    public long l29013;
+    public long l29014;
+    public long l29015;
+    public long l29016;
+    public long l29017;
+    public long l29018;
+    public long l29019;
+    public long l29020;
+    public long l29021;
+    public long l29022;
+    public long l29023;
+    public long l29024;
+    public long l29025;
+    public long l29026;
+    public long l29027;
+    public long l29028;
+    public long l29029;
+    public long l29030;
+    public long l29031;
+    public long l29032;
+    public long l29033;
+    public long l29034;
+    public long l29035;
+    public long l29036;
+    public long l29037;
+    public long l29038;
+    public long l29039;
+    public long l29040;
+    public long l29041;
+    public long l29042;
+    public long l29043;
+    public long l29044;
+    public long l29045;
+    public long l29046;
+    public long l29047;
+    public long l29048;
+    public long l29049;
+    public long l29050;
+    public long l29051;
+    public long l29052;
+    public long l29053;
+    public long l29054;
+    public long l29055;
+    public long l29056;
+    public long l29057;
+    public long l29058;
+    public long l29059;
+    public long l29060;
+    public long l29061;
+    public long l29062;
+    public long l29063;
+    public long l29064;
+    public long l29065;
+    public long l29066;
+    public long l29067;
+    public long l29068;
+    public long l29069;
+    public long l29070;
+    public long l29071;
+    public long l29072;
+    public long l29073;
+    public long l29074;
+    public long l29075;
+    public long l29076;
+    public long l29077;
+    public long l29078;
+    public long l29079;
+    public long l29080;
+    public long l29081;
+    public long l29082;
+    public long l29083;
+    public long l29084;
+    public long l29085;
+    public long l29086;
+    public long l29087;
+    public long l29088;
+    public long l29089;
+    public long l29090;
+    public long l29091;
+    public long l29092;
+    public long l29093;
+    public long l29094;
+    public long l29095;
+    public long l29096;
+    public long l29097;
+    public long l29098;
+    public long l29099;
+    public long l29100;
+    public long l29101;
+    public long l29102;
+    public long l29103;
+    public long l29104;
+    public long l29105;
+    public long l29106;
+    public long l29107;
+    public long l29108;
+    public long l29109;
+    public long l29110;
+    public long l29111;
+    public long l29112;
+    public long l29113;
+    public long l29114;
+    public long l29115;
+    public long l29116;
+    public long l29117;
+    public long l29118;
+    public long l29119;
+    public long l29120;
+    public long l29121;
+    public long l29122;
+    public long l29123;
+    public long l29124;
+    public long l29125;
+    public long l29126;
+    public long l29127;
+    public long l29128;
+    public long l29129;
+    public long l29130;
+    public long l29131;
+    public long l29132;
+    public long l29133;
+    public long l29134;
+    public long l29135;
+    public long l29136;
+    public long l29137;
+    public long l29138;
+    public long l29139;
+    public long l29140;
+    public long l29141;
+    public long l29142;
+    public long l29143;
+    public long l29144;
+    public long l29145;
+    public long l29146;
+    public long l29147;
+    public long l29148;
+    public long l29149;
+    public long l29150;
+    public long l29151;
+    public long l29152;
+    public long l29153;
+    public long l29154;
+    public long l29155;
+    public long l29156;
+    public long l29157;
+    public long l29158;
+    public long l29159;
+    public long l29160;
+    public long l29161;
+    public long l29162;
+    public long l29163;
+    public long l29164;
+    public long l29165;
+    public long l29166;
+    public long l29167;
+    public long l29168;
+    public long l29169;
+    public long l29170;
+    public long l29171;
+    public long l29172;
+    public long l29173;
+    public long l29174;
+    public long l29175;
+    public long l29176;
+    public long l29177;
+    public long l29178;
+    public long l29179;
+    public long l29180;
+    public long l29181;
+    public long l29182;
+    public long l29183;
+    public long l29184;
+    public long l29185;
+    public long l29186;
+    public long l29187;
+    public long l29188;
+    public long l29189;
+    public long l29190;
+    public long l29191;
+    public long l29192;
+    public long l29193;
+    public long l29194;
+    public long l29195;
+    public long l29196;
+    public long l29197;
+    public long l29198;
+    public long l29199;
+    public long l29200;
+    public long l29201;
+    public long l29202;
+    public long l29203;
+    public long l29204;
+    public long l29205;
+    public long l29206;
+    public long l29207;
+    public long l29208;
+    public long l29209;
+    public long l29210;
+    public long l29211;
+    public long l29212;
+    public long l29213;
+    public long l29214;
+    public long l29215;
+    public long l29216;
+    public long l29217;
+    public long l29218;
+    public long l29219;
+    public long l29220;
+    public long l29221;
+    public long l29222;
+    public long l29223;
+    public long l29224;
+    public long l29225;
+    public long l29226;
+    public long l29227;
+    public long l29228;
+    public long l29229;
+    public long l29230;
+    public long l29231;
+    public long l29232;
+    public long l29233;
+    public long l29234;
+    public long l29235;
+    public long l29236;
+    public long l29237;
+    public long l29238;
+    public long l29239;
+    public long l29240;
+    public long l29241;
+    public long l29242;
+    public long l29243;
+    public long l29244;
+    public long l29245;
+    public long l29246;
+    public long l29247;
+    public long l29248;
+    public long l29249;
+    public long l29250;
+    public long l29251;
+    public long l29252;
+    public long l29253;
+    public long l29254;
+    public long l29255;
+    public long l29256;
+    public long l29257;
+    public long l29258;
+    public long l29259;
+    public long l29260;
+    public long l29261;
+    public long l29262;
+    public long l29263;
+    public long l29264;
+    public long l29265;
+    public long l29266;
+    public long l29267;
+    public long l29268;
+    public long l29269;
+    public long l29270;
+    public long l29271;
+    public long l29272;
+    public long l29273;
+    public long l29274;
+    public long l29275;
+    public long l29276;
+    public long l29277;
+    public long l29278;
+    public long l29279;
+    public long l29280;
+    public long l29281;
+    public long l29282;
+    public long l29283;
+    public long l29284;
+    public long l29285;
+    public long l29286;
+    public long l29287;
+    public long l29288;
+    public long l29289;
+    public long l29290;
+    public long l29291;
+    public long l29292;
+    public long l29293;
+    public long l29294;
+    public long l29295;
+    public long l29296;
+    public long l29297;
+    public long l29298;
+    public long l29299;
+    public long l29300;
+    public long l29301;
+    public long l29302;
+    public long l29303;
+    public long l29304;
+    public long l29305;
+    public long l29306;
+    public long l29307;
+    public long l29308;
+    public long l29309;
+    public long l29310;
+    public long l29311;
+    public long l29312;
+    public long l29313;
+    public long l29314;
+    public long l29315;
+    public long l29316;
+    public long l29317;
+    public long l29318;
+    public long l29319;
+    public long l29320;
+    public long l29321;
+    public long l29322;
+    public long l29323;
+    public long l29324;
+    public long l29325;
+    public long l29326;
+    public long l29327;
+    public long l29328;
+    public long l29329;
+    public long l29330;
+    public long l29331;
+    public long l29332;
+    public long l29333;
+    public long l29334;
+    public long l29335;
+    public long l29336;
+    public long l29337;
+    public long l29338;
+    public long l29339;
+    public long l29340;
+    public long l29341;
+    public long l29342;
+    public long l29343;
+    public long l29344;
+    public long l29345;
+    public long l29346;
+    public long l29347;
+    public long l29348;
+    public long l29349;
+    public long l29350;
+    public long l29351;
+    public long l29352;
+    public long l29353;
+    public long l29354;
+    public long l29355;
+    public long l29356;
+    public long l29357;
+    public long l29358;
+    public long l29359;
+    public long l29360;
+    public long l29361;
+    public long l29362;
+    public long l29363;
+    public long l29364;
+    public long l29365;
+    public long l29366;
+    public long l29367;
+    public long l29368;
+    public long l29369;
+    public long l29370;
+    public long l29371;
+    public long l29372;
+    public long l29373;
+    public long l29374;
+    public long l29375;
+    public long l29376;
+    public long l29377;
+    public long l29378;
+    public long l29379;
+    public long l29380;
+    public long l29381;
+    public long l29382;
+    public long l29383;
+    public long l29384;
+    public long l29385;
+    public long l29386;
+    public long l29387;
+    public long l29388;
+    public long l29389;
+    public long l29390;
+    public long l29391;
+    public long l29392;
+    public long l29393;
+    public long l29394;
+    public long l29395;
+    public long l29396;
+    public long l29397;
+    public long l29398;
+    public long l29399;
+    public long l29400;
+    public long l29401;
+    public long l29402;
+    public long l29403;
+    public long l29404;
+    public long l29405;
+    public long l29406;
+    public long l29407;
+    public long l29408;
+    public long l29409;
+    public long l29410;
+    public long l29411;
+    public long l29412;
+    public long l29413;
+    public long l29414;
+    public long l29415;
+    public long l29416;
+    public long l29417;
+    public long l29418;
+    public long l29419;
+    public long l29420;
+    public long l29421;
+    public long l29422;
+    public long l29423;
+    public long l29424;
+    public long l29425;
+    public long l29426;
+    public long l29427;
+    public long l29428;
+    public long l29429;
+    public long l29430;
+    public long l29431;
+    public long l29432;
+    public long l29433;
+    public long l29434;
+    public long l29435;
+    public long l29436;
+    public long l29437;
+    public long l29438;
+    public long l29439;
+    public long l29440;
+    public long l29441;
+    public long l29442;
+    public long l29443;
+    public long l29444;
+    public long l29445;
+    public long l29446;
+    public long l29447;
+    public long l29448;
+    public long l29449;
+    public long l29450;
+    public long l29451;
+    public long l29452;
+    public long l29453;
+    public long l29454;
+    public long l29455;
+    public long l29456;
+    public long l29457;
+    public long l29458;
+    public long l29459;
+    public long l29460;
+    public long l29461;
+    public long l29462;
+    public long l29463;
+    public long l29464;
+    public long l29465;
+    public long l29466;
+    public long l29467;
+    public long l29468;
+    public long l29469;
+    public long l29470;
+    public long l29471;
+    public long l29472;
+    public long l29473;
+    public long l29474;
+    public long l29475;
+    public long l29476;
+    public long l29477;
+    public long l29478;
+    public long l29479;
+    public long l29480;
+    public long l29481;
+    public long l29482;
+    public long l29483;
+    public long l29484;
+    public long l29485;
+    public long l29486;
+    public long l29487;
+    public long l29488;
+    public long l29489;
+    public long l29490;
+    public long l29491;
+    public long l29492;
+    public long l29493;
+    public long l29494;
+    public long l29495;
+    public long l29496;
+    public long l29497;
+    public long l29498;
+    public long l29499;
+    public long l29500;
+    public long l29501;
+    public long l29502;
+    public long l29503;
+    public long l29504;
+    public long l29505;
+    public long l29506;
+    public long l29507;
+    public long l29508;
+    public long l29509;
+    public long l29510;
+    public long l29511;
+    public long l29512;
+    public long l29513;
+    public long l29514;
+    public long l29515;
+    public long l29516;
+    public long l29517;
+    public long l29518;
+    public long l29519;
+    public long l29520;
+    public long l29521;
+    public long l29522;
+    public long l29523;
+    public long l29524;
+    public long l29525;
+    public long l29526;
+    public long l29527;
+    public long l29528;
+    public long l29529;
+    public long l29530;
+    public long l29531;
+    public long l29532;
+    public long l29533;
+    public long l29534;
+    public long l29535;
+    public long l29536;
+    public long l29537;
+    public long l29538;
+    public long l29539;
+    public long l29540;
+    public long l29541;
+    public long l29542;
+    public long l29543;
+    public long l29544;
+    public long l29545;
+    public long l29546;
+    public long l29547;
+    public long l29548;
+    public long l29549;
+    public long l29550;
+    public long l29551;
+    public long l29552;
+    public long l29553;
+    public long l29554;
+    public long l29555;
+    public long l29556;
+    public long l29557;
+    public long l29558;
+    public long l29559;
+    public long l29560;
+    public long l29561;
+    public long l29562;
+    public long l29563;
+    public long l29564;
+    public long l29565;
+    public long l29566;
+    public long l29567;
+    public long l29568;
+    public long l29569;
+    public long l29570;
+    public long l29571;
+    public long l29572;
+    public long l29573;
+    public long l29574;
+    public long l29575;
+    public long l29576;
+    public long l29577;
+    public long l29578;
+    public long l29579;
+    public long l29580;
+    public long l29581;
+    public long l29582;
+    public long l29583;
+    public long l29584;
+    public long l29585;
+    public long l29586;
+    public long l29587;
+    public long l29588;
+    public long l29589;
+    public long l29590;
+    public long l29591;
+    public long l29592;
+    public long l29593;
+    public long l29594;
+    public long l29595;
+    public long l29596;
+    public long l29597;
+    public long l29598;
+    public long l29599;
+    public long l29600;
+    public long l29601;
+    public long l29602;
+    public long l29603;
+    public long l29604;
+    public long l29605;
+    public long l29606;
+    public long l29607;
+    public long l29608;
+    public long l29609;
+    public long l29610;
+    public long l29611;
+    public long l29612;
+    public long l29613;
+    public long l29614;
+    public long l29615;
+    public long l29616;
+    public long l29617;
+    public long l29618;
+    public long l29619;
+    public long l29620;
+    public long l29621;
+    public long l29622;
+    public long l29623;
+    public long l29624;
+    public long l29625;
+    public long l29626;
+    public long l29627;
+    public long l29628;
+    public long l29629;
+    public long l29630;
+    public long l29631;
+    public long l29632;
+    public long l29633;
+    public long l29634;
+    public long l29635;
+    public long l29636;
+    public long l29637;
+    public long l29638;
+    public long l29639;
+    public long l29640;
+    public long l29641;
+    public long l29642;
+    public long l29643;
+    public long l29644;
+    public long l29645;
+    public long l29646;
+    public long l29647;
+    public long l29648;
+    public long l29649;
+    public long l29650;
+    public long l29651;
+    public long l29652;
+    public long l29653;
+    public long l29654;
+    public long l29655;
+    public long l29656;
+    public long l29657;
+    public long l29658;
+    public long l29659;
+    public long l29660;
+    public long l29661;
+    public long l29662;
+    public long l29663;
+    public long l29664;
+    public long l29665;
+    public long l29666;
+    public long l29667;
+    public long l29668;
+    public long l29669;
+    public long l29670;
+    public long l29671;
+    public long l29672;
+    public long l29673;
+    public long l29674;
+    public long l29675;
+    public long l29676;
+    public long l29677;
+    public long l29678;
+    public long l29679;
+    public long l29680;
+    public long l29681;
+    public long l29682;
+    public long l29683;
+    public long l29684;
+    public long l29685;
+    public long l29686;
+    public long l29687;
+    public long l29688;
+    public long l29689;
+    public long l29690;
+    public long l29691;
+    public long l29692;
+    public long l29693;
+    public long l29694;
+    public long l29695;
+    public long l29696;
+    public long l29697;
+    public long l29698;
+    public long l29699;
+    public long l29700;
+    public long l29701;
+    public long l29702;
+    public long l29703;
+    public long l29704;
+    public long l29705;
+    public long l29706;
+    public long l29707;
+    public long l29708;
+    public long l29709;
+    public long l29710;
+    public long l29711;
+    public long l29712;
+    public long l29713;
+    public long l29714;
+    public long l29715;
+    public long l29716;
+    public long l29717;
+    public long l29718;
+    public long l29719;
+    public long l29720;
+    public long l29721;
+    public long l29722;
+    public long l29723;
+    public long l29724;
+    public long l29725;
+    public long l29726;
+    public long l29727;
+    public long l29728;
+    public long l29729;
+    public long l29730;
+    public long l29731;
+    public long l29732;
+    public long l29733;
+    public long l29734;
+    public long l29735;
+    public long l29736;
+    public long l29737;
+    public long l29738;
+    public long l29739;
+    public long l29740;
+    public long l29741;
+    public long l29742;
+    public long l29743;
+    public long l29744;
+    public long l29745;
+    public long l29746;
+    public long l29747;
+    public long l29748;
+    public long l29749;
+    public long l29750;
+    public long l29751;
+    public long l29752;
+    public long l29753;
+    public long l29754;
+    public long l29755;
+    public long l29756;
+    public long l29757;
+    public long l29758;
+    public long l29759;
+    public long l29760;
+    public long l29761;
+    public long l29762;
+    public long l29763;
+    public long l29764;
+    public long l29765;
+    public long l29766;
+    public long l29767;
+    public long l29768;
+    public long l29769;
+    public long l29770;
+    public long l29771;
+    public long l29772;
+    public long l29773;
+    public long l29774;
+    public long l29775;
+    public long l29776;
+    public long l29777;
+    public long l29778;
+    public long l29779;
+    public long l29780;
+    public long l29781;
+    public long l29782;
+    public long l29783;
+    public long l29784;
+    public long l29785;
+    public long l29786;
+    public long l29787;
+    public long l29788;
+    public long l29789;
+    public long l29790;
+    public long l29791;
+    public long l29792;
+    public long l29793;
+    public long l29794;
+    public long l29795;
+    public long l29796;
+    public long l29797;
+    public long l29798;
+    public long l29799;
+    public long l29800;
+    public long l29801;
+    public long l29802;
+    public long l29803;
+    public long l29804;
+    public long l29805;
+    public long l29806;
+    public long l29807;
+    public long l29808;
+    public long l29809;
+    public long l29810;
+    public long l29811;
+    public long l29812;
+    public long l29813;
+    public long l29814;
+    public long l29815;
+    public long l29816;
+    public long l29817;
+    public long l29818;
+    public long l29819;
+    public long l29820;
+    public long l29821;
+    public long l29822;
+    public long l29823;
+    public long l29824;
+    public long l29825;
+    public long l29826;
+    public long l29827;
+    public long l29828;
+    public long l29829;
+    public long l29830;
+    public long l29831;
+    public long l29832;
+    public long l29833;
+    public long l29834;
+    public long l29835;
+    public long l29836;
+    public long l29837;
+    public long l29838;
+    public long l29839;
+    public long l29840;
+    public long l29841;
+    public long l29842;
+    public long l29843;
+    public long l29844;
+    public long l29845;
+    public long l29846;
+    public long l29847;
+    public long l29848;
+    public long l29849;
+    public long l29850;
+    public long l29851;
+    public long l29852;
+    public long l29853;
+    public long l29854;
+    public long l29855;
+    public long l29856;
+    public long l29857;
+    public long l29858;
+    public long l29859;
+    public long l29860;
+    public long l29861;
+    public long l29862;
+    public long l29863;
+    public long l29864;
+    public long l29865;
+    public long l29866;
+    public long l29867;
+    public long l29868;
+    public long l29869;
+    public long l29870;
+    public long l29871;
+    public long l29872;
+    public long l29873;
+    public long l29874;
+    public long l29875;
+    public long l29876;
+    public long l29877;
+    public long l29878;
+    public long l29879;
+    public long l29880;
+    public long l29881;
+    public long l29882;
+    public long l29883;
+    public long l29884;
+    public long l29885;
+    public long l29886;
+    public long l29887;
+    public long l29888;
+    public long l29889;
+    public long l29890;
+    public long l29891;
+    public long l29892;
+    public long l29893;
+    public long l29894;
+    public long l29895;
+    public long l29896;
+    public long l29897;
+    public long l29898;
+    public long l29899;
+    public long l29900;
+    public long l29901;
+    public long l29902;
+    public long l29903;
+    public long l29904;
+    public long l29905;
+    public long l29906;
+    public long l29907;
+    public long l29908;
+    public long l29909;
+    public long l29910;
+    public long l29911;
+    public long l29912;
+    public long l29913;
+    public long l29914;
+    public long l29915;
+    public long l29916;
+    public long l29917;
+    public long l29918;
+    public long l29919;
+    public long l29920;
+    public long l29921;
+    public long l29922;
+    public long l29923;
+    public long l29924;
+    public long l29925;
+    public long l29926;
+    public long l29927;
+    public long l29928;
+    public long l29929;
+    public long l29930;
+    public long l29931;
+    public long l29932;
+    public long l29933;
+    public long l29934;
+    public long l29935;
+    public long l29936;
+    public long l29937;
+    public long l29938;
+    public long l29939;
+    public long l29940;
+    public long l29941;
+    public long l29942;
+    public long l29943;
+    public long l29944;
+    public long l29945;
+    public long l29946;
+    public long l29947;
+    public long l29948;
+    public long l29949;
+    public long l29950;
+    public long l29951;
+    public long l29952;
+    public long l29953;
+    public long l29954;
+    public long l29955;
+    public long l29956;
+    public long l29957;
+    public long l29958;
+    public long l29959;
+    public long l29960;
+    public long l29961;
+    public long l29962;
+    public long l29963;
+    public long l29964;
+    public long l29965;
+    public long l29966;
+    public long l29967;
+    public long l29968;
+    public long l29969;
+    public long l29970;
+    public long l29971;
+    public long l29972;
+    public long l29973;
+    public long l29974;
+    public long l29975;
+    public long l29976;
+    public long l29977;
+    public long l29978;
+    public long l29979;
+    public long l29980;
+    public long l29981;
+    public long l29982;
+    public long l29983;
+    public long l29984;
+    public long l29985;
+    public long l29986;
+    public long l29987;
+    public long l29988;
+    public long l29989;
+    public long l29990;
+    public long l29991;
+    public long l29992;
+    public long l29993;
+    public long l29994;
+    public long l29995;
+    public long l29996;
+    public long l29997;
+    public long l29998;
+    public long l29999;
+    public long l30000;
+    public long l30001;
+    public long l30002;
+    public long l30003;
+    public long l30004;
+    public long l30005;
+    public long l30006;
+    public long l30007;
+    public long l30008;
+    public long l30009;
+    public long l30010;
+    public long l30011;
+    public long l30012;
+    public long l30013;
+    public long l30014;
+    public long l30015;
+    public long l30016;
+    public long l30017;
+    public long l30018;
+    public long l30019;
+    public long l30020;
+    public long l30021;
+    public long l30022;
+    public long l30023;
+    public long l30024;
+    public long l30025;
+    public long l30026;
+    public long l30027;
+    public long l30028;
+    public long l30029;
+    public long l30030;
+    public long l30031;
+    public long l30032;
+    public long l30033;
+    public long l30034;
+    public long l30035;
+    public long l30036;
+    public long l30037;
+    public long l30038;
+    public long l30039;
+    public long l30040;
+    public long l30041;
+    public long l30042;
+    public long l30043;
+    public long l30044;
+    public long l30045;
+    public long l30046;
+    public long l30047;
+    public long l30048;
+    public long l30049;
+    public long l30050;
+    public long l30051;
+    public long l30052;
+    public long l30053;
+    public long l30054;
+    public long l30055;
+    public long l30056;
+    public long l30057;
+    public long l30058;
+    public long l30059;
+    public long l30060;
+    public long l30061;
+    public long l30062;
+    public long l30063;
+    public long l30064;
+    public long l30065;
+    public long l30066;
+    public long l30067;
+    public long l30068;
+    public long l30069;
+    public long l30070;
+    public long l30071;
+    public long l30072;
+    public long l30073;
+    public long l30074;
+    public long l30075;
+    public long l30076;
+    public long l30077;
+    public long l30078;
+    public long l30079;
+    public long l30080;
+    public long l30081;
+    public long l30082;
+    public long l30083;
+    public long l30084;
+    public long l30085;
+    public long l30086;
+    public long l30087;
+    public long l30088;
+    public long l30089;
+    public long l30090;
+    public long l30091;
+    public long l30092;
+    public long l30093;
+    public long l30094;
+    public long l30095;
+    public long l30096;
+    public long l30097;
+    public long l30098;
+    public long l30099;
+    public long l30100;
+    public long l30101;
+    public long l30102;
+    public long l30103;
+    public long l30104;
+    public long l30105;
+    public long l30106;
+    public long l30107;
+    public long l30108;
+    public long l30109;
+    public long l30110;
+    public long l30111;
+    public long l30112;
+    public long l30113;
+    public long l30114;
+    public long l30115;
+    public long l30116;
+    public long l30117;
+    public long l30118;
+    public long l30119;
+    public long l30120;
+    public long l30121;
+    public long l30122;
+    public long l30123;
+    public long l30124;
+    public long l30125;
+    public long l30126;
+    public long l30127;
+    public long l30128;
+    public long l30129;
+    public long l30130;
+    public long l30131;
+    public long l30132;
+    public long l30133;
+    public long l30134;
+    public long l30135;
+    public long l30136;
+    public long l30137;
+    public long l30138;
+    public long l30139;
+    public long l30140;
+    public long l30141;
+    public long l30142;
+    public long l30143;
+    public long l30144;
+    public long l30145;
+    public long l30146;
+    public long l30147;
+    public long l30148;
+    public long l30149;
+    public long l30150;
+    public long l30151;
+    public long l30152;
+    public long l30153;
+    public long l30154;
+    public long l30155;
+    public long l30156;
+    public long l30157;
+    public long l30158;
+    public long l30159;
+    public long l30160;
+    public long l30161;
+    public long l30162;
+    public long l30163;
+    public long l30164;
+    public long l30165;
+    public long l30166;
+    public long l30167;
+    public long l30168;
+    public long l30169;
+    public long l30170;
+    public long l30171;
+    public long l30172;
+    public long l30173;
+    public long l30174;
+    public long l30175;
+    public long l30176;
+    public long l30177;
+    public long l30178;
+    public long l30179;
+    public long l30180;
+    public long l30181;
+    public long l30182;
+    public long l30183;
+    public long l30184;
+    public long l30185;
+    public long l30186;
+    public long l30187;
+    public long l30188;
+    public long l30189;
+    public long l30190;
+    public long l30191;
+    public long l30192;
+    public long l30193;
+    public long l30194;
+    public long l30195;
+    public long l30196;
+    public long l30197;
+    public long l30198;
+    public long l30199;
+    public long l30200;
+    public long l30201;
+    public long l30202;
+    public long l30203;
+    public long l30204;
+    public long l30205;
+    public long l30206;
+    public long l30207;
+    public long l30208;
+    public long l30209;
+    public long l30210;
+    public long l30211;
+    public long l30212;
+    public long l30213;
+    public long l30214;
+    public long l30215;
+    public long l30216;
+    public long l30217;
+    public long l30218;
+    public long l30219;
+    public long l30220;
+    public long l30221;
+    public long l30222;
+    public long l30223;
+    public long l30224;
+    public long l30225;
+    public long l30226;
+    public long l30227;
+    public long l30228;
+    public long l30229;
+    public long l30230;
+    public long l30231;
+    public long l30232;
+    public long l30233;
+    public long l30234;
+    public long l30235;
+    public long l30236;
+    public long l30237;
+    public long l30238;
+    public long l30239;
+    public long l30240;
+    public long l30241;
+    public long l30242;
+    public long l30243;
+    public long l30244;
+    public long l30245;
+    public long l30246;
+    public long l30247;
+    public long l30248;
+    public long l30249;
+    public long l30250;
+    public long l30251;
+    public long l30252;
+    public long l30253;
+    public long l30254;
+    public long l30255;
+    public long l30256;
+    public long l30257;
+    public long l30258;
+    public long l30259;
+    public long l30260;
+    public long l30261;
+    public long l30262;
+    public long l30263;
+    public long l30264;
+    public long l30265;
+    public long l30266;
+    public long l30267;
+    public long l30268;
+    public long l30269;
+    public long l30270;
+    public long l30271;
+    public long l30272;
+    public long l30273;
+    public long l30274;
+    public long l30275;
+    public long l30276;
+    public long l30277;
+    public long l30278;
+    public long l30279;
+    public long l30280;
+    public long l30281;
+    public long l30282;
+    public long l30283;
+    public long l30284;
+    public long l30285;
+    public long l30286;
+    public long l30287;
+    public long l30288;
+    public long l30289;
+    public long l30290;
+    public long l30291;
+    public long l30292;
+    public long l30293;
+    public long l30294;
+    public long l30295;
+    public long l30296;
+    public long l30297;
+    public long l30298;
+    public long l30299;
+    public long l30300;
+    public long l30301;
+    public long l30302;
+    public long l30303;
+    public long l30304;
+    public long l30305;
+    public long l30306;
+    public long l30307;
+    public long l30308;
+    public long l30309;
+    public long l30310;
+    public long l30311;
+    public long l30312;
+    public long l30313;
+    public long l30314;
+    public long l30315;
+    public long l30316;
+    public long l30317;
+    public long l30318;
+    public long l30319;
+    public long l30320;
+    public long l30321;
+    public long l30322;
+    public long l30323;
+    public long l30324;
+    public long l30325;
+    public long l30326;
+    public long l30327;
+    public long l30328;
+    public long l30329;
+    public long l30330;
+    public long l30331;
+    public long l30332;
+    public long l30333;
+    public long l30334;
+    public long l30335;
+    public long l30336;
+    public long l30337;
+    public long l30338;
+    public long l30339;
+    public long l30340;
+    public long l30341;
+    public long l30342;
+    public long l30343;
+    public long l30344;
+    public long l30345;
+    public long l30346;
+    public long l30347;
+    public long l30348;
+    public long l30349;
+    public long l30350;
+    public long l30351;
+    public long l30352;
+    public long l30353;
+    public long l30354;
+    public long l30355;
+    public long l30356;
+    public long l30357;
+    public long l30358;
+    public long l30359;
+    public long l30360;
+    public long l30361;
+    public long l30362;
+    public long l30363;
+    public long l30364;
+    public long l30365;
+    public long l30366;
+    public long l30367;
+    public long l30368;
+    public long l30369;
+    public long l30370;
+    public long l30371;
+    public long l30372;
+    public long l30373;
+    public long l30374;
+    public long l30375;
+    public long l30376;
+    public long l30377;
+    public long l30378;
+    public long l30379;
+    public long l30380;
+    public long l30381;
+    public long l30382;
+    public long l30383;
+    public long l30384;
+    public long l30385;
+    public long l30386;
+    public long l30387;
+    public long l30388;
+    public long l30389;
+    public long l30390;
+    public long l30391;
+    public long l30392;
+    public long l30393;
+    public long l30394;
+    public long l30395;
+    public long l30396;
+    public long l30397;
+    public long l30398;
+    public long l30399;
+    public long l30400;
+    public long l30401;
+    public long l30402;
+    public long l30403;
+    public long l30404;
+    public long l30405;
+    public long l30406;
+    public long l30407;
+    public long l30408;
+    public long l30409;
+    public long l30410;
+    public long l30411;
+    public long l30412;
+    public long l30413;
+    public long l30414;
+    public long l30415;
+    public long l30416;
+    public long l30417;
+    public long l30418;
+    public long l30419;
+    public long l30420;
+    public long l30421;
+    public long l30422;
+    public long l30423;
+    public long l30424;
+    public long l30425;
+    public long l30426;
+    public long l30427;
+    public long l30428;
+    public long l30429;
+    public long l30430;
+    public long l30431;
+    public long l30432;
+    public long l30433;
+    public long l30434;
+    public long l30435;
+    public long l30436;
+    public long l30437;
+    public long l30438;
+    public long l30439;
+    public long l30440;
+    public long l30441;
+    public long l30442;
+    public long l30443;
+    public long l30444;
+    public long l30445;
+    public long l30446;
+    public long l30447;
+    public long l30448;
+    public long l30449;
+    public long l30450;
+    public long l30451;
+    public long l30452;
+    public long l30453;
+    public long l30454;
+    public long l30455;
+    public long l30456;
+    public long l30457;
+    public long l30458;
+    public long l30459;
+    public long l30460;
+    public long l30461;
+    public long l30462;
+    public long l30463;
+    public long l30464;
+    public long l30465;
+    public long l30466;
+    public long l30467;
+    public long l30468;
+    public long l30469;
+    public long l30470;
+    public long l30471;
+    public long l30472;
+    public long l30473;
+    public long l30474;
+    public long l30475;
+    public long l30476;
+    public long l30477;
+    public long l30478;
+    public long l30479;
+    public long l30480;
+    public long l30481;
+    public long l30482;
+    public long l30483;
+    public long l30484;
+    public long l30485;
+    public long l30486;
+    public long l30487;
+    public long l30488;
+    public long l30489;
+    public long l30490;
+    public long l30491;
+    public long l30492;
+    public long l30493;
+    public long l30494;
+    public long l30495;
+    public long l30496;
+    public long l30497;
+    public long l30498;
+    public long l30499;
+    public long l30500;
+    public long l30501;
+    public long l30502;
+    public long l30503;
+    public long l30504;
+    public long l30505;
+    public long l30506;
+    public long l30507;
+    public long l30508;
+    public long l30509;
+    public long l30510;
+    public long l30511;
+    public long l30512;
+    public long l30513;
+    public long l30514;
+    public long l30515;
+    public long l30516;
+    public long l30517;
+    public long l30518;
+    public long l30519;
+    public long l30520;
+    public long l30521;
+    public long l30522;
+    public long l30523;
+    public long l30524;
+    public long l30525;
+    public long l30526;
+    public long l30527;
+    public long l30528;
+    public long l30529;
+    public long l30530;
+    public long l30531;
+    public long l30532;
+    public long l30533;
+    public long l30534;
+    public long l30535;
+    public long l30536;
+    public long l30537;
+    public long l30538;
+    public long l30539;
+    public long l30540;
+    public long l30541;
+    public long l30542;
+    public long l30543;
+    public long l30544;
+    public long l30545;
+    public long l30546;
+    public long l30547;
+    public long l30548;
+    public long l30549;
+    public long l30550;
+    public long l30551;
+    public long l30552;
+    public long l30553;
+    public long l30554;
+    public long l30555;
+    public long l30556;
+    public long l30557;
+    public long l30558;
+    public long l30559;
+    public long l30560;
+    public long l30561;
+    public long l30562;
+    public long l30563;
+    public long l30564;
+    public long l30565;
+    public long l30566;
+    public long l30567;
+    public long l30568;
+    public long l30569;
+    public long l30570;
+    public long l30571;
+    public long l30572;
+    public long l30573;
+    public long l30574;
+    public long l30575;
+    public long l30576;
+    public long l30577;
+    public long l30578;
+    public long l30579;
+    public long l30580;
+    public long l30581;
+    public long l30582;
+    public long l30583;
+    public long l30584;
+    public long l30585;
+    public long l30586;
+    public long l30587;
+    public long l30588;
+    public long l30589;
+    public long l30590;
+    public long l30591;
+    public long l30592;
+    public long l30593;
+    public long l30594;
+    public long l30595;
+    public long l30596;
+    public long l30597;
+    public long l30598;
+    public long l30599;
+    public long l30600;
+    public long l30601;
+    public long l30602;
+    public long l30603;
+    public long l30604;
+    public long l30605;
+    public long l30606;
+    public long l30607;
+    public long l30608;
+    public long l30609;
+    public long l30610;
+    public long l30611;
+    public long l30612;
+    public long l30613;
+    public long l30614;
+    public long l30615;
+    public long l30616;
+    public long l30617;
+    public long l30618;
+    public long l30619;
+    public long l30620;
+    public long l30621;
+    public long l30622;
+    public long l30623;
+    public long l30624;
+    public long l30625;
+    public long l30626;
+    public long l30627;
+    public long l30628;
+    public long l30629;
+    public long l30630;
+    public long l30631;
+    public long l30632;
+    public long l30633;
+    public long l30634;
+    public long l30635;
+    public long l30636;
+    public long l30637;
+    public long l30638;
+    public long l30639;
+    public long l30640;
+    public long l30641;
+    public long l30642;
+    public long l30643;
+    public long l30644;
+    public long l30645;
+    public long l30646;
+    public long l30647;
+    public long l30648;
+    public long l30649;
+    public long l30650;
+    public long l30651;
+    public long l30652;
+    public long l30653;
+    public long l30654;
+    public long l30655;
+    public long l30656;
+    public long l30657;
+    public long l30658;
+    public long l30659;
+    public long l30660;
+    public long l30661;
+    public long l30662;
+    public long l30663;
+    public long l30664;
+    public long l30665;
+    public long l30666;
+    public long l30667;
+    public long l30668;
+    public long l30669;
+    public long l30670;
+    public long l30671;
+    public long l30672;
+    public long l30673;
+    public long l30674;
+    public long l30675;
+    public long l30676;
+    public long l30677;
+    public long l30678;
+    public long l30679;
+    public long l30680;
+    public long l30681;
+    public long l30682;
+    public long l30683;
+    public long l30684;
+    public long l30685;
+    public long l30686;
+    public long l30687;
+    public long l30688;
+    public long l30689;
+    public long l30690;
+    public long l30691;
+    public long l30692;
+    public long l30693;
+    public long l30694;
+    public long l30695;
+    public long l30696;
+    public long l30697;
+    public long l30698;
+    public long l30699;
+    public long l30700;
+    public long l30701;
+    public long l30702;
+    public long l30703;
+    public long l30704;
+    public long l30705;
+    public long l30706;
+    public long l30707;
+    public long l30708;
+    public long l30709;
+    public long l30710;
+    public long l30711;
+    public long l30712;
+    public long l30713;
+    public long l30714;
+    public long l30715;
+    public long l30716;
+    public long l30717;
+    public long l30718;
+    public long l30719;
+    public long l30720;
+    public long l30721;
+    public long l30722;
+    public long l30723;
+    public long l30724;
+    public long l30725;
+    public long l30726;
+    public long l30727;
+    public long l30728;
+    public long l30729;
+    public long l30730;
+    public long l30731;
+    public long l30732;
+    public long l30733;
+    public long l30734;
+    public long l30735;
+    public long l30736;
+    public long l30737;
+    public long l30738;
+    public long l30739;
+    public long l30740;
+    public long l30741;
+    public long l30742;
+    public long l30743;
+    public long l30744;
+    public long l30745;
+    public long l30746;
+    public long l30747;
+    public long l30748;
+    public long l30749;
+    public long l30750;
+    public long l30751;
+    public long l30752;
+    public long l30753;
+    public long l30754;
+    public long l30755;
+    public long l30756;
+    public long l30757;
+    public long l30758;
+    public long l30759;
+    public long l30760;
+    public long l30761;
+    public long l30762;
+    public long l30763;
+    public long l30764;
+    public long l30765;
+    public long l30766;
+    public long l30767;
+    public long l30768;
+    public long l30769;
+    public long l30770;
+    public long l30771;
+    public long l30772;
+    public long l30773;
+    public long l30774;
+    public long l30775;
+    public long l30776;
+    public long l30777;
+    public long l30778;
+    public long l30779;
+    public long l30780;
+    public long l30781;
+    public long l30782;
+    public long l30783;
+    public long l30784;
+    public long l30785;
+    public long l30786;
+    public long l30787;
+    public long l30788;
+    public long l30789;
+    public long l30790;
+    public long l30791;
+    public long l30792;
+    public long l30793;
+    public long l30794;
+    public long l30795;
+    public long l30796;
+    public long l30797;
+    public long l30798;
+    public long l30799;
+    public long l30800;
+    public long l30801;
+    public long l30802;
+    public long l30803;
+    public long l30804;
+    public long l30805;
+    public long l30806;
+    public long l30807;
+    public long l30808;
+    public long l30809;
+    public long l30810;
+    public long l30811;
+    public long l30812;
+    public long l30813;
+    public long l30814;
+    public long l30815;
+    public long l30816;
+    public long l30817;
+    public long l30818;
+    public long l30819;
+    public long l30820;
+    public long l30821;
+    public long l30822;
+    public long l30823;
+    public long l30824;
+    public long l30825;
+    public long l30826;
+    public long l30827;
+    public long l30828;
+    public long l30829;
+    public long l30830;
+    public long l30831;
+    public long l30832;
+    public long l30833;
+    public long l30834;
+    public long l30835;
+    public long l30836;
+    public long l30837;
+    public long l30838;
+    public long l30839;
+    public long l30840;
+    public long l30841;
+    public long l30842;
+    public long l30843;
+    public long l30844;
+    public long l30845;
+    public long l30846;
+    public long l30847;
+    public long l30848;
+    public long l30849;
+    public long l30850;
+    public long l30851;
+    public long l30852;
+    public long l30853;
+    public long l30854;
+    public long l30855;
+    public long l30856;
+    public long l30857;
+    public long l30858;
+    public long l30859;
+    public long l30860;
+    public long l30861;
+    public long l30862;
+    public long l30863;
+    public long l30864;
+    public long l30865;
+    public long l30866;
+    public long l30867;
+    public long l30868;
+    public long l30869;
+    public long l30870;
+    public long l30871;
+    public long l30872;
+    public long l30873;
+    public long l30874;
+    public long l30875;
+    public long l30876;
+    public long l30877;
+    public long l30878;
+    public long l30879;
+    public long l30880;
+    public long l30881;
+    public long l30882;
+    public long l30883;
+    public long l30884;
+    public long l30885;
+    public long l30886;
+    public long l30887;
+    public long l30888;
+    public long l30889;
+    public long l30890;
+    public long l30891;
+    public long l30892;
+    public long l30893;
+    public long l30894;
+    public long l30895;
+    public long l30896;
+    public long l30897;
+    public long l30898;
+    public long l30899;
+    public long l30900;
+    public long l30901;
+    public long l30902;
+    public long l30903;
+    public long l30904;
+    public long l30905;
+    public long l30906;
+    public long l30907;
+    public long l30908;
+    public long l30909;
+    public long l30910;
+    public long l30911;
+    public long l30912;
+    public long l30913;
+    public long l30914;
+    public long l30915;
+    public long l30916;
+    public long l30917;
+    public long l30918;
+    public long l30919;
+    public long l30920;
+    public long l30921;
+    public long l30922;
+    public long l30923;
+    public long l30924;
+    public long l30925;
+    public long l30926;
+    public long l30927;
+    public long l30928;
+    public long l30929;
+    public long l30930;
+    public long l30931;
+    public long l30932;
+    public long l30933;
+    public long l30934;
+    public long l30935;
+    public long l30936;
+    public long l30937;
+    public long l30938;
+    public long l30939;
+    public long l30940;
+    public long l30941;
+    public long l30942;
+    public long l30943;
+    public long l30944;
+    public long l30945;
+    public long l30946;
+    public long l30947;
+    public long l30948;
+    public long l30949;
+    public long l30950;
+    public long l30951;
+    public long l30952;
+    public long l30953;
+    public long l30954;
+    public long l30955;
+    public long l30956;
+    public long l30957;
+    public long l30958;
+    public long l30959;
+    public long l30960;
+    public long l30961;
+    public long l30962;
+    public long l30963;
+    public long l30964;
+    public long l30965;
+    public long l30966;
+    public long l30967;
+    public long l30968;
+    public long l30969;
+    public long l30970;
+    public long l30971;
+    public long l30972;
+    public long l30973;
+    public long l30974;
+    public long l30975;
+    public long l30976;
+    public long l30977;
+    public long l30978;
+    public long l30979;
+    public long l30980;
+    public long l30981;
+    public long l30982;
+    public long l30983;
+    public long l30984;
+    public long l30985;
+    public long l30986;
+    public long l30987;
+    public long l30988;
+    public long l30989;
+    public long l30990;
+    public long l30991;
+    public long l30992;
+    public long l30993;
+    public long l30994;
+    public long l30995;
+    public long l30996;
+    public long l30997;
+    public long l30998;
+    public long l30999;
+    public long l31000;
+    public long l31001;
+    public long l31002;
+    public long l31003;
+    public long l31004;
+    public long l31005;
+    public long l31006;
+    public long l31007;
+    public long l31008;
+    public long l31009;
+    public long l31010;
+    public long l31011;
+    public long l31012;
+    public long l31013;
+    public long l31014;
+    public long l31015;
+    public long l31016;
+    public long l31017;
+    public long l31018;
+    public long l31019;
+    public long l31020;
+    public long l31021;
+    public long l31022;
+    public long l31023;
+    public long l31024;
+    public long l31025;
+    public long l31026;
+    public long l31027;
+    public long l31028;
+    public long l31029;
+    public long l31030;
+    public long l31031;
+    public long l31032;
+    public long l31033;
+    public long l31034;
+    public long l31035;
+    public long l31036;
+    public long l31037;
+    public long l31038;
+    public long l31039;
+    public long l31040;
+    public long l31041;
+    public long l31042;
+    public long l31043;
+    public long l31044;
+    public long l31045;
+    public long l31046;
+    public long l31047;
+    public long l31048;
+    public long l31049;
+    public long l31050;
+    public long l31051;
+    public long l31052;
+    public long l31053;
+    public long l31054;
+    public long l31055;
+    public long l31056;
+    public long l31057;
+    public long l31058;
+    public long l31059;
+    public long l31060;
+    public long l31061;
+    public long l31062;
+    public long l31063;
+    public long l31064;
+    public long l31065;
+    public long l31066;
+    public long l31067;
+    public long l31068;
+    public long l31069;
+    public long l31070;
+    public long l31071;
+    public long l31072;
+    public long l31073;
+    public long l31074;
+    public long l31075;
+    public long l31076;
+    public long l31077;
+    public long l31078;
+    public long l31079;
+    public long l31080;
+    public long l31081;
+    public long l31082;
+    public long l31083;
+    public long l31084;
+    public long l31085;
+    public long l31086;
+    public long l31087;
+    public long l31088;
+    public long l31089;
+    public long l31090;
+    public long l31091;
+    public long l31092;
+    public long l31093;
+    public long l31094;
+    public long l31095;
+    public long l31096;
+    public long l31097;
+    public long l31098;
+    public long l31099;
+    public long l31100;
+    public long l31101;
+    public long l31102;
+    public long l31103;
+    public long l31104;
+    public long l31105;
+    public long l31106;
+    public long l31107;
+    public long l31108;
+    public long l31109;
+    public long l31110;
+    public long l31111;
+    public long l31112;
+    public long l31113;
+    public long l31114;
+    public long l31115;
+    public long l31116;
+    public long l31117;
+    public long l31118;
+    public long l31119;
+    public long l31120;
+    public long l31121;
+    public long l31122;
+    public long l31123;
+    public long l31124;
+    public long l31125;
+    public long l31126;
+    public long l31127;
+    public long l31128;
+    public long l31129;
+    public long l31130;
+    public long l31131;
+    public long l31132;
+    public long l31133;
+    public long l31134;
+    public long l31135;
+    public long l31136;
+    public long l31137;
+    public long l31138;
+    public long l31139;
+    public long l31140;
+    public long l31141;
+    public long l31142;
+    public long l31143;
+    public long l31144;
+    public long l31145;
+    public long l31146;
+    public long l31147;
+    public long l31148;
+    public long l31149;
+    public long l31150;
+    public long l31151;
+    public long l31152;
+    public long l31153;
+    public long l31154;
+    public long l31155;
+    public long l31156;
+    public long l31157;
+    public long l31158;
+    public long l31159;
+    public long l31160;
+    public long l31161;
+    public long l31162;
+    public long l31163;
+    public long l31164;
+    public long l31165;
+    public long l31166;
+    public long l31167;
+    public long l31168;
+    public long l31169;
+    public long l31170;
+    public long l31171;
+    public long l31172;
+    public long l31173;
+    public long l31174;
+    public long l31175;
+    public long l31176;
+    public long l31177;
+    public long l31178;
+    public long l31179;
+    public long l31180;
+    public long l31181;
+    public long l31182;
+    public long l31183;
+    public long l31184;
+    public long l31185;
+    public long l31186;
+    public long l31187;
+    public long l31188;
+    public long l31189;
+    public long l31190;
+    public long l31191;
+    public long l31192;
+    public long l31193;
+    public long l31194;
+    public long l31195;
+    public long l31196;
+    public long l31197;
+    public long l31198;
+    public long l31199;
+    public long l31200;
+    public long l31201;
+    public long l31202;
+    public long l31203;
+    public long l31204;
+    public long l31205;
+    public long l31206;
+    public long l31207;
+    public long l31208;
+    public long l31209;
+    public long l31210;
+    public long l31211;
+    public long l31212;
+    public long l31213;
+    public long l31214;
+    public long l31215;
+    public long l31216;
+    public long l31217;
+    public long l31218;
+    public long l31219;
+    public long l31220;
+    public long l31221;
+    public long l31222;
+    public long l31223;
+    public long l31224;
+    public long l31225;
+    public long l31226;
+    public long l31227;
+    public long l31228;
+    public long l31229;
+    public long l31230;
+    public long l31231;
+    public long l31232;
+    public long l31233;
+    public long l31234;
+    public long l31235;
+    public long l31236;
+    public long l31237;
+    public long l31238;
+    public long l31239;
+    public long l31240;
+    public long l31241;
+    public long l31242;
+    public long l31243;
+    public long l31244;
+    public long l31245;
+    public long l31246;
+    public long l31247;
+    public long l31248;
+    public long l31249;
+    public long l31250;
+    public long l31251;
+    public long l31252;
+    public long l31253;
+    public long l31254;
+    public long l31255;
+    public long l31256;
+    public long l31257;
+    public long l31258;
+    public long l31259;
+    public long l31260;
+    public long l31261;
+    public long l31262;
+    public long l31263;
+    public long l31264;
+    public long l31265;
+    public long l31266;
+    public long l31267;
+    public long l31268;
+    public long l31269;
+    public long l31270;
+    public long l31271;
+    public long l31272;
+    public long l31273;
+    public long l31274;
+    public long l31275;
+    public long l31276;
+    public long l31277;
+    public long l31278;
+    public long l31279;
+    public long l31280;
+    public long l31281;
+    public long l31282;
+    public long l31283;
+    public long l31284;
+    public long l31285;
+    public long l31286;
+    public long l31287;
+    public long l31288;
+    public long l31289;
+    public long l31290;
+    public long l31291;
+    public long l31292;
+    public long l31293;
+    public long l31294;
+    public long l31295;
+    public long l31296;
+    public long l31297;
+    public long l31298;
+    public long l31299;
+    public long l31300;
+    public long l31301;
+    public long l31302;
+    public long l31303;
+    public long l31304;
+    public long l31305;
+    public long l31306;
+    public long l31307;
+    public long l31308;
+    public long l31309;
+    public long l31310;
+    public long l31311;
+    public long l31312;
+    public long l31313;
+    public long l31314;
+    public long l31315;
+    public long l31316;
+    public long l31317;
+    public long l31318;
+    public long l31319;
+    public long l31320;
+    public long l31321;
+    public long l31322;
+    public long l31323;
+    public long l31324;
+    public long l31325;
+    public long l31326;
+    public long l31327;
+    public long l31328;
+    public long l31329;
+    public long l31330;
+    public long l31331;
+    public long l31332;
+    public long l31333;
+    public long l31334;
+    public long l31335;
+    public long l31336;
+    public long l31337;
+    public long l31338;
+    public long l31339;
+    public long l31340;
+    public long l31341;
+    public long l31342;
+    public long l31343;
+    public long l31344;
+    public long l31345;
+    public long l31346;
+    public long l31347;
+    public long l31348;
+    public long l31349;
+    public long l31350;
+    public long l31351;
+    public long l31352;
+    public long l31353;
+    public long l31354;
+    public long l31355;
+    public long l31356;
+    public long l31357;
+    public long l31358;
+    public long l31359;
+    public long l31360;
+    public long l31361;
+    public long l31362;
+    public long l31363;
+    public long l31364;
+    public long l31365;
+    public long l31366;
+    public long l31367;
+    public long l31368;
+    public long l31369;
+    public long l31370;
+    public long l31371;
+    public long l31372;
+    public long l31373;
+    public long l31374;
+    public long l31375;
+    public long l31376;
+    public long l31377;
+    public long l31378;
+    public long l31379;
+    public long l31380;
+    public long l31381;
+    public long l31382;
+    public long l31383;
+    public long l31384;
+    public long l31385;
+    public long l31386;
+    public long l31387;
+    public long l31388;
+    public long l31389;
+    public long l31390;
+    public long l31391;
+    public long l31392;
+    public long l31393;
+    public long l31394;
+    public long l31395;
+    public long l31396;
+    public long l31397;
+    public long l31398;
+    public long l31399;
+    public long l31400;
+    public long l31401;
+    public long l31402;
+    public long l31403;
+    public long l31404;
+    public long l31405;
+    public long l31406;
+    public long l31407;
+    public long l31408;
+    public long l31409;
+    public long l31410;
+    public long l31411;
+    public long l31412;
+    public long l31413;
+    public long l31414;
+    public long l31415;
+    public long l31416;
+    public long l31417;
+    public long l31418;
+    public long l31419;
+    public long l31420;
+    public long l31421;
+    public long l31422;
+    public long l31423;
+    public long l31424;
+    public long l31425;
+    public long l31426;
+    public long l31427;
+    public long l31428;
+    public long l31429;
+    public long l31430;
+    public long l31431;
+    public long l31432;
+    public long l31433;
+    public long l31434;
+    public long l31435;
+    public long l31436;
+    public long l31437;
+    public long l31438;
+    public long l31439;
+    public long l31440;
+    public long l31441;
+    public long l31442;
+    public long l31443;
+    public long l31444;
+    public long l31445;
+    public long l31446;
+    public long l31447;
+    public long l31448;
+    public long l31449;
+    public long l31450;
+    public long l31451;
+    public long l31452;
+    public long l31453;
+    public long l31454;
+    public long l31455;
+    public long l31456;
+    public long l31457;
+    public long l31458;
+    public long l31459;
+    public long l31460;
+    public long l31461;
+    public long l31462;
+    public long l31463;
+    public long l31464;
+    public long l31465;
+    public long l31466;
+    public long l31467;
+    public long l31468;
+    public long l31469;
+    public long l31470;
+    public long l31471;
+    public long l31472;
+    public long l31473;
+    public long l31474;
+    public long l31475;
+    public long l31476;
+    public long l31477;
+    public long l31478;
+    public long l31479;
+    public long l31480;
+    public long l31481;
+    public long l31482;
+    public long l31483;
+    public long l31484;
+    public long l31485;
+    public long l31486;
+    public long l31487;
+    public long l31488;
+    public long l31489;
+    public long l31490;
+    public long l31491;
+    public long l31492;
+    public long l31493;
+    public long l31494;
+    public long l31495;
+    public long l31496;
+    public long l31497;
+    public long l31498;
+    public long l31499;
+    public long l31500;
+    public long l31501;
+    public long l31502;
+    public long l31503;
+    public long l31504;
+    public long l31505;
+    public long l31506;
+    public long l31507;
+    public long l31508;
+    public long l31509;
+    public long l31510;
+    public long l31511;
+    public long l31512;
+    public long l31513;
+    public long l31514;
+    public long l31515;
+    public long l31516;
+    public long l31517;
+    public long l31518;
+    public long l31519;
+    public long l31520;
+    public long l31521;
+    public long l31522;
+    public long l31523;
+    public long l31524;
+    public long l31525;
+    public long l31526;
+    public long l31527;
+    public long l31528;
+    public long l31529;
+    public long l31530;
+    public long l31531;
+    public long l31532;
+    public long l31533;
+    public long l31534;
+    public long l31535;
+    public long l31536;
+    public long l31537;
+    public long l31538;
+    public long l31539;
+    public long l31540;
+    public long l31541;
+    public long l31542;
+    public long l31543;
+    public long l31544;
+    public long l31545;
+    public long l31546;
+    public long l31547;
+    public long l31548;
+    public long l31549;
+    public long l31550;
+    public long l31551;
+    public long l31552;
+    public long l31553;
+    public long l31554;
+    public long l31555;
+    public long l31556;
+    public long l31557;
+    public long l31558;
+    public long l31559;
+    public long l31560;
+    public long l31561;
+    public long l31562;
+    public long l31563;
+    public long l31564;
+    public long l31565;
+    public long l31566;
+    public long l31567;
+    public long l31568;
+    public long l31569;
+    public long l31570;
+    public long l31571;
+    public long l31572;
+    public long l31573;
+    public long l31574;
+    public long l31575;
+    public long l31576;
+    public long l31577;
+    public long l31578;
+    public long l31579;
+    public long l31580;
+    public long l31581;
+    public long l31582;
+    public long l31583;
+    public long l31584;
+    public long l31585;
+    public long l31586;
+    public long l31587;
+    public long l31588;
+    public long l31589;
+    public long l31590;
+    public long l31591;
+    public long l31592;
+    public long l31593;
+    public long l31594;
+    public long l31595;
+    public long l31596;
+    public long l31597;
+    public long l31598;
+    public long l31599;
+    public long l31600;
+    public long l31601;
+    public long l31602;
+    public long l31603;
+    public long l31604;
+    public long l31605;
+    public long l31606;
+    public long l31607;
+    public long l31608;
+    public long l31609;
+    public long l31610;
+    public long l31611;
+    public long l31612;
+    public long l31613;
+    public long l31614;
+    public long l31615;
+    public long l31616;
+    public long l31617;
+    public long l31618;
+    public long l31619;
+    public long l31620;
+    public long l31621;
+    public long l31622;
+    public long l31623;
+    public long l31624;
+    public long l31625;
+    public long l31626;
+    public long l31627;
+    public long l31628;
+    public long l31629;
+    public long l31630;
+    public long l31631;
+    public long l31632;
+    public long l31633;
+    public long l31634;
+    public long l31635;
+    public long l31636;
+    public long l31637;
+    public long l31638;
+    public long l31639;
+    public long l31640;
+    public long l31641;
+    public long l31642;
+    public long l31643;
+    public long l31644;
+    public long l31645;
+    public long l31646;
+    public long l31647;
+    public long l31648;
+    public long l31649;
+    public long l31650;
+    public long l31651;
+    public long l31652;
+    public long l31653;
+    public long l31654;
+    public long l31655;
+    public long l31656;
+    public long l31657;
+    public long l31658;
+    public long l31659;
+    public long l31660;
+    public long l31661;
+    public long l31662;
+    public long l31663;
+    public long l31664;
+    public long l31665;
+    public long l31666;
+    public long l31667;
+    public long l31668;
+    public long l31669;
+    public long l31670;
+    public long l31671;
+    public long l31672;
+    public long l31673;
+    public long l31674;
+    public long l31675;
+    public long l31676;
+    public long l31677;
+    public long l31678;
+    public long l31679;
+    public long l31680;
+    public long l31681;
+    public long l31682;
+    public long l31683;
+    public long l31684;
+    public long l31685;
+    public long l31686;
+    public long l31687;
+    public long l31688;
+    public long l31689;
+    public long l31690;
+    public long l31691;
+    public long l31692;
+    public long l31693;
+    public long l31694;
+    public long l31695;
+    public long l31696;
+    public long l31697;
+    public long l31698;
+    public long l31699;
+    public long l31700;
+    public long l31701;
+    public long l31702;
+    public long l31703;
+    public long l31704;
+    public long l31705;
+    public long l31706;
+    public long l31707;
+    public long l31708;
+    public long l31709;
+    public long l31710;
+    public long l31711;
+    public long l31712;
+    public long l31713;
+    public long l31714;
+    public long l31715;
+    public long l31716;
+    public long l31717;
+    public long l31718;
+    public long l31719;
+    public long l31720;
+    public long l31721;
+    public long l31722;
+    public long l31723;
+    public long l31724;
+    public long l31725;
+    public long l31726;
+    public long l31727;
+    public long l31728;
+    public long l31729;
+    public long l31730;
+    public long l31731;
+    public long l31732;
+    public long l31733;
+    public long l31734;
+    public long l31735;
+    public long l31736;
+    public long l31737;
+    public long l31738;
+    public long l31739;
+    public long l31740;
+    public long l31741;
+    public long l31742;
+    public long l31743;
+    public long l31744;
+    public long l31745;
+    public long l31746;
+    public long l31747;
+    public long l31748;
+    public long l31749;
+    public long l31750;
+    public long l31751;
+    public long l31752;
+    public long l31753;
+    public long l31754;
+    public long l31755;
+    public long l31756;
+    public long l31757;
+    public long l31758;
+    public long l31759;
+    public long l31760;
+    public long l31761;
+    public long l31762;
+    public long l31763;
+    public long l31764;
+    public long l31765;
+    public long l31766;
+    public long l31767;
+    public long l31768;
+    public long l31769;
+    public long l31770;
+    public long l31771;
+    public long l31772;
+    public long l31773;
+    public long l31774;
+    public long l31775;
+    public long l31776;
+    public long l31777;
+    public long l31778;
+    public long l31779;
+    public long l31780;
+    public long l31781;
+    public long l31782;
+    public long l31783;
+    public long l31784;
+    public long l31785;
+    public long l31786;
+    public long l31787;
+    public long l31788;
+    public long l31789;
+    public long l31790;
+    public long l31791;
+    public long l31792;
+    public long l31793;
+    public long l31794;
+    public long l31795;
+    public long l31796;
+    public long l31797;
+    public long l31798;
+    public long l31799;
+    public long l31800;
+    public long l31801;
+    public long l31802;
+    public long l31803;
+    public long l31804;
+    public long l31805;
+    public long l31806;
+    public long l31807;
+    public long l31808;
+    public long l31809;
+    public long l31810;
+    public long l31811;
+    public long l31812;
+    public long l31813;
+    public long l31814;
+    public long l31815;
+    public long l31816;
+    public long l31817;
+    public long l31818;
+    public long l31819;
+    public long l31820;
+    public long l31821;
+    public long l31822;
+    public long l31823;
+    public long l31824;
+    public long l31825;
+    public long l31826;
+    public long l31827;
+    public long l31828;
+    public long l31829;
+    public long l31830;
+    public long l31831;
+    public long l31832;
+    public long l31833;
+    public long l31834;
+    public long l31835;
+    public long l31836;
+    public long l31837;
+    public long l31838;
+    public long l31839;
+    public long l31840;
+    public long l31841;
+    public long l31842;
+    public long l31843;
+    public long l31844;
+    public long l31845;
+    public long l31846;
+    public long l31847;
+    public long l31848;
+    public long l31849;
+    public long l31850;
+    public long l31851;
+    public long l31852;
+    public long l31853;
+    public long l31854;
+    public long l31855;
+    public long l31856;
+    public long l31857;
+    public long l31858;
+    public long l31859;
+    public long l31860;
+    public long l31861;
+    public long l31862;
+    public long l31863;
+    public long l31864;
+    public long l31865;
+    public long l31866;
+    public long l31867;
+    public long l31868;
+    public long l31869;
+    public long l31870;
+    public long l31871;
+    public long l31872;
+    public long l31873;
+    public long l31874;
+    public long l31875;
+    public long l31876;
+    public long l31877;
+    public long l31878;
+    public long l31879;
+    public long l31880;
+    public long l31881;
+    public long l31882;
+    public long l31883;
+    public long l31884;
+    public long l31885;
+    public long l31886;
+    public long l31887;
+    public long l31888;
+    public long l31889;
+    public long l31890;
+    public long l31891;
+    public long l31892;
+    public long l31893;
+    public long l31894;
+    public long l31895;
+    public long l31896;
+    public long l31897;
+    public long l31898;
+    public long l31899;
+    public long l31900;
+    public long l31901;
+    public long l31902;
+    public long l31903;
+    public long l31904;
+    public long l31905;
+    public long l31906;
+    public long l31907;
+    public long l31908;
+    public long l31909;
+    public long l31910;
+    public long l31911;
+    public long l31912;
+    public long l31913;
+    public long l31914;
+    public long l31915;
+    public long l31916;
+    public long l31917;
+    public long l31918;
+    public long l31919;
+    public long l31920;
+    public long l31921;
+    public long l31922;
+    public long l31923;
+    public long l31924;
+    public long l31925;
+    public long l31926;
+    public long l31927;
+    public long l31928;
+    public long l31929;
+    public long l31930;
+    public long l31931;
+    public long l31932;
+    public long l31933;
+    public long l31934;
+    public long l31935;
+    public long l31936;
+    public long l31937;
+    public long l31938;
+    public long l31939;
+    public long l31940;
+    public long l31941;
+    public long l31942;
+    public long l31943;
+    public long l31944;
+    public long l31945;
+    public long l31946;
+    public long l31947;
+    public long l31948;
+    public long l31949;
+    public long l31950;
+    public long l31951;
+    public long l31952;
+    public long l31953;
+    public long l31954;
+    public long l31955;
+    public long l31956;
+    public long l31957;
+    public long l31958;
+    public long l31959;
+    public long l31960;
+    public long l31961;
+    public long l31962;
+    public long l31963;
+    public long l31964;
+    public long l31965;
+    public long l31966;
+    public long l31967;
+    public long l31968;
+    public long l31969;
+    public long l31970;
+    public long l31971;
+    public long l31972;
+    public long l31973;
+    public long l31974;
+    public long l31975;
+    public long l31976;
+    public long l31977;
+    public long l31978;
+    public long l31979;
+    public long l31980;
+    public long l31981;
+    public long l31982;
+    public long l31983;
+    public long l31984;
+    public long l31985;
+    public long l31986;
+    public long l31987;
+    public long l31988;
+    public long l31989;
+    public long l31990;
+    public long l31991;
+    public long l31992;
+    public long l31993;
+    public long l31994;
+    public long l31995;
+    public long l31996;
+    public long l31997;
+    public long l31998;
+    public long l31999;
+    public long l32000;
+    public long l32001;
+    public long l32002;
+    public long l32003;
+    public long l32004;
+    public long l32005;
+    public long l32006;
+    public long l32007;
+    public long l32008;
+    public long l32009;
+    public long l32010;
+    public long l32011;
+    public long l32012;
+    public long l32013;
+    public long l32014;
+    public long l32015;
+    public long l32016;
+    public long l32017;
+    public long l32018;
+    public long l32019;
+    public long l32020;
+    public long l32021;
+    public long l32022;
+    public long l32023;
+    public long l32024;
+    public long l32025;
+    public long l32026;
+    public long l32027;
+    public long l32028;
+    public long l32029;
+    public long l32030;
+    public long l32031;
+    public long l32032;
+    public long l32033;
+    public long l32034;
+    public long l32035;
+    public long l32036;
+    public long l32037;
+    public long l32038;
+    public long l32039;
+    public long l32040;
+    public long l32041;
+    public long l32042;
+    public long l32043;
+    public long l32044;
+    public long l32045;
+    public long l32046;
+    public long l32047;
+    public long l32048;
+    public long l32049;
+    public long l32050;
+    public long l32051;
+    public long l32052;
+    public long l32053;
+    public long l32054;
+    public long l32055;
+    public long l32056;
+    public long l32057;
+    public long l32058;
+    public long l32059;
+    public long l32060;
+    public long l32061;
+    public long l32062;
+    public long l32063;
+    public long l32064;
+    public long l32065;
+    public long l32066;
+    public long l32067;
+    public long l32068;
+    public long l32069;
+    public long l32070;
+    public long l32071;
+    public long l32072;
+    public long l32073;
+    public long l32074;
+    public long l32075;
+    public long l32076;
+    public long l32077;
+    public long l32078;
+    public long l32079;
+    public long l32080;
+    public long l32081;
+    public long l32082;
+    public long l32083;
+    public long l32084;
+    public long l32085;
+    public long l32086;
+    public long l32087;
+    public long l32088;
+    public long l32089;
+    public long l32090;
+    public long l32091;
+    public long l32092;
+    public long l32093;
+    public long l32094;
+    public long l32095;
+    public long l32096;
+    public long l32097;
+    public long l32098;
+    public long l32099;
+    public long l32100;
+    public long l32101;
+    public long l32102;
+    public long l32103;
+    public long l32104;
+    public long l32105;
+    public long l32106;
+    public long l32107;
+    public long l32108;
+    public long l32109;
+    public long l32110;
+    public long l32111;
+    public long l32112;
+    public long l32113;
+    public long l32114;
+    public long l32115;
+    public long l32116;
+    public long l32117;
+    public long l32118;
+    public long l32119;
+    public long l32120;
+    public long l32121;
+    public long l32122;
+    public long l32123;
+    public long l32124;
+    public long l32125;
+    public long l32126;
+    public long l32127;
+    public long l32128;
+    public long l32129;
+    public long l32130;
+    public long l32131;
+    public long l32132;
+    public long l32133;
+    public long l32134;
+    public long l32135;
+    public long l32136;
+    public long l32137;
+    public long l32138;
+    public long l32139;
+    public long l32140;
+    public long l32141;
+    public long l32142;
+    public long l32143;
+    public long l32144;
+    public long l32145;
+    public long l32146;
+    public long l32147;
+    public long l32148;
+    public long l32149;
+    public long l32150;
+    public long l32151;
+    public long l32152;
+    public long l32153;
+    public long l32154;
+    public long l32155;
+    public long l32156;
+    public long l32157;
+    public long l32158;
+    public long l32159;
+    public long l32160;
+    public long l32161;
+    public long l32162;
+    public long l32163;
+    public long l32164;
+    public long l32165;
+    public long l32166;
+    public long l32167;
+    public long l32168;
+    public long l32169;
+    public long l32170;
+    public long l32171;
+    public long l32172;
+    public long l32173;
+    public long l32174;
+    public long l32175;
+    public long l32176;
+    public long l32177;
+    public long l32178;
+    public long l32179;
+    public long l32180;
+    public long l32181;
+    public long l32182;
+    public long l32183;
+    public long l32184;
+    public long l32185;
+    public long l32186;
+    public long l32187;
+    public long l32188;
+    public long l32189;
+    public long l32190;
+    public long l32191;
+    public long l32192;
+    public long l32193;
+    public long l32194;
+    public long l32195;
+    public long l32196;
+    public long l32197;
+    public long l32198;
+    public long l32199;
+    public long l32200;
+    public long l32201;
+    public long l32202;
+    public long l32203;
+    public long l32204;
+    public long l32205;
+    public long l32206;
+    public long l32207;
+    public long l32208;
+    public long l32209;
+    public long l32210;
+    public long l32211;
+    public long l32212;
+    public long l32213;
+    public long l32214;
+    public long l32215;
+    public long l32216;
+    public long l32217;
+    public long l32218;
+    public long l32219;
+    public long l32220;
+    public long l32221;
+    public long l32222;
+    public long l32223;
+    public long l32224;
+    public long l32225;
+    public long l32226;
+    public long l32227;
+    public long l32228;
+    public long l32229;
+    public long l32230;
+    public long l32231;
+    public long l32232;
+    public long l32233;
+    public long l32234;
+    public long l32235;
+    public long l32236;
+    public long l32237;
+    public long l32238;
+    public long l32239;
+    public long l32240;
+    public long l32241;
+    public long l32242;
+    public long l32243;
+    public long l32244;
+    public long l32245;
+    public long l32246;
+    public long l32247;
+    public long l32248;
+    public long l32249;
+    public long l32250;
+    public long l32251;
+    public long l32252;
+    public long l32253;
+    public long l32254;
+    public long l32255;
+    public long l32256;
+    public long l32257;
+    public long l32258;
+    public long l32259;
+    public long l32260;
+    public long l32261;
+    public long l32262;
+    public long l32263;
+    public long l32264;
+    public long l32265;
+    public long l32266;
+    public long l32267;
+    public long l32268;
+    public long l32269;
+    public long l32270;
+    public long l32271;
+    public long l32272;
+    public long l32273;
+    public long l32274;
+    public long l32275;
+    public long l32276;
+    public long l32277;
+    public long l32278;
+    public long l32279;
+    public long l32280;
+    public long l32281;
+    public long l32282;
+    public long l32283;
+    public long l32284;
+    public long l32285;
+    public long l32286;
+    public long l32287;
+    public long l32288;
+    public long l32289;
+    public long l32290;
+    public long l32291;
+    public long l32292;
+    public long l32293;
+    public long l32294;
+    public long l32295;
+    public long l32296;
+    public long l32297;
+    public long l32298;
+    public long l32299;
+    public long l32300;
+    public long l32301;
+    public long l32302;
+    public long l32303;
+    public long l32304;
+    public long l32305;
+    public long l32306;
+    public long l32307;
+    public long l32308;
+    public long l32309;
+    public long l32310;
+    public long l32311;
+    public long l32312;
+    public long l32313;
+    public long l32314;
+    public long l32315;
+    public long l32316;
+    public long l32317;
+    public long l32318;
+    public long l32319;
+    public long l32320;
+    public long l32321;
+    public long l32322;
+    public long l32323;
+    public long l32324;
+    public long l32325;
+    public long l32326;
+    public long l32327;
+    public long l32328;
+    public long l32329;
+    public long l32330;
+    public long l32331;
+    public long l32332;
+    public long l32333;
+    public long l32334;
+    public long l32335;
+    public long l32336;
+    public long l32337;
+    public long l32338;
+    public long l32339;
+    public long l32340;
+    public long l32341;
+    public long l32342;
+    public long l32343;
+    public long l32344;
+    public long l32345;
+    public long l32346;
+    public long l32347;
+    public long l32348;
+    public long l32349;
+    public long l32350;
+    public long l32351;
+    public long l32352;
+    public long l32353;
+    public long l32354;
+    public long l32355;
+    public long l32356;
+    public long l32357;
+    public long l32358;
+    public long l32359;
+    public long l32360;
+    public long l32361;
+    public long l32362;
+    public long l32363;
+    public long l32364;
+    public long l32365;
+    public long l32366;
+    public long l32367;
+    public long l32368;
+    public long l32369;
+    public long l32370;
+    public long l32371;
+    public long l32372;
+    public long l32373;
+    public long l32374;
+    public long l32375;
+    public long l32376;
+    public long l32377;
+    public long l32378;
+    public long l32379;
+    public long l32380;
+    public long l32381;
+    public long l32382;
+    public long l32383;
+    public long l32384;
+    public long l32385;
+    public long l32386;
+    public long l32387;
+    public long l32388;
+    public long l32389;
+    public long l32390;
+    public long l32391;
+    public long l32392;
+    public long l32393;
+    public long l32394;
+    public long l32395;
+    public long l32396;
+    public long l32397;
+    public long l32398;
+    public long l32399;
+    public long l32400;
+    public long l32401;
+    public long l32402;
+    public long l32403;
+    public long l32404;
+    public long l32405;
+    public long l32406;
+    public long l32407;
+    public long l32408;
+    public long l32409;
+    public long l32410;
+    public long l32411;
+    public long l32412;
+    public long l32413;
+    public long l32414;
+    public long l32415;
+    public long l32416;
+    public long l32417;
+    public long l32418;
+    public long l32419;
+    public long l32420;
+    public long l32421;
+    public long l32422;
+    public long l32423;
+    public long l32424;
+    public long l32425;
+    public long l32426;
+    public long l32427;
+    public long l32428;
+    public long l32429;
+    public long l32430;
+    public long l32431;
+    public long l32432;
+    public long l32433;
+    public long l32434;
+    public long l32435;
+    public long l32436;
+    public long l32437;
+    public long l32438;
+    public long l32439;
+    public long l32440;
+    public long l32441;
+    public long l32442;
+    public long l32443;
+    public long l32444;
+    public long l32445;
+    public long l32446;
+    public long l32447;
+    public long l32448;
+    public long l32449;
+    public long l32450;
+    public long l32451;
+    public long l32452;
+    public long l32453;
+    public long l32454;
+    public long l32455;
+    public long l32456;
+    public long l32457;
+    public long l32458;
+    public long l32459;
+    public long l32460;
+    public long l32461;
+    public long l32462;
+    public long l32463;
+    public long l32464;
+    public long l32465;
+    public long l32466;
+    public long l32467;
+    public long l32468;
+    public long l32469;
+    public long l32470;
+    public long l32471;
+    public long l32472;
+    public long l32473;
+    public long l32474;
+    public long l32475;
+    public long l32476;
+    public long l32477;
+    public long l32478;
+    public long l32479;
+    public long l32480;
+    public long l32481;
+    public long l32482;
+    public long l32483;
+    public long l32484;
+    public long l32485;
+    public long l32486;
+    public long l32487;
+    public long l32488;
+    public long l32489;
+    public long l32490;
+    public long l32491;
+    public long l32492;
+    public long l32493;
+    public long l32494;
+    public long l32495;
+    public long l32496;
+    public long l32497;
+    public long l32498;
+    public long l32499;
+    public long l32500;
+    public long l32501;
+    public long l32502;
+    public long l32503;
+    public long l32504;
+    public long l32505;
+    public long l32506;
+    public long l32507;
+    public long l32508;
+    public long l32509;
+    public long l32510;
+    public long l32511;
+    public long l32512;
+    public long l32513;
+    public long l32514;
+    public long l32515;
+    public long l32516;
+    public long l32517;
+    public long l32518;
+    public long l32519;
+    public long l32520;
+    public long l32521;
+    public long l32522;
+    public long l32523;
+    public long l32524;
+    public long l32525;
+    public long l32526;
+    public long l32527;
+    public long l32528;
+    public long l32529;
+    public long l32530;
+    public long l32531;
+    public long l32532;
+    public long l32533;
+    public long l32534;
+    public long l32535;
+    public long l32536;
+    public long l32537;
+    public long l32538;
+    public long l32539;
+    public long l32540;
+    public long l32541;
+    public long l32542;
+    public long l32543;
+    public long l32544;
+    public long l32545;
+    public long l32546;
+    public long l32547;
+    public long l32548;
+    public long l32549;
+    public long l32550;
+    public long l32551;
+    public long l32552;
+    public long l32553;
+    public long l32554;
+    public long l32555;
+    public long l32556;
+    public long l32557;
+    public long l32558;
+    public long l32559;
+    public long l32560;
+    public long l32561;
+    public long l32562;
+    public long l32563;
+    public long l32564;
+    public long l32565;
+    public long l32566;
+    public long l32567;
+    public long l32568;
+    public long l32569;
+    public long l32570;
+    public long l32571;
+    public long l32572;
+    public long l32573;
+    public long l32574;
+    public long l32575;
+    public long l32576;
+    public long l32577;
+    public long l32578;
+    public long l32579;
+    public long l32580;
+    public long l32581;
+    public long l32582;
+    public long l32583;
+    public long l32584;
+    public long l32585;
+    public long l32586;
+    public long l32587;
+    public long l32588;
+    public long l32589;
+    public long l32590;
+    public long l32591;
+    public long l32592;
+    public long l32593;
+    public long l32594;
+    public long l32595;
+    public long l32596;
+    public long l32597;
+    public long l32598;
+    public long l32599;
+    public long l32600;
+    public long l32601;
+    public long l32602;
+    public long l32603;
+    public long l32604;
+    public long l32605;
+    public long l32606;
+    public long l32607;
+    public long l32608;
+    public long l32609;
+    public long l32610;
+    public long l32611;
+    public long l32612;
+    public long l32613;
+    public long l32614;
+    public long l32615;
+    public long l32616;
+    public long l32617;
+    public long l32618;
+    public long l32619;
+    public long l32620;
+    public long l32621;
+    public long l32622;
+    public long l32623;
+    public long l32624;
+    public long l32625;
+    public long l32626;
+    public long l32627;
+    public long l32628;
+    public long l32629;
+    public long l32630;
+    public long l32631;
+    public long l32632;
+    public long l32633;
+    public long l32634;
+    public long l32635;
+    public long l32636;
+    public long l32637;
+    public long l32638;
+    public long l32639;
+    public long l32640;
+    public long l32641;
+    public long l32642;
+    public long l32643;
+    public long l32644;
+    public long l32645;
+    public long l32646;
+    public long l32647;
+    public long l32648;
+    public long l32649;
+    public long l32650;
+    public long l32651;
+    public long l32652;
+    public long l32653;
+    public long l32654;
+    public long l32655;
+    public long l32656;
+    public long l32657;
+    public long l32658;
+    public long l32659;
+    public long l32660;
+    public long l32661;
+    public long l32662;
+    public long l32663;
+    public long l32664;
+    public long l32665;
+    public long l32666;
+    public long l32667;
+    public long l32668;
+    public long l32669;
+    public long l32670;
+    public long l32671;
+    public long l32672;
+    public long l32673;
+    public long l32674;
+    public long l32675;
+    public long l32676;
+    public long l32677;
+    public long l32678;
+    public long l32679;
+    public long l32680;
+    public long l32681;
+    public long l32682;
+    public long l32683;
+    public long l32684;
+    public long l32685;
+    public long l32686;
+    public long l32687;
+    public long l32688;
+    public long l32689;
+    public long l32690;
+    public long l32691;
+    public long l32692;
+    public long l32693;
+    public long l32694;
+    public long l32695;
+    public long l32696;
+    public long l32697;
+    public long l32698;
+    public long l32699;
+    public long l32700;
+    public long l32701;
+    public long l32702;
+    public long l32703;
+    public long l32704;
+    public long l32705;
+    public long l32706;
+    public long l32707;
+    public long l32708;
+    public long l32709;
+    public long l32710;
+    public long l32711;
+    public long l32712;
+    public long l32713;
+    public long l32714;
+    public long l32715;
+    public long l32716;
+    public long l32717;
+    public long l32718;
+    public long l32719;
+    public long l32720;
+    public long l32721;
+    public long l32722;
+    public long l32723;
+    public long l32724;
+    public long l32725;
+    public long l32726;
+    public long l32727;
+    public long l32728;
+    public long l32729;
+    public long l32730;
+    public long l32731;
+    public long l32732;
+    public long l32733;
+    public long l32734;
+    public long l32735;
+    public long l32736;
+    public long l32737;
+    public long l32738;
+    public long l32739;
+    public long l32740;
+    public long l32741;
+    public long l32742;
+    public long l32743;
+    public long l32744;
+    public long l32745;
+    public long l32746;
+    public long l32747;
+    public long l32748;
+    public long l32749;
+    public long l32750;
+    public long l32751;
+    public long l32752;
+    public long l32753;
+    public long l32754;
+    public long l32755;
+    public long l32756;
+    public long l32757;
+    public long l32758;
+    public long l32759;
+    public long l32760;
+    public long l32761;
+    public long l32762;
+    public long l32763;
+    public long l32764;
+    public long l32765;
+    public long l32766;
+    public long l32767;
+    public long l32768;
+    public long l32769;
+    public long l32770;
+    public long l32771;
+    public long l32772;
+    public long l32773;
+    public long l32774;
+    public long l32775;
+    public long l32776;
+    public long l32777;
+    public long l32778;
+    public long l32779;
+    public long l32780;
+    public long l32781;
+    public long l32782;
+    public long l32783;
+    public long l32784;
+    public long l32785;
+    public long l32786;
+    public long l32787;
+    public long l32788;
+    public long l32789;
+    public long l32790;
+    public long l32791;
+    public long l32792;
+    public long l32793;
+    public long l32794;
+    public long l32795;
+    public long l32796;
+    public long l32797;
+    public long l32798;
+    public long l32799;
+    public long l32800;
+    public long l32801;
+    public long l32802;
+    public long l32803;
+    public long l32804;
+    public long l32805;
+    public long l32806;
+    public long l32807;
+    public long l32808;
+    public long l32809;
+    public long l32810;
+    public long l32811;
+    public long l32812;
+    public long l32813;
+    public long l32814;
+    public long l32815;
+    public long l32816;
+    public long l32817;
+    public long l32818;
+    public long l32819;
+    public long l32820;
+    public long l32821;
+    public long l32822;
+    public long l32823;
+    public long l32824;
+    public long l32825;
+    public long l32826;
+    public long l32827;
+    public long l32828;
+    public long l32829;
+    public long l32830;
+    public long l32831;
+    public long l32832;
+    public long l32833;
+    public long l32834;
+    public long l32835;
+    public long l32836;
+    public long l32837;
+    public long l32838;
+    public long l32839;
+    public long l32840;
+    public long l32841;
+    public long l32842;
+    public long l32843;
+    public long l32844;
+    public long l32845;
+    public long l32846;
+    public long l32847;
+    public long l32848;
+    public long l32849;
+    public long l32850;
+    public long l32851;
+    public long l32852;
+    public long l32853;
+    public long l32854;
+    public long l32855;
+    public long l32856;
+    public long l32857;
+    public long l32858;
+    public long l32859;
+    public long l32860;
+    public long l32861;
+    public long l32862;
+    public long l32863;
+    public long l32864;
+    public long l32865;
+    public long l32866;
+    public long l32867;
+    public long l32868;
+    public long l32869;
+    public long l32870;
+    public long l32871;
+    public long l32872;
+    public long l32873;
+    public long l32874;
+    public long l32875;
+    public long l32876;
+    public long l32877;
+    public long l32878;
+    public long l32879;
+    public long l32880;
+    public long l32881;
+    public long l32882;
+    public long l32883;
+    public long l32884;
+    public long l32885;
+    public long l32886;
+    public long l32887;
+    public long l32888;
+    public long l32889;
+    public long l32890;
+    public long l32891;
+    public long l32892;
+    public long l32893;
+    public long l32894;
+    public long l32895;
+    public long l32896;
+    public long l32897;
+    public long l32898;
+    public long l32899;
+    public long l32900;
+    public long l32901;
+    public long l32902;
+    public long l32903;
+    public long l32904;
+    public long l32905;
+    public long l32906;
+    public long l32907;
+    public long l32908;
+    public long l32909;
+    public long l32910;
+    public long l32911;
+    public long l32912;
+    public long l32913;
+    public long l32914;
+    public long l32915;
+    public long l32916;
+    public long l32917;
+    public long l32918;
+    public long l32919;
+    public long l32920;
+    public long l32921;
+    public long l32922;
+    public long l32923;
+    public long l32924;
+    public long l32925;
+    public long l32926;
+    public long l32927;
+    public long l32928;
+    public long l32929;
+    public long l32930;
+    public long l32931;
+    public long l32932;
+    public long l32933;
+    public long l32934;
+    public long l32935;
+    public long l32936;
+    public long l32937;
+    public long l32938;
+    public long l32939;
+    public long l32940;
+    public long l32941;
+    public long l32942;
+    public long l32943;
+    public long l32944;
+    public long l32945;
+    public long l32946;
+    public long l32947;
+    public long l32948;
+    public long l32949;
+    public long l32950;
+    public long l32951;
+    public long l32952;
+    public long l32953;
+    public long l32954;
+    public long l32955;
+    public long l32956;
+    public long l32957;
+    public long l32958;
+    public long l32959;
+    public long l32960;
+    public long l32961;
+    public long l32962;
+    public long l32963;
+    public long l32964;
+    public long l32965;
+    public long l32966;
+    public long l32967;
+    public long l32968;
+    public long l32969;
+    public long l32970;
+    public long l32971;
+    public long l32972;
+    public long l32973;
+    public long l32974;
+    public long l32975;
+    public long l32976;
+    public long l32977;
+    public long l32978;
+    public long l32979;
+    public long l32980;
+    public long l32981;
+    public long l32982;
+    public long l32983;
+    public long l32984;
+    public long l32985;
+    public long l32986;
+    public long l32987;
+    public long l32988;
+    public long l32989;
+    public long l32990;
+    public long l32991;
+    public long l32992;
+    public long l32993;
+    public long l32994;
+    public long l32995;
+    public long l32996;
+    public long l32997;
+    public long l32998;
+    public long l32999;
+    public long l33000;
+    public long l33001;
+    public long l33002;
+    public long l33003;
+    public long l33004;
+    public long l33005;
+    public long l33006;
+    public long l33007;
+    public long l33008;
+    public long l33009;
+    public long l33010;
+    public long l33011;
+    public long l33012;
+    public long l33013;
+    public long l33014;
+    public long l33015;
+    public long l33016;
+    public long l33017;
+    public long l33018;
+    public long l33019;
+    public long l33020;
+    public long l33021;
+    public long l33022;
+    public long l33023;
+    public long l33024;
+    public long l33025;
+    public long l33026;
+    public long l33027;
+    public long l33028;
+    public long l33029;
+    public long l33030;
+    public long l33031;
+    public long l33032;
+    public long l33033;
+    public long l33034;
+    public long l33035;
+    public long l33036;
+    public long l33037;
+    public long l33038;
+    public long l33039;
+    public long l33040;
+    public long l33041;
+    public long l33042;
+    public long l33043;
+    public long l33044;
+    public long l33045;
+    public long l33046;
+    public long l33047;
+    public long l33048;
+    public long l33049;
+    public long l33050;
+    public long l33051;
+    public long l33052;
+    public long l33053;
+    public long l33054;
+    public long l33055;
+    public long l33056;
+    public long l33057;
+    public long l33058;
+    public long l33059;
+    public long l33060;
+    public long l33061;
+    public long l33062;
+    public long l33063;
+    public long l33064;
+    public long l33065;
+    public long l33066;
+    public long l33067;
+    public long l33068;
+    public long l33069;
+    public long l33070;
+    public long l33071;
+    public long l33072;
+    public long l33073;
+    public long l33074;
+    public long l33075;
+    public long l33076;
+    public long l33077;
+    public long l33078;
+    public long l33079;
+    public long l33080;
+    public long l33081;
+    public long l33082;
+    public long l33083;
+    public long l33084;
+    public long l33085;
+    public long l33086;
+    public long l33087;
+    public long l33088;
+    public long l33089;
+    public long l33090;
+    public long l33091;
+    public long l33092;
+    public long l33093;
+    public long l33094;
+    public long l33095;
+    public long l33096;
+    public long l33097;
+    public long l33098;
+    public long l33099;
+    public long l33100;
+    public long l33101;
+    public long l33102;
+    public long l33103;
+    public long l33104;
+    public long l33105;
+    public long l33106;
+    public long l33107;
+    public long l33108;
+    public long l33109;
+    public long l33110;
+    public long l33111;
+    public long l33112;
+    public long l33113;
+    public long l33114;
+    public long l33115;
+    public long l33116;
+    public long l33117;
+    public long l33118;
+    public long l33119;
+    public long l33120;
+    public long l33121;
+    public long l33122;
+    public long l33123;
+    public long l33124;
+    public long l33125;
+    public long l33126;
+    public long l33127;
+    public long l33128;
+    public long l33129;
+    public long l33130;
+    public long l33131;
+    public long l33132;
+    public long l33133;
+    public long l33134;
+    public long l33135;
+    public long l33136;
+    public long l33137;
+    public long l33138;
+    public long l33139;
+    public long l33140;
+    public long l33141;
+    public long l33142;
+    public long l33143;
+    public long l33144;
+    public long l33145;
+    public long l33146;
+    public long l33147;
+    public long l33148;
+    public long l33149;
+    public long l33150;
+    public long l33151;
+    public long l33152;
+    public long l33153;
+    public long l33154;
+    public long l33155;
+    public long l33156;
+    public long l33157;
+    public long l33158;
+    public long l33159;
+    public long l33160;
+    public long l33161;
+    public long l33162;
+    public long l33163;
+    public long l33164;
+    public long l33165;
+    public long l33166;
+    public long l33167;
+    public long l33168;
+    public long l33169;
+    public long l33170;
+    public long l33171;
+    public long l33172;
+    public long l33173;
+    public long l33174;
+    public long l33175;
+    public long l33176;
+    public long l33177;
+    public long l33178;
+    public long l33179;
+    public long l33180;
+    public long l33181;
+    public long l33182;
+    public long l33183;
+    public long l33184;
+    public long l33185;
+    public long l33186;
+    public long l33187;
+    public long l33188;
+    public long l33189;
+    public long l33190;
+    public long l33191;
+    public long l33192;
+    public long l33193;
+    public long l33194;
+    public long l33195;
+    public long l33196;
+    public long l33197;
+    public long l33198;
+    public long l33199;
+    public long l33200;
+    public long l33201;
+    public long l33202;
+    public long l33203;
+    public long l33204;
+    public long l33205;
+    public long l33206;
+    public long l33207;
+    public long l33208;
+    public long l33209;
+    public long l33210;
+    public long l33211;
+    public long l33212;
+    public long l33213;
+    public long l33214;
+    public long l33215;
+    public long l33216;
+    public long l33217;
+    public long l33218;
+    public long l33219;
+    public long l33220;
+    public long l33221;
+    public long l33222;
+    public long l33223;
+    public long l33224;
+    public long l33225;
+    public long l33226;
+    public long l33227;
+    public long l33228;
+    public long l33229;
+    public long l33230;
+    public long l33231;
+    public long l33232;
+    public long l33233;
+    public long l33234;
+    public long l33235;
+    public long l33236;
+    public long l33237;
+    public long l33238;
+    public long l33239;
+    public long l33240;
+    public long l33241;
+    public long l33242;
+    public long l33243;
+    public long l33244;
+    public long l33245;
+    public long l33246;
+    public long l33247;
+    public long l33248;
+    public long l33249;
+    public long l33250;
+    public long l33251;
+    public long l33252;
+    public long l33253;
+    public long l33254;
+    public long l33255;
+    public long l33256;
+    public long l33257;
+    public long l33258;
+    public long l33259;
+    public long l33260;
+    public long l33261;
+    public long l33262;
+    public long l33263;
+    public long l33264;
+    public long l33265;
+    public long l33266;
+    public long l33267;
+    public long l33268;
+    public long l33269;
+    public long l33270;
+    public long l33271;
+    public long l33272;
+    public long l33273;
+    public long l33274;
+    public long l33275;
+    public long l33276;
+    public long l33277;
+    public long l33278;
+    public long l33279;
+    public long l33280;
+    public long l33281;
+    public long l33282;
+    public long l33283;
+    public long l33284;
+    public long l33285;
+    public long l33286;
+    public long l33287;
+    public long l33288;
+    public long l33289;
+    public long l33290;
+    public long l33291;
+    public long l33292;
+    public long l33293;
+    public long l33294;
+    public long l33295;
+    public long l33296;
+    public long l33297;
+    public long l33298;
+    public long l33299;
+    public long l33300;
+    public long l33301;
+    public long l33302;
+    public long l33303;
+    public long l33304;
+    public long l33305;
+    public long l33306;
+    public long l33307;
+    public long l33308;
+    public long l33309;
+    public long l33310;
+    public long l33311;
+    public long l33312;
+    public long l33313;
+    public long l33314;
+    public long l33315;
+    public long l33316;
+    public long l33317;
+    public long l33318;
+    public long l33319;
+    public long l33320;
+    public long l33321;
+    public long l33322;
+    public long l33323;
+    public long l33324;
+    public long l33325;
+    public long l33326;
+    public long l33327;
+    public long l33328;
+    public long l33329;
+    public long l33330;
+    public long l33331;
+    public long l33332;
+    public long l33333;
+    public long l33334;
+    public long l33335;
+    public long l33336;
+    public long l33337;
+    public long l33338;
+    public long l33339;
+    public long l33340;
+    public long l33341;
+    public long l33342;
+    public long l33343;
+    public long l33344;
+    public long l33345;
+    public long l33346;
+    public long l33347;
+    public long l33348;
+    public long l33349;
+    public long l33350;
+    public long l33351;
+    public long l33352;
+    public long l33353;
+    public long l33354;
+    public long l33355;
+    public long l33356;
+    public long l33357;
+    public long l33358;
+    public long l33359;
+    public long l33360;
+    public long l33361;
+    public long l33362;
+    public long l33363;
+    public long l33364;
+    public long l33365;
+    public long l33366;
+    public long l33367;
+    public long l33368;
+    public long l33369;
+    public long l33370;
+    public long l33371;
+    public long l33372;
+    public long l33373;
+    public long l33374;
+    public long l33375;
+    public long l33376;
+    public long l33377;
+    public long l33378;
+    public long l33379;
+    public long l33380;
+    public long l33381;
+    public long l33382;
+    public long l33383;
+    public long l33384;
+    public long l33385;
+    public long l33386;
+    public long l33387;
+    public long l33388;
+    public long l33389;
+    public long l33390;
+    public long l33391;
+    public long l33392;
+    public long l33393;
+    public long l33394;
+    public long l33395;
+    public long l33396;
+    public long l33397;
+    public long l33398;
+    public long l33399;
+    public long l33400;
+    public long l33401;
+    public long l33402;
+    public long l33403;
+    public long l33404;
+    public long l33405;
+    public long l33406;
+    public long l33407;
+    public long l33408;
+    public long l33409;
+    public long l33410;
+    public long l33411;
+    public long l33412;
+    public long l33413;
+    public long l33414;
+    public long l33415;
+    public long l33416;
+    public long l33417;
+    public long l33418;
+    public long l33419;
+    public long l33420;
+    public long l33421;
+    public long l33422;
+    public long l33423;
+    public long l33424;
+    public long l33425;
+    public long l33426;
+    public long l33427;
+    public long l33428;
+    public long l33429;
+    public long l33430;
+    public long l33431;
+    public long l33432;
+    public long l33433;
+    public long l33434;
+    public long l33435;
+    public long l33436;
+    public long l33437;
+    public long l33438;
+    public long l33439;
+    public long l33440;
+    public long l33441;
+    public long l33442;
+    public long l33443;
+    public long l33444;
+    public long l33445;
+    public long l33446;
+    public long l33447;
+    public long l33448;
+    public long l33449;
+    public long l33450;
+    public long l33451;
+    public long l33452;
+    public long l33453;
+    public long l33454;
+    public long l33455;
+    public long l33456;
+    public long l33457;
+    public long l33458;
+    public long l33459;
+    public long l33460;
+    public long l33461;
+    public long l33462;
+    public long l33463;
+    public long l33464;
+    public long l33465;
+    public long l33466;
+    public long l33467;
+    public long l33468;
+    public long l33469;
+    public long l33470;
+    public long l33471;
+    public long l33472;
+    public long l33473;
+    public long l33474;
+    public long l33475;
+    public long l33476;
+    public long l33477;
+    public long l33478;
+    public long l33479;
+    public long l33480;
+    public long l33481;
+    public long l33482;
+    public long l33483;
+    public long l33484;
+    public long l33485;
+    public long l33486;
+    public long l33487;
+    public long l33488;
+    public long l33489;
+    public long l33490;
+    public long l33491;
+    public long l33492;
+    public long l33493;
+    public long l33494;
+    public long l33495;
+    public long l33496;
+    public long l33497;
+    public long l33498;
+    public long l33499;
+    public long l33500;
+    public long l33501;
+    public long l33502;
+    public long l33503;
+    public long l33504;
+    public long l33505;
+    public long l33506;
+    public long l33507;
+    public long l33508;
+    public long l33509;
+    public long l33510;
+    public long l33511;
+    public long l33512;
+    public long l33513;
+    public long l33514;
+    public long l33515;
+    public long l33516;
+    public long l33517;
+    public long l33518;
+    public long l33519;
+    public long l33520;
+    public long l33521;
+    public long l33522;
+    public long l33523;
+    public long l33524;
+    public long l33525;
+    public long l33526;
+    public long l33527;
+    public long l33528;
+    public long l33529;
+    public long l33530;
+    public long l33531;
+    public long l33532;
+    public long l33533;
+    public long l33534;
+    public long l33535;
+    public long l33536;
+    public long l33537;
+    public long l33538;
+    public long l33539;
+    public long l33540;
+    public long l33541;
+    public long l33542;
+    public long l33543;
+    public long l33544;
+    public long l33545;
+    public long l33546;
+    public long l33547;
+    public long l33548;
+    public long l33549;
+    public long l33550;
+    public long l33551;
+    public long l33552;
+    public long l33553;
+    public long l33554;
+    public long l33555;
+    public long l33556;
+    public long l33557;
+    public long l33558;
+    public long l33559;
+    public long l33560;
+    public long l33561;
+    public long l33562;
+    public long l33563;
+    public long l33564;
+    public long l33565;
+    public long l33566;
+    public long l33567;
+    public long l33568;
+    public long l33569;
+    public long l33570;
+    public long l33571;
+    public long l33572;
+    public long l33573;
+    public long l33574;
+    public long l33575;
+    public long l33576;
+    public long l33577;
+    public long l33578;
+    public long l33579;
+    public long l33580;
+    public long l33581;
+    public long l33582;
+    public long l33583;
+    public long l33584;
+    public long l33585;
+    public long l33586;
+    public long l33587;
+    public long l33588;
+    public long l33589;
+    public long l33590;
+    public long l33591;
+    public long l33592;
+    public long l33593;
+    public long l33594;
+    public long l33595;
+    public long l33596;
+    public long l33597;
+    public long l33598;
+    public long l33599;
+    public long l33600;
+    public long l33601;
+    public long l33602;
+    public long l33603;
+    public long l33604;
+    public long l33605;
+    public long l33606;
+    public long l33607;
+    public long l33608;
+    public long l33609;
+    public long l33610;
+    public long l33611;
+    public long l33612;
+    public long l33613;
+    public long l33614;
+    public long l33615;
+    public long l33616;
+    public long l33617;
+    public long l33618;
+    public long l33619;
+    public long l33620;
+    public long l33621;
+    public long l33622;
+    public long l33623;
+    public long l33624;
+    public long l33625;
+    public long l33626;
+    public long l33627;
+    public long l33628;
+    public long l33629;
+    public long l33630;
+    public long l33631;
+    public long l33632;
+    public long l33633;
+    public long l33634;
+    public long l33635;
+    public long l33636;
+    public long l33637;
+    public long l33638;
+    public long l33639;
+    public long l33640;
+    public long l33641;
+    public long l33642;
+    public long l33643;
+    public long l33644;
+    public long l33645;
+    public long l33646;
+    public long l33647;
+    public long l33648;
+    public long l33649;
+    public long l33650;
+    public long l33651;
+    public long l33652;
+    public long l33653;
+    public long l33654;
+    public long l33655;
+    public long l33656;
+    public long l33657;
+    public long l33658;
+    public long l33659;
+    public long l33660;
+    public long l33661;
+    public long l33662;
+    public long l33663;
+    public long l33664;
+    public long l33665;
+    public long l33666;
+    public long l33667;
+    public long l33668;
+    public long l33669;
+    public long l33670;
+    public long l33671;
+    public long l33672;
+    public long l33673;
+    public long l33674;
+    public long l33675;
+    public long l33676;
+    public long l33677;
+    public long l33678;
+    public long l33679;
+    public long l33680;
+    public long l33681;
+    public long l33682;
+    public long l33683;
+    public long l33684;
+    public long l33685;
+    public long l33686;
+    public long l33687;
+    public long l33688;
+    public long l33689;
+    public long l33690;
+    public long l33691;
+    public long l33692;
+    public long l33693;
+    public long l33694;
+    public long l33695;
+    public long l33696;
+    public long l33697;
+    public long l33698;
+    public long l33699;
+    public long l33700;
+    public long l33701;
+    public long l33702;
+    public long l33703;
+    public long l33704;
+    public long l33705;
+    public long l33706;
+    public long l33707;
+    public long l33708;
+    public long l33709;
+    public long l33710;
+    public long l33711;
+    public long l33712;
+    public long l33713;
+    public long l33714;
+    public long l33715;
+    public long l33716;
+    public long l33717;
+    public long l33718;
+    public long l33719;
+    public long l33720;
+    public long l33721;
+    public long l33722;
+    public long l33723;
+    public long l33724;
+    public long l33725;
+    public long l33726;
+    public long l33727;
+    public long l33728;
+    public long l33729;
+    public long l33730;
+    public long l33731;
+    public long l33732;
+    public long l33733;
+    public long l33734;
+    public long l33735;
+    public long l33736;
+    public long l33737;
+    public long l33738;
+    public long l33739;
+    public long l33740;
+    public long l33741;
+    public long l33742;
+    public long l33743;
+    public long l33744;
+    public long l33745;
+    public long l33746;
+    public long l33747;
+    public long l33748;
+    public long l33749;
+    public long l33750;
+    public long l33751;
+    public long l33752;
+    public long l33753;
+    public long l33754;
+    public long l33755;
+    public long l33756;
+    public long l33757;
+    public long l33758;
+    public long l33759;
+    public long l33760;
+    public long l33761;
+    public long l33762;
+    public long l33763;
+    public long l33764;
+    public long l33765;
+    public long l33766;
+    public long l33767;
+    public long l33768;
+    public long l33769;
+    public long l33770;
+    public long l33771;
+    public long l33772;
+    public long l33773;
+    public long l33774;
+    public long l33775;
+    public long l33776;
+    public long l33777;
+    public long l33778;
+    public long l33779;
+    public long l33780;
+    public long l33781;
+    public long l33782;
+    public long l33783;
+    public long l33784;
+    public long l33785;
+    public long l33786;
+    public long l33787;
+    public long l33788;
+    public long l33789;
+    public long l33790;
+    public long l33791;
+    public long l33792;
+    public long l33793;
+    public long l33794;
+    public long l33795;
+    public long l33796;
+    public long l33797;
+    public long l33798;
+    public long l33799;
+    public long l33800;
+    public long l33801;
+    public long l33802;
+    public long l33803;
+    public long l33804;
+    public long l33805;
+    public long l33806;
+    public long l33807;
+    public long l33808;
+    public long l33809;
+    public long l33810;
+    public long l33811;
+    public long l33812;
+    public long l33813;
+    public long l33814;
+    public long l33815;
+    public long l33816;
+    public long l33817;
+    public long l33818;
+    public long l33819;
+    public long l33820;
+    public long l33821;
+    public long l33822;
+    public long l33823;
+    public long l33824;
+    public long l33825;
+    public long l33826;
+    public long l33827;
+    public long l33828;
+    public long l33829;
+    public long l33830;
+    public long l33831;
+    public long l33832;
+    public long l33833;
+    public long l33834;
+    public long l33835;
+    public long l33836;
+    public long l33837;
+    public long l33838;
+    public long l33839;
+    public long l33840;
+    public long l33841;
+    public long l33842;
+    public long l33843;
+    public long l33844;
+    public long l33845;
+    public long l33846;
+    public long l33847;
+    public long l33848;
+    public long l33849;
+    public long l33850;
+    public long l33851;
+    public long l33852;
+    public long l33853;
+    public long l33854;
+    public long l33855;
+    public long l33856;
+    public long l33857;
+    public long l33858;
+    public long l33859;
+    public long l33860;
+    public long l33861;
+    public long l33862;
+    public long l33863;
+    public long l33864;
+    public long l33865;
+    public long l33866;
+    public long l33867;
+    public long l33868;
+    public long l33869;
+    public long l33870;
+    public long l33871;
+    public long l33872;
+    public long l33873;
+    public long l33874;
+    public long l33875;
+    public long l33876;
+    public long l33877;
+    public long l33878;
+    public long l33879;
+    public long l33880;
+    public long l33881;
+    public long l33882;
+    public long l33883;
+    public long l33884;
+    public long l33885;
+    public long l33886;
+    public long l33887;
+    public long l33888;
+    public long l33889;
+    public long l33890;
+    public long l33891;
+    public long l33892;
+    public long l33893;
+    public long l33894;
+    public long l33895;
+    public long l33896;
+    public long l33897;
+    public long l33898;
+    public long l33899;
+    public long l33900;
+    public long l33901;
+    public long l33902;
+    public long l33903;
+    public long l33904;
+    public long l33905;
+    public long l33906;
+    public long l33907;
+    public long l33908;
+    public long l33909;
+    public long l33910;
+    public long l33911;
+    public long l33912;
+    public long l33913;
+    public long l33914;
+    public long l33915;
+    public long l33916;
+    public long l33917;
+    public long l33918;
+    public long l33919;
+    public long l33920;
+    public long l33921;
+    public long l33922;
+    public long l33923;
+    public long l33924;
+    public long l33925;
+    public long l33926;
+    public long l33927;
+    public long l33928;
+    public long l33929;
+    public long l33930;
+    public long l33931;
+    public long l33932;
+    public long l33933;
+    public long l33934;
+    public long l33935;
+    public long l33936;
+    public long l33937;
+    public long l33938;
+    public long l33939;
+    public long l33940;
+    public long l33941;
+    public long l33942;
+    public long l33943;
+    public long l33944;
+    public long l33945;
+    public long l33946;
+    public long l33947;
+    public long l33948;
+    public long l33949;
+    public long l33950;
+    public long l33951;
+    public long l33952;
+    public long l33953;
+    public long l33954;
+    public long l33955;
+    public long l33956;
+    public long l33957;
+    public long l33958;
+    public long l33959;
+    public long l33960;
+    public long l33961;
+    public long l33962;
+    public long l33963;
+    public long l33964;
+    public long l33965;
+    public long l33966;
+    public long l33967;
+    public long l33968;
+    public long l33969;
+    public long l33970;
+    public long l33971;
+    public long l33972;
+    public long l33973;
+    public long l33974;
+    public long l33975;
+    public long l33976;
+    public long l33977;
+    public long l33978;
+    public long l33979;
+    public long l33980;
+    public long l33981;
+    public long l33982;
+    public long l33983;
+    public long l33984;
+    public long l33985;
+    public long l33986;
+    public long l33987;
+    public long l33988;
+    public long l33989;
+    public long l33990;
+    public long l33991;
+    public long l33992;
+    public long l33993;
+    public long l33994;
+    public long l33995;
+    public long l33996;
+    public long l33997;
+    public long l33998;
+    public long l33999;
+    public long l34000;
+    public long l34001;
+    public long l34002;
+    public long l34003;
+    public long l34004;
+    public long l34005;
+    public long l34006;
+    public long l34007;
+    public long l34008;
+    public long l34009;
+    public long l34010;
+    public long l34011;
+    public long l34012;
+    public long l34013;
+    public long l34014;
+    public long l34015;
+    public long l34016;
+    public long l34017;
+    public long l34018;
+    public long l34019;
+    public long l34020;
+    public long l34021;
+    public long l34022;
+    public long l34023;
+    public long l34024;
+    public long l34025;
+    public long l34026;
+    public long l34027;
+    public long l34028;
+    public long l34029;
+    public long l34030;
+    public long l34031;
+    public long l34032;
+    public long l34033;
+    public long l34034;
+    public long l34035;
+    public long l34036;
+    public long l34037;
+    public long l34038;
+    public long l34039;
+    public long l34040;
+    public long l34041;
+    public long l34042;
+    public long l34043;
+    public long l34044;
+    public long l34045;
+    public long l34046;
+    public long l34047;
+    public long l34048;
+    public long l34049;
+    public long l34050;
+    public long l34051;
+    public long l34052;
+    public long l34053;
+    public long l34054;
+    public long l34055;
+    public long l34056;
+    public long l34057;
+    public long l34058;
+    public long l34059;
+    public long l34060;
+    public long l34061;
+    public long l34062;
+    public long l34063;
+    public long l34064;
+    public long l34065;
+    public long l34066;
+    public long l34067;
+    public long l34068;
+    public long l34069;
+    public long l34070;
+    public long l34071;
+    public long l34072;
+    public long l34073;
+    public long l34074;
+    public long l34075;
+    public long l34076;
+    public long l34077;
+    public long l34078;
+    public long l34079;
+    public long l34080;
+    public long l34081;
+    public long l34082;
+    public long l34083;
+    public long l34084;
+    public long l34085;
+    public long l34086;
+    public long l34087;
+    public long l34088;
+    public long l34089;
+    public long l34090;
+    public long l34091;
+    public long l34092;
+    public long l34093;
+    public long l34094;
+    public long l34095;
+    public long l34096;
+    public long l34097;
+    public long l34098;
+    public long l34099;
+    public long l34100;
+    public long l34101;
+    public long l34102;
+    public long l34103;
+    public long l34104;
+    public long l34105;
+    public long l34106;
+    public long l34107;
+    public long l34108;
+    public long l34109;
+    public long l34110;
+    public long l34111;
+    public long l34112;
+    public long l34113;
+    public long l34114;
+    public long l34115;
+    public long l34116;
+    public long l34117;
+    public long l34118;
+    public long l34119;
+    public long l34120;
+    public long l34121;
+    public long l34122;
+    public long l34123;
+    public long l34124;
+    public long l34125;
+    public long l34126;
+    public long l34127;
+    public long l34128;
+    public long l34129;
+    public long l34130;
+    public long l34131;
+    public long l34132;
+    public long l34133;
+    public long l34134;
+    public long l34135;
+    public long l34136;
+    public long l34137;
+    public long l34138;
+    public long l34139;
+    public long l34140;
+    public long l34141;
+    public long l34142;
+    public long l34143;
+    public long l34144;
+    public long l34145;
+    public long l34146;
+    public long l34147;
+    public long l34148;
+    public long l34149;
+    public long l34150;
+    public long l34151;
+    public long l34152;
+    public long l34153;
+    public long l34154;
+    public long l34155;
+    public long l34156;
+    public long l34157;
+    public long l34158;
+    public long l34159;
+    public long l34160;
+    public long l34161;
+    public long l34162;
+    public long l34163;
+    public long l34164;
+    public long l34165;
+    public long l34166;
+    public long l34167;
+    public long l34168;
+    public long l34169;
+    public long l34170;
+    public long l34171;
+    public long l34172;
+    public long l34173;
+    public long l34174;
+    public long l34175;
+    public long l34176;
+    public long l34177;
+    public long l34178;
+    public long l34179;
+    public long l34180;
+    public long l34181;
+    public long l34182;
+    public long l34183;
+    public long l34184;
+    public long l34185;
+    public long l34186;
+    public long l34187;
+    public long l34188;
+    public long l34189;
+    public long l34190;
+    public long l34191;
+    public long l34192;
+    public long l34193;
+    public long l34194;
+    public long l34195;
+    public long l34196;
+    public long l34197;
+    public long l34198;
+    public long l34199;
+    public long l34200;
+    public long l34201;
+    public long l34202;
+    public long l34203;
+    public long l34204;
+    public long l34205;
+    public long l34206;
+    public long l34207;
+    public long l34208;
+    public long l34209;
+    public long l34210;
+    public long l34211;
+    public long l34212;
+    public long l34213;
+    public long l34214;
+    public long l34215;
+    public long l34216;
+    public long l34217;
+    public long l34218;
+    public long l34219;
+    public long l34220;
+    public long l34221;
+    public long l34222;
+    public long l34223;
+    public long l34224;
+    public long l34225;
+    public long l34226;
+    public long l34227;
+    public long l34228;
+    public long l34229;
+    public long l34230;
+    public long l34231;
+    public long l34232;
+    public long l34233;
+    public long l34234;
+    public long l34235;
+    public long l34236;
+    public long l34237;
+    public long l34238;
+    public long l34239;
+    public long l34240;
+    public long l34241;
+    public long l34242;
+    public long l34243;
+    public long l34244;
+    public long l34245;
+    public long l34246;
+    public long l34247;
+    public long l34248;
+    public long l34249;
+    public long l34250;
+    public long l34251;
+    public long l34252;
+    public long l34253;
+    public long l34254;
+    public long l34255;
+    public long l34256;
+    public long l34257;
+    public long l34258;
+    public long l34259;
+    public long l34260;
+    public long l34261;
+    public long l34262;
+    public long l34263;
+    public long l34264;
+    public long l34265;
+    public long l34266;
+    public long l34267;
+    public long l34268;
+    public long l34269;
+    public long l34270;
+    public long l34271;
+    public long l34272;
+    public long l34273;
+    public long l34274;
+    public long l34275;
+    public long l34276;
+    public long l34277;
+    public long l34278;
+    public long l34279;
+    public long l34280;
+    public long l34281;
+    public long l34282;
+    public long l34283;
+    public long l34284;
+    public long l34285;
+    public long l34286;
+    public long l34287;
+    public long l34288;
+    public long l34289;
+    public long l34290;
+    public long l34291;
+    public long l34292;
+    public long l34293;
+    public long l34294;
+    public long l34295;
+    public long l34296;
+    public long l34297;
+    public long l34298;
+    public long l34299;
+    public long l34300;
+    public long l34301;
+    public long l34302;
+    public long l34303;
+    public long l34304;
+    public long l34305;
+    public long l34306;
+    public long l34307;
+    public long l34308;
+    public long l34309;
+    public long l34310;
+    public long l34311;
+    public long l34312;
+    public long l34313;
+    public long l34314;
+    public long l34315;
+    public long l34316;
+    public long l34317;
+    public long l34318;
+    public long l34319;
+    public long l34320;
+    public long l34321;
+    public long l34322;
+    public long l34323;
+    public long l34324;
+    public long l34325;
+    public long l34326;
+    public long l34327;
+    public long l34328;
+    public long l34329;
+    public long l34330;
+    public long l34331;
+    public long l34332;
+    public long l34333;
+    public long l34334;
+    public long l34335;
+    public long l34336;
+    public long l34337;
+    public long l34338;
+    public long l34339;
+    public long l34340;
+    public long l34341;
+    public long l34342;
+    public long l34343;
+    public long l34344;
+    public long l34345;
+    public long l34346;
+    public long l34347;
+    public long l34348;
+    public long l34349;
+    public long l34350;
+    public long l34351;
+    public long l34352;
+    public long l34353;
+    public long l34354;
+    public long l34355;
+    public long l34356;
+    public long l34357;
+    public long l34358;
+    public long l34359;
+    public long l34360;
+    public long l34361;
+    public long l34362;
+    public long l34363;
+    public long l34364;
+    public long l34365;
+    public long l34366;
+    public long l34367;
+    public long l34368;
+    public long l34369;
+    public long l34370;
+    public long l34371;
+    public long l34372;
+    public long l34373;
+    public long l34374;
+    public long l34375;
+    public long l34376;
+    public long l34377;
+    public long l34378;
+    public long l34379;
+    public long l34380;
+    public long l34381;
+    public long l34382;
+    public long l34383;
+    public long l34384;
+    public long l34385;
+    public long l34386;
+    public long l34387;
+    public long l34388;
+    public long l34389;
+    public long l34390;
+    public long l34391;
+    public long l34392;
+    public long l34393;
+    public long l34394;
+    public long l34395;
+    public long l34396;
+    public long l34397;
+    public long l34398;
+    public long l34399;
+    public long l34400;
+    public long l34401;
+    public long l34402;
+    public long l34403;
+    public long l34404;
+    public long l34405;
+    public long l34406;
+    public long l34407;
+    public long l34408;
+    public long l34409;
+    public long l34410;
+    public long l34411;
+    public long l34412;
+    public long l34413;
+    public long l34414;
+    public long l34415;
+    public long l34416;
+    public long l34417;
+    public long l34418;
+    public long l34419;
+    public long l34420;
+    public long l34421;
+    public long l34422;
+    public long l34423;
+    public long l34424;
+    public long l34425;
+    public long l34426;
+    public long l34427;
+    public long l34428;
+    public long l34429;
+    public long l34430;
+    public long l34431;
+    public long l34432;
+    public long l34433;
+    public long l34434;
+    public long l34435;
+    public long l34436;
+    public long l34437;
+    public long l34438;
+    public long l34439;
+    public long l34440;
+    public long l34441;
+    public long l34442;
+    public long l34443;
+    public long l34444;
+    public long l34445;
+    public long l34446;
+    public long l34447;
+    public long l34448;
+    public long l34449;
+    public long l34450;
+    public long l34451;
+    public long l34452;
+    public long l34453;
+    public long l34454;
+    public long l34455;
+    public long l34456;
+    public long l34457;
+    public long l34458;
+    public long l34459;
+    public long l34460;
+    public long l34461;
+    public long l34462;
+    public long l34463;
+    public long l34464;
+    public long l34465;
+    public long l34466;
+    public long l34467;
+    public long l34468;
+    public long l34469;
+    public long l34470;
+    public long l34471;
+    public long l34472;
+    public long l34473;
+    public long l34474;
+    public long l34475;
+    public long l34476;
+    public long l34477;
+    public long l34478;
+    public long l34479;
+    public long l34480;
+    public long l34481;
+    public long l34482;
+    public long l34483;
+    public long l34484;
+    public long l34485;
+    public long l34486;
+    public long l34487;
+    public long l34488;
+    public long l34489;
+    public long l34490;
+    public long l34491;
+    public long l34492;
+    public long l34493;
+    public long l34494;
+    public long l34495;
+    public long l34496;
+    public long l34497;
+    public long l34498;
+    public long l34499;
+    public long l34500;
+    public long l34501;
+    public long l34502;
+    public long l34503;
+    public long l34504;
+    public long l34505;
+    public long l34506;
+    public long l34507;
+    public long l34508;
+    public long l34509;
+    public long l34510;
+    public long l34511;
+    public long l34512;
+    public long l34513;
+    public long l34514;
+    public long l34515;
+    public long l34516;
+    public long l34517;
+    public long l34518;
+    public long l34519;
+    public long l34520;
+    public long l34521;
+    public long l34522;
+    public long l34523;
+    public long l34524;
+    public long l34525;
+    public long l34526;
+    public long l34527;
+    public long l34528;
+    public long l34529;
+    public long l34530;
+    public long l34531;
+    public long l34532;
+    public long l34533;
+    public long l34534;
+    public long l34535;
+    public long l34536;
+    public long l34537;
+    public long l34538;
+    public long l34539;
+    public long l34540;
+    public long l34541;
+    public long l34542;
+    public long l34543;
+    public long l34544;
+    public long l34545;
+    public long l34546;
+    public long l34547;
+    public long l34548;
+    public long l34549;
+    public long l34550;
+    public long l34551;
+    public long l34552;
+    public long l34553;
+    public long l34554;
+    public long l34555;
+    public long l34556;
+    public long l34557;
+    public long l34558;
+    public long l34559;
+    public long l34560;
+    public long l34561;
+    public long l34562;
+    public long l34563;
+    public long l34564;
+    public long l34565;
+    public long l34566;
+    public long l34567;
+    public long l34568;
+    public long l34569;
+    public long l34570;
+    public long l34571;
+    public long l34572;
+    public long l34573;
+    public long l34574;
+    public long l34575;
+    public long l34576;
+    public long l34577;
+    public long l34578;
+    public long l34579;
+    public long l34580;
+    public long l34581;
+    public long l34582;
+    public long l34583;
+    public long l34584;
+    public long l34585;
+    public long l34586;
+    public long l34587;
+    public long l34588;
+    public long l34589;
+    public long l34590;
+    public long l34591;
+    public long l34592;
+    public long l34593;
+    public long l34594;
+    public long l34595;
+    public long l34596;
+    public long l34597;
+    public long l34598;
+    public long l34599;
+    public long l34600;
+    public long l34601;
+    public long l34602;
+    public long l34603;
+    public long l34604;
+    public long l34605;
+    public long l34606;
+    public long l34607;
+    public long l34608;
+    public long l34609;
+    public long l34610;
+    public long l34611;
+    public long l34612;
+    public long l34613;
+    public long l34614;
+    public long l34615;
+    public long l34616;
+    public long l34617;
+    public long l34618;
+    public long l34619;
+    public long l34620;
+    public long l34621;
+    public long l34622;
+    public long l34623;
+    public long l34624;
+    public long l34625;
+    public long l34626;
+    public long l34627;
+    public long l34628;
+    public long l34629;
+    public long l34630;
+    public long l34631;
+    public long l34632;
+    public long l34633;
+    public long l34634;
+    public long l34635;
+    public long l34636;
+    public long l34637;
+    public long l34638;
+    public long l34639;
+    public long l34640;
+    public long l34641;
+    public long l34642;
+    public long l34643;
+    public long l34644;
+    public long l34645;
+    public long l34646;
+    public long l34647;
+    public long l34648;
+    public long l34649;
+    public long l34650;
+    public long l34651;
+    public long l34652;
+    public long l34653;
+    public long l34654;
+    public long l34655;
+    public long l34656;
+    public long l34657;
+    public long l34658;
+    public long l34659;
+    public long l34660;
+    public long l34661;
+    public long l34662;
+    public long l34663;
+    public long l34664;
+    public long l34665;
+    public long l34666;
+    public long l34667;
+    public long l34668;
+    public long l34669;
+    public long l34670;
+    public long l34671;
+    public long l34672;
+    public long l34673;
+    public long l34674;
+    public long l34675;
+    public long l34676;
+    public long l34677;
+    public long l34678;
+    public long l34679;
+    public long l34680;
+    public long l34681;
+    public long l34682;
+    public long l34683;
+    public long l34684;
+    public long l34685;
+    public long l34686;
+    public long l34687;
+    public long l34688;
+    public long l34689;
+    public long l34690;
+    public long l34691;
+    public long l34692;
+    public long l34693;
+    public long l34694;
+    public long l34695;
+    public long l34696;
+    public long l34697;
+    public long l34698;
+    public long l34699;
+    public long l34700;
+    public long l34701;
+    public long l34702;
+    public long l34703;
+    public long l34704;
+    public long l34705;
+    public long l34706;
+    public long l34707;
+    public long l34708;
+    public long l34709;
+    public long l34710;
+    public long l34711;
+    public long l34712;
+    public long l34713;
+    public long l34714;
+    public long l34715;
+    public long l34716;
+    public long l34717;
+    public long l34718;
+    public long l34719;
+    public long l34720;
+    public long l34721;
+    public long l34722;
+    public long l34723;
+    public long l34724;
+    public long l34725;
+    public long l34726;
+    public long l34727;
+    public long l34728;
+    public long l34729;
+    public long l34730;
+    public long l34731;
+    public long l34732;
+    public long l34733;
+    public long l34734;
+    public long l34735;
+    public long l34736;
+    public long l34737;
+    public long l34738;
+    public long l34739;
+    public long l34740;
+    public long l34741;
+    public long l34742;
+    public long l34743;
+    public long l34744;
+    public long l34745;
+    public long l34746;
+    public long l34747;
+    public long l34748;
+    public long l34749;
+    public long l34750;
+    public long l34751;
+    public long l34752;
+    public long l34753;
+    public long l34754;
+    public long l34755;
+    public long l34756;
+    public long l34757;
+    public long l34758;
+    public long l34759;
+    public long l34760;
+    public long l34761;
+    public long l34762;
+    public long l34763;
+    public long l34764;
+    public long l34765;
+    public long l34766;
+    public long l34767;
+    public long l34768;
+    public long l34769;
+    public long l34770;
+    public long l34771;
+    public long l34772;
+    public long l34773;
+    public long l34774;
+    public long l34775;
+    public long l34776;
+    public long l34777;
+    public long l34778;
+    public long l34779;
+    public long l34780;
+    public long l34781;
+    public long l34782;
+    public long l34783;
+    public long l34784;
+    public long l34785;
+    public long l34786;
+    public long l34787;
+    public long l34788;
+    public long l34789;
+    public long l34790;
+    public long l34791;
+    public long l34792;
+    public long l34793;
+    public long l34794;
+    public long l34795;
+    public long l34796;
+    public long l34797;
+    public long l34798;
+    public long l34799;
+    public long l34800;
+    public long l34801;
+    public long l34802;
+    public long l34803;
+    public long l34804;
+    public long l34805;
+    public long l34806;
+    public long l34807;
+    public long l34808;
+    public long l34809;
+    public long l34810;
+    public long l34811;
+    public long l34812;
+    public long l34813;
+    public long l34814;
+    public long l34815;
+    public long l34816;
+    public long l34817;
+    public long l34818;
+    public long l34819;
+    public long l34820;
+    public long l34821;
+    public long l34822;
+    public long l34823;
+    public long l34824;
+    public long l34825;
+    public long l34826;
+    public long l34827;
+    public long l34828;
+    public long l34829;
+    public long l34830;
+    public long l34831;
+    public long l34832;
+    public long l34833;
+    public long l34834;
+    public long l34835;
+    public long l34836;
+    public long l34837;
+    public long l34838;
+    public long l34839;
+    public long l34840;
+    public long l34841;
+    public long l34842;
+    public long l34843;
+    public long l34844;
+    public long l34845;
+    public long l34846;
+    public long l34847;
+    public long l34848;
+    public long l34849;
+    public long l34850;
+    public long l34851;
+    public long l34852;
+    public long l34853;
+    public long l34854;
+    public long l34855;
+    public long l34856;
+    public long l34857;
+    public long l34858;
+    public long l34859;
+    public long l34860;
+    public long l34861;
+    public long l34862;
+    public long l34863;
+    public long l34864;
+    public long l34865;
+    public long l34866;
+    public long l34867;
+    public long l34868;
+    public long l34869;
+    public long l34870;
+    public long l34871;
+    public long l34872;
+    public long l34873;
+    public long l34874;
+    public long l34875;
+    public long l34876;
+    public long l34877;
+    public long l34878;
+    public long l34879;
+    public long l34880;
+    public long l34881;
+    public long l34882;
+    public long l34883;
+    public long l34884;
+    public long l34885;
+    public long l34886;
+    public long l34887;
+    public long l34888;
+    public long l34889;
+    public long l34890;
+    public long l34891;
+    public long l34892;
+    public long l34893;
+    public long l34894;
+    public long l34895;
+    public long l34896;
+    public long l34897;
+    public long l34898;
+    public long l34899;
+    public long l34900;
+    public long l34901;
+    public long l34902;
+    public long l34903;
+    public long l34904;
+    public long l34905;
+    public long l34906;
+    public long l34907;
+    public long l34908;
+    public long l34909;
+    public long l34910;
+    public long l34911;
+    public long l34912;
+    public long l34913;
+    public long l34914;
+    public long l34915;
+    public long l34916;
+    public long l34917;
+    public long l34918;
+    public long l34919;
+    public long l34920;
+    public long l34921;
+    public long l34922;
+    public long l34923;
+    public long l34924;
+    public long l34925;
+    public long l34926;
+    public long l34927;
+    public long l34928;
+    public long l34929;
+    public long l34930;
+    public long l34931;
+    public long l34932;
+    public long l34933;
+    public long l34934;
+    public long l34935;
+    public long l34936;
+    public long l34937;
+    public long l34938;
+    public long l34939;
+    public long l34940;
+    public long l34941;
+    public long l34942;
+    public long l34943;
+    public long l34944;
+    public long l34945;
+    public long l34946;
+    public long l34947;
+    public long l34948;
+    public long l34949;
+    public long l34950;
+    public long l34951;
+    public long l34952;
+    public long l34953;
+    public long l34954;
+    public long l34955;
+    public long l34956;
+    public long l34957;
+    public long l34958;
+    public long l34959;
+    public long l34960;
+    public long l34961;
+    public long l34962;
+    public long l34963;
+    public long l34964;
+    public long l34965;
+    public long l34966;
+    public long l34967;
+    public long l34968;
+    public long l34969;
+    public long l34970;
+    public long l34971;
+    public long l34972;
+    public long l34973;
+    public long l34974;
+    public long l34975;
+    public long l34976;
+    public long l34977;
+    public long l34978;
+    public long l34979;
+    public long l34980;
+    public long l34981;
+    public long l34982;
+    public long l34983;
+    public long l34984;
+    public long l34985;
+    public long l34986;
+    public long l34987;
+    public long l34988;
+    public long l34989;
+    public long l34990;
+    public long l34991;
+    public long l34992;
+    public long l34993;
+    public long l34994;
+    public long l34995;
+    public long l34996;
+    public long l34997;
+    public long l34998;
+    public long l34999;
+    public long l35000;
+    public long l35001;
+    public long l35002;
+    public long l35003;
+    public long l35004;
+    public long l35005;
+    public long l35006;
+    public long l35007;
+    public long l35008;
+    public long l35009;
+    public long l35010;
+    public long l35011;
+    public long l35012;
+    public long l35013;
+    public long l35014;
+    public long l35015;
+    public long l35016;
+    public long l35017;
+    public long l35018;
+    public long l35019;
+    public long l35020;
+    public long l35021;
+    public long l35022;
+    public long l35023;
+    public long l35024;
+    public long l35025;
+    public long l35026;
+    public long l35027;
+    public long l35028;
+    public long l35029;
+    public long l35030;
+    public long l35031;
+    public long l35032;
+    public long l35033;
+    public long l35034;
+    public long l35035;
+    public long l35036;
+    public long l35037;
+    public long l35038;
+    public long l35039;
+    public long l35040;
+    public long l35041;
+    public long l35042;
+    public long l35043;
+    public long l35044;
+    public long l35045;
+    public long l35046;
+    public long l35047;
+    public long l35048;
+    public long l35049;
+    public long l35050;
+    public long l35051;
+    public long l35052;
+    public long l35053;
+    public long l35054;
+    public long l35055;
+    public long l35056;
+    public long l35057;
+    public long l35058;
+    public long l35059;
+    public long l35060;
+    public long l35061;
+    public long l35062;
+    public long l35063;
+    public long l35064;
+    public long l35065;
+    public long l35066;
+    public long l35067;
+    public long l35068;
+    public long l35069;
+    public long l35070;
+    public long l35071;
+    public long l35072;
+    public long l35073;
+    public long l35074;
+    public long l35075;
+    public long l35076;
+    public long l35077;
+    public long l35078;
+    public long l35079;
+    public long l35080;
+    public long l35081;
+    public long l35082;
+    public long l35083;
+    public long l35084;
+    public long l35085;
+    public long l35086;
+    public long l35087;
+    public long l35088;
+    public long l35089;
+    public long l35090;
+    public long l35091;
+    public long l35092;
+    public long l35093;
+    public long l35094;
+    public long l35095;
+    public long l35096;
+    public long l35097;
+    public long l35098;
+    public long l35099;
+    public long l35100;
+    public long l35101;
+    public long l35102;
+    public long l35103;
+    public long l35104;
+    public long l35105;
+    public long l35106;
+    public long l35107;
+    public long l35108;
+    public long l35109;
+    public long l35110;
+    public long l35111;
+    public long l35112;
+    public long l35113;
+    public long l35114;
+    public long l35115;
+    public long l35116;
+    public long l35117;
+    public long l35118;
+    public long l35119;
+    public long l35120;
+    public long l35121;
+    public long l35122;
+    public long l35123;
+    public long l35124;
+    public long l35125;
+    public long l35126;
+    public long l35127;
+    public long l35128;
+    public long l35129;
+    public long l35130;
+    public long l35131;
+    public long l35132;
+    public long l35133;
+    public long l35134;
+    public long l35135;
+    public long l35136;
+    public long l35137;
+    public long l35138;
+    public long l35139;
+    public long l35140;
+    public long l35141;
+    public long l35142;
+    public long l35143;
+    public long l35144;
+    public long l35145;
+    public long l35146;
+    public long l35147;
+    public long l35148;
+    public long l35149;
+    public long l35150;
+    public long l35151;
+    public long l35152;
+    public long l35153;
+    public long l35154;
+    public long l35155;
+    public long l35156;
+    public long l35157;
+    public long l35158;
+    public long l35159;
+    public long l35160;
+    public long l35161;
+    public long l35162;
+    public long l35163;
+    public long l35164;
+    public long l35165;
+    public long l35166;
+    public long l35167;
+    public long l35168;
+    public long l35169;
+    public long l35170;
+    public long l35171;
+    public long l35172;
+    public long l35173;
+    public long l35174;
+    public long l35175;
+    public long l35176;
+    public long l35177;
+    public long l35178;
+    public long l35179;
+    public long l35180;
+    public long l35181;
+    public long l35182;
+    public long l35183;
+    public long l35184;
+    public long l35185;
+    public long l35186;
+    public long l35187;
+    public long l35188;
+    public long l35189;
+    public long l35190;
+    public long l35191;
+    public long l35192;
+    public long l35193;
+    public long l35194;
+    public long l35195;
+    public long l35196;
+    public long l35197;
+    public long l35198;
+    public long l35199;
+    public long l35200;
+    public long l35201;
+    public long l35202;
+    public long l35203;
+    public long l35204;
+    public long l35205;
+    public long l35206;
+    public long l35207;
+    public long l35208;
+    public long l35209;
+    public long l35210;
+    public long l35211;
+    public long l35212;
+    public long l35213;
+    public long l35214;
+    public long l35215;
+    public long l35216;
+    public long l35217;
+    public long l35218;
+    public long l35219;
+    public long l35220;
+    public long l35221;
+    public long l35222;
+    public long l35223;
+    public long l35224;
+    public long l35225;
+    public long l35226;
+    public long l35227;
+    public long l35228;
+    public long l35229;
+    public long l35230;
+    public long l35231;
+    public long l35232;
+    public long l35233;
+    public long l35234;
+    public long l35235;
+    public long l35236;
+    public long l35237;
+    public long l35238;
+    public long l35239;
+    public long l35240;
+    public long l35241;
+    public long l35242;
+    public long l35243;
+    public long l35244;
+    public long l35245;
+    public long l35246;
+    public long l35247;
+    public long l35248;
+    public long l35249;
+    public long l35250;
+    public long l35251;
+    public long l35252;
+    public long l35253;
+    public long l35254;
+    public long l35255;
+    public long l35256;
+    public long l35257;
+    public long l35258;
+    public long l35259;
+    public long l35260;
+    public long l35261;
+    public long l35262;
+    public long l35263;
+    public long l35264;
+    public long l35265;
+    public long l35266;
+    public long l35267;
+    public long l35268;
+    public long l35269;
+    public long l35270;
+    public long l35271;
+    public long l35272;
+    public long l35273;
+    public long l35274;
+    public long l35275;
+    public long l35276;
+    public long l35277;
+    public long l35278;
+    public long l35279;
+    public long l35280;
+    public long l35281;
+    public long l35282;
+    public long l35283;
+    public long l35284;
+    public long l35285;
+    public long l35286;
+    public long l35287;
+    public long l35288;
+    public long l35289;
+    public long l35290;
+    public long l35291;
+    public long l35292;
+    public long l35293;
+    public long l35294;
+    public long l35295;
+    public long l35296;
+    public long l35297;
+    public long l35298;
+    public long l35299;
+    public long l35300;
+    public long l35301;
+    public long l35302;
+    public long l35303;
+    public long l35304;
+    public long l35305;
+    public long l35306;
+    public long l35307;
+    public long l35308;
+    public long l35309;
+    public long l35310;
+    public long l35311;
+    public long l35312;
+    public long l35313;
+    public long l35314;
+    public long l35315;
+    public long l35316;
+    public long l35317;
+    public long l35318;
+    public long l35319;
+    public long l35320;
+    public long l35321;
+    public long l35322;
+    public long l35323;
+    public long l35324;
+    public long l35325;
+    public long l35326;
+    public long l35327;
+    public long l35328;
+    public long l35329;
+    public long l35330;
+    public long l35331;
+    public long l35332;
+    public long l35333;
+    public long l35334;
+    public long l35335;
+    public long l35336;
+    public long l35337;
+    public long l35338;
+    public long l35339;
+    public long l35340;
+    public long l35341;
+    public long l35342;
+    public long l35343;
+    public long l35344;
+    public long l35345;
+    public long l35346;
+    public long l35347;
+    public long l35348;
+    public long l35349;
+    public long l35350;
+    public long l35351;
+    public long l35352;
+    public long l35353;
+    public long l35354;
+    public long l35355;
+    public long l35356;
+    public long l35357;
+    public long l35358;
+    public long l35359;
+    public long l35360;
+    public long l35361;
+    public long l35362;
+    public long l35363;
+    public long l35364;
+    public long l35365;
+    public long l35366;
+    public long l35367;
+    public long l35368;
+    public long l35369;
+    public long l35370;
+    public long l35371;
+    public long l35372;
+    public long l35373;
+    public long l35374;
+    public long l35375;
+    public long l35376;
+    public long l35377;
+    public long l35378;
+    public long l35379;
+    public long l35380;
+    public long l35381;
+    public long l35382;
+    public long l35383;
+    public long l35384;
+    public long l35385;
+    public long l35386;
+    public long l35387;
+    public long l35388;
+    public long l35389;
+    public long l35390;
+    public long l35391;
+    public long l35392;
+    public long l35393;
+    public long l35394;
+    public long l35395;
+    public long l35396;
+    public long l35397;
+    public long l35398;
+    public long l35399;
+    public long l35400;
+    public long l35401;
+    public long l35402;
+    public long l35403;
+    public long l35404;
+    public long l35405;
+    public long l35406;
+    public long l35407;
+    public long l35408;
+    public long l35409;
+    public long l35410;
+    public long l35411;
+    public long l35412;
+    public long l35413;
+    public long l35414;
+    public long l35415;
+    public long l35416;
+    public long l35417;
+    public long l35418;
+    public long l35419;
+    public long l35420;
+    public long l35421;
+    public long l35422;
+    public long l35423;
+    public long l35424;
+    public long l35425;
+    public long l35426;
+    public long l35427;
+    public long l35428;
+    public long l35429;
+    public long l35430;
+    public long l35431;
+    public long l35432;
+    public long l35433;
+    public long l35434;
+    public long l35435;
+    public long l35436;
+    public long l35437;
+    public long l35438;
+    public long l35439;
+    public long l35440;
+    public long l35441;
+    public long l35442;
+    public long l35443;
+    public long l35444;
+    public long l35445;
+    public long l35446;
+    public long l35447;
+    public long l35448;
+    public long l35449;
+    public long l35450;
+    public long l35451;
+    public long l35452;
+    public long l35453;
+    public long l35454;
+    public long l35455;
+    public long l35456;
+    public long l35457;
+    public long l35458;
+    public long l35459;
+    public long l35460;
+    public long l35461;
+    public long l35462;
+    public long l35463;
+    public long l35464;
+    public long l35465;
+    public long l35466;
+    public long l35467;
+    public long l35468;
+    public long l35469;
+    public long l35470;
+    public long l35471;
+    public long l35472;
+    public long l35473;
+    public long l35474;
+    public long l35475;
+    public long l35476;
+    public long l35477;
+    public long l35478;
+    public long l35479;
+    public long l35480;
+    public long l35481;
+    public long l35482;
+    public long l35483;
+    public long l35484;
+    public long l35485;
+    public long l35486;
+    public long l35487;
+    public long l35488;
+    public long l35489;
+    public long l35490;
+    public long l35491;
+    public long l35492;
+    public long l35493;
+    public long l35494;
+    public long l35495;
+    public long l35496;
+    public long l35497;
+    public long l35498;
+    public long l35499;
+    public long l35500;
+    public long l35501;
+    public long l35502;
+    public long l35503;
+    public long l35504;
+    public long l35505;
+    public long l35506;
+    public long l35507;
+    public long l35508;
+    public long l35509;
+    public long l35510;
+    public long l35511;
+    public long l35512;
+    public long l35513;
+    public long l35514;
+    public long l35515;
+    public long l35516;
+    public long l35517;
+    public long l35518;
+    public long l35519;
+    public long l35520;
+    public long l35521;
+    public long l35522;
+    public long l35523;
+    public long l35524;
+    public long l35525;
+    public long l35526;
+    public long l35527;
+    public long l35528;
+    public long l35529;
+    public long l35530;
+    public long l35531;
+    public long l35532;
+    public long l35533;
+    public long l35534;
+    public long l35535;
+    public long l35536;
+    public long l35537;
+    public long l35538;
+    public long l35539;
+    public long l35540;
+    public long l35541;
+    public long l35542;
+    public long l35543;
+    public long l35544;
+    public long l35545;
+    public long l35546;
+    public long l35547;
+    public long l35548;
+    public long l35549;
+    public long l35550;
+    public long l35551;
+    public long l35552;
+    public long l35553;
+    public long l35554;
+    public long l35555;
+    public long l35556;
+    public long l35557;
+    public long l35558;
+    public long l35559;
+    public long l35560;
+    public long l35561;
+    public long l35562;
+    public long l35563;
+    public long l35564;
+    public long l35565;
+    public long l35566;
+    public long l35567;
+    public long l35568;
+    public long l35569;
+    public long l35570;
+    public long l35571;
+    public long l35572;
+    public long l35573;
+    public long l35574;
+    public long l35575;
+    public long l35576;
+    public long l35577;
+    public long l35578;
+    public long l35579;
+    public long l35580;
+    public long l35581;
+    public long l35582;
+    public long l35583;
+    public long l35584;
+    public long l35585;
+    public long l35586;
+    public long l35587;
+    public long l35588;
+    public long l35589;
+    public long l35590;
+    public long l35591;
+    public long l35592;
+    public long l35593;
+    public long l35594;
+    public long l35595;
+    public long l35596;
+    public long l35597;
+    public long l35598;
+    public long l35599;
+    public long l35600;
+    public long l35601;
+    public long l35602;
+    public long l35603;
+    public long l35604;
+    public long l35605;
+    public long l35606;
+    public long l35607;
+    public long l35608;
+    public long l35609;
+    public long l35610;
+    public long l35611;
+    public long l35612;
+    public long l35613;
+    public long l35614;
+    public long l35615;
+    public long l35616;
+    public long l35617;
+    public long l35618;
+    public long l35619;
+    public long l35620;
+    public long l35621;
+    public long l35622;
+    public long l35623;
+    public long l35624;
+    public long l35625;
+    public long l35626;
+    public long l35627;
+    public long l35628;
+    public long l35629;
+    public long l35630;
+    public long l35631;
+    public long l35632;
+    public long l35633;
+    public long l35634;
+    public long l35635;
+    public long l35636;
+    public long l35637;
+    public long l35638;
+    public long l35639;
+    public long l35640;
+    public long l35641;
+    public long l35642;
+    public long l35643;
+    public long l35644;
+    public long l35645;
+    public long l35646;
+    public long l35647;
+    public long l35648;
+    public long l35649;
+    public long l35650;
+    public long l35651;
+    public long l35652;
+    public long l35653;
+    public long l35654;
+    public long l35655;
+    public long l35656;
+    public long l35657;
+    public long l35658;
+    public long l35659;
+    public long l35660;
+    public long l35661;
+    public long l35662;
+    public long l35663;
+    public long l35664;
+    public long l35665;
+    public long l35666;
+    public long l35667;
+    public long l35668;
+    public long l35669;
+    public long l35670;
+    public long l35671;
+    public long l35672;
+    public long l35673;
+    public long l35674;
+    public long l35675;
+    public long l35676;
+    public long l35677;
+    public long l35678;
+    public long l35679;
+    public long l35680;
+    public long l35681;
+    public long l35682;
+    public long l35683;
+    public long l35684;
+    public long l35685;
+    public long l35686;
+    public long l35687;
+    public long l35688;
+    public long l35689;
+    public long l35690;
+    public long l35691;
+    public long l35692;
+    public long l35693;
+    public long l35694;
+    public long l35695;
+    public long l35696;
+    public long l35697;
+    public long l35698;
+    public long l35699;
+    public long l35700;
+    public long l35701;
+    public long l35702;
+    public long l35703;
+    public long l35704;
+    public long l35705;
+    public long l35706;
+    public long l35707;
+    public long l35708;
+    public long l35709;
+    public long l35710;
+    public long l35711;
+    public long l35712;
+    public long l35713;
+    public long l35714;
+    public long l35715;
+    public long l35716;
+    public long l35717;
+    public long l35718;
+    public long l35719;
+    public long l35720;
+    public long l35721;
+    public long l35722;
+    public long l35723;
+    public long l35724;
+    public long l35725;
+    public long l35726;
+    public long l35727;
+    public long l35728;
+    public long l35729;
+    public long l35730;
+    public long l35731;
+    public long l35732;
+    public long l35733;
+    public long l35734;
+    public long l35735;
+    public long l35736;
+    public long l35737;
+    public long l35738;
+    public long l35739;
+    public long l35740;
+    public long l35741;
+    public long l35742;
+    public long l35743;
+    public long l35744;
+    public long l35745;
+    public long l35746;
+    public long l35747;
+    public long l35748;
+    public long l35749;
+    public long l35750;
+    public long l35751;
+    public long l35752;
+    public long l35753;
+    public long l35754;
+    public long l35755;
+    public long l35756;
+    public long l35757;
+    public long l35758;
+    public long l35759;
+    public long l35760;
+    public long l35761;
+    public long l35762;
+    public long l35763;
+    public long l35764;
+    public long l35765;
+    public long l35766;
+    public long l35767;
+    public long l35768;
+    public long l35769;
+    public long l35770;
+    public long l35771;
+    public long l35772;
+    public long l35773;
+    public long l35774;
+    public long l35775;
+    public long l35776;
+    public long l35777;
+    public long l35778;
+    public long l35779;
+    public long l35780;
+    public long l35781;
+    public long l35782;
+    public long l35783;
+    public long l35784;
+    public long l35785;
+    public long l35786;
+    public long l35787;
+    public long l35788;
+    public long l35789;
+    public long l35790;
+    public long l35791;
+    public long l35792;
+    public long l35793;
+    public long l35794;
+    public long l35795;
+    public long l35796;
+    public long l35797;
+    public long l35798;
+    public long l35799;
+    public long l35800;
+    public long l35801;
+    public long l35802;
+    public long l35803;
+    public long l35804;
+    public long l35805;
+    public long l35806;
+    public long l35807;
+    public long l35808;
+    public long l35809;
+    public long l35810;
+    public long l35811;
+    public long l35812;
+    public long l35813;
+    public long l35814;
+    public long l35815;
+    public long l35816;
+    public long l35817;
+    public long l35818;
+    public long l35819;
+    public long l35820;
+    public long l35821;
+    public long l35822;
+    public long l35823;
+    public long l35824;
+    public long l35825;
+    public long l35826;
+    public long l35827;
+    public long l35828;
+    public long l35829;
+    public long l35830;
+    public long l35831;
+    public long l35832;
+    public long l35833;
+    public long l35834;
+    public long l35835;
+    public long l35836;
+    public long l35837;
+    public long l35838;
+    public long l35839;
+    public long l35840;
+    public long l35841;
+    public long l35842;
+    public long l35843;
+    public long l35844;
+    public long l35845;
+    public long l35846;
+    public long l35847;
+    public long l35848;
+    public long l35849;
+    public long l35850;
+    public long l35851;
+    public long l35852;
+    public long l35853;
+    public long l35854;
+    public long l35855;
+    public long l35856;
+    public long l35857;
+    public long l35858;
+    public long l35859;
+    public long l35860;
+    public long l35861;
+    public long l35862;
+    public long l35863;
+    public long l35864;
+    public long l35865;
+    public long l35866;
+    public long l35867;
+    public long l35868;
+    public long l35869;
+    public long l35870;
+    public long l35871;
+    public long l35872;
+    public long l35873;
+    public long l35874;
+    public long l35875;
+    public long l35876;
+    public long l35877;
+    public long l35878;
+    public long l35879;
+    public long l35880;
+    public long l35881;
+    public long l35882;
+    public long l35883;
+    public long l35884;
+    public long l35885;
+    public long l35886;
+    public long l35887;
+    public long l35888;
+    public long l35889;
+    public long l35890;
+    public long l35891;
+    public long l35892;
+    public long l35893;
+    public long l35894;
+    public long l35895;
+    public long l35896;
+    public long l35897;
+    public long l35898;
+    public long l35899;
+    public long l35900;
+    public long l35901;
+    public long l35902;
+    public long l35903;
+    public long l35904;
+    public long l35905;
+    public long l35906;
+    public long l35907;
+    public long l35908;
+    public long l35909;
+    public long l35910;
+    public long l35911;
+    public long l35912;
+    public long l35913;
+    public long l35914;
+    public long l35915;
+    public long l35916;
+    public long l35917;
+    public long l35918;
+    public long l35919;
+    public long l35920;
+    public long l35921;
+    public long l35922;
+    public long l35923;
+    public long l35924;
+    public long l35925;
+    public long l35926;
+    public long l35927;
+    public long l35928;
+    public long l35929;
+    public long l35930;
+    public long l35931;
+    public long l35932;
+    public long l35933;
+    public long l35934;
+    public long l35935;
+    public long l35936;
+    public long l35937;
+    public long l35938;
+    public long l35939;
+    public long l35940;
+    public long l35941;
+    public long l35942;
+    public long l35943;
+    public long l35944;
+    public long l35945;
+    public long l35946;
+    public long l35947;
+    public long l35948;
+    public long l35949;
+    public long l35950;
+    public long l35951;
+    public long l35952;
+    public long l35953;
+    public long l35954;
+    public long l35955;
+    public long l35956;
+    public long l35957;
+    public long l35958;
+    public long l35959;
+    public long l35960;
+    public long l35961;
+    public long l35962;
+    public long l35963;
+    public long l35964;
+    public long l35965;
+    public long l35966;
+    public long l35967;
+    public long l35968;
+    public long l35969;
+    public long l35970;
+    public long l35971;
+    public long l35972;
+    public long l35973;
+    public long l35974;
+    public long l35975;
+    public long l35976;
+    public long l35977;
+    public long l35978;
+    public long l35979;
+    public long l35980;
+    public long l35981;
+    public long l35982;
+    public long l35983;
+    public long l35984;
+    public long l35985;
+    public long l35986;
+    public long l35987;
+    public long l35988;
+    public long l35989;
+    public long l35990;
+    public long l35991;
+    public long l35992;
+    public long l35993;
+    public long l35994;
+    public long l35995;
+    public long l35996;
+    public long l35997;
+    public long l35998;
+    public long l35999;
+    public long l36000;
+    public long l36001;
+    public long l36002;
+    public long l36003;
+    public long l36004;
+    public long l36005;
+    public long l36006;
+    public long l36007;
+    public long l36008;
+    public long l36009;
+    public long l36010;
+    public long l36011;
+    public long l36012;
+    public long l36013;
+    public long l36014;
+    public long l36015;
+    public long l36016;
+    public long l36017;
+    public long l36018;
+    public long l36019;
+    public long l36020;
+    public long l36021;
+    public long l36022;
+    public long l36023;
+    public long l36024;
+    public long l36025;
+    public long l36026;
+    public long l36027;
+    public long l36028;
+    public long l36029;
+    public long l36030;
+    public long l36031;
+    public long l36032;
+    public long l36033;
+    public long l36034;
+    public long l36035;
+    public long l36036;
+    public long l36037;
+    public long l36038;
+    public long l36039;
+    public long l36040;
+    public long l36041;
+    public long l36042;
+    public long l36043;
+    public long l36044;
+    public long l36045;
+    public long l36046;
+    public long l36047;
+    public long l36048;
+    public long l36049;
+    public long l36050;
+    public long l36051;
+    public long l36052;
+    public long l36053;
+    public long l36054;
+    public long l36055;
+    public long l36056;
+    public long l36057;
+    public long l36058;
+    public long l36059;
+    public long l36060;
+    public long l36061;
+    public long l36062;
+    public long l36063;
+    public long l36064;
+    public long l36065;
+    public long l36066;
+    public long l36067;
+    public long l36068;
+    public long l36069;
+    public long l36070;
+    public long l36071;
+    public long l36072;
+    public long l36073;
+    public long l36074;
+    public long l36075;
+    public long l36076;
+    public long l36077;
+    public long l36078;
+    public long l36079;
+    public long l36080;
+    public long l36081;
+    public long l36082;
+    public long l36083;
+    public long l36084;
+    public long l36085;
+    public long l36086;
+    public long l36087;
+    public long l36088;
+    public long l36089;
+    public long l36090;
+    public long l36091;
+    public long l36092;
+    public long l36093;
+    public long l36094;
+    public long l36095;
+    public long l36096;
+    public long l36097;
+    public long l36098;
+    public long l36099;
+    public long l36100;
+    public long l36101;
+    public long l36102;
+    public long l36103;
+    public long l36104;
+    public long l36105;
+    public long l36106;
+    public long l36107;
+    public long l36108;
+    public long l36109;
+    public long l36110;
+    public long l36111;
+    public long l36112;
+    public long l36113;
+    public long l36114;
+    public long l36115;
+    public long l36116;
+    public long l36117;
+    public long l36118;
+    public long l36119;
+    public long l36120;
+    public long l36121;
+    public long l36122;
+    public long l36123;
+    public long l36124;
+    public long l36125;
+    public long l36126;
+    public long l36127;
+    public long l36128;
+    public long l36129;
+    public long l36130;
+    public long l36131;
+    public long l36132;
+    public long l36133;
+    public long l36134;
+    public long l36135;
+    public long l36136;
+    public long l36137;
+    public long l36138;
+    public long l36139;
+    public long l36140;
+    public long l36141;
+    public long l36142;
+    public long l36143;
+    public long l36144;
+    public long l36145;
+    public long l36146;
+    public long l36147;
+    public long l36148;
+    public long l36149;
+    public long l36150;
+    public long l36151;
+    public long l36152;
+    public long l36153;
+    public long l36154;
+    public long l36155;
+    public long l36156;
+    public long l36157;
+    public long l36158;
+    public long l36159;
+    public long l36160;
+    public long l36161;
+    public long l36162;
+    public long l36163;
+    public long l36164;
+    public long l36165;
+    public long l36166;
+    public long l36167;
+    public long l36168;
+    public long l36169;
+    public long l36170;
+    public long l36171;
+    public long l36172;
+    public long l36173;
+    public long l36174;
+    public long l36175;
+    public long l36176;
+    public long l36177;
+    public long l36178;
+    public long l36179;
+    public long l36180;
+    public long l36181;
+    public long l36182;
+    public long l36183;
+    public long l36184;
+    public long l36185;
+    public long l36186;
+    public long l36187;
+    public long l36188;
+    public long l36189;
+    public long l36190;
+    public long l36191;
+    public long l36192;
+    public long l36193;
+    public long l36194;
+    public long l36195;
+    public long l36196;
+    public long l36197;
+    public long l36198;
+    public long l36199;
+    public long l36200;
+    public long l36201;
+    public long l36202;
+    public long l36203;
+    public long l36204;
+    public long l36205;
+    public long l36206;
+    public long l36207;
+    public long l36208;
+    public long l36209;
+    public long l36210;
+    public long l36211;
+    public long l36212;
+    public long l36213;
+    public long l36214;
+    public long l36215;
+    public long l36216;
+    public long l36217;
+    public long l36218;
+    public long l36219;
+    public long l36220;
+    public long l36221;
+    public long l36222;
+    public long l36223;
+    public long l36224;
+    public long l36225;
+    public long l36226;
+    public long l36227;
+    public long l36228;
+    public long l36229;
+    public long l36230;
+    public long l36231;
+    public long l36232;
+    public long l36233;
+    public long l36234;
+    public long l36235;
+    public long l36236;
+    public long l36237;
+    public long l36238;
+    public long l36239;
+    public long l36240;
+    public long l36241;
+    public long l36242;
+    public long l36243;
+    public long l36244;
+    public long l36245;
+    public long l36246;
+    public long l36247;
+    public long l36248;
+    public long l36249;
+    public long l36250;
+    public long l36251;
+    public long l36252;
+    public long l36253;
+    public long l36254;
+    public long l36255;
+    public long l36256;
+    public long l36257;
+    public long l36258;
+    public long l36259;
+    public long l36260;
+    public long l36261;
+    public long l36262;
+    public long l36263;
+    public long l36264;
+    public long l36265;
+    public long l36266;
+    public long l36267;
+    public long l36268;
+    public long l36269;
+    public long l36270;
+    public long l36271;
+    public long l36272;
+    public long l36273;
+    public long l36274;
+    public long l36275;
+    public long l36276;
+    public long l36277;
+    public long l36278;
+    public long l36279;
+    public long l36280;
+    public long l36281;
+    public long l36282;
+    public long l36283;
+    public long l36284;
+    public long l36285;
+    public long l36286;
+    public long l36287;
+    public long l36288;
+    public long l36289;
+    public long l36290;
+    public long l36291;
+    public long l36292;
+    public long l36293;
+    public long l36294;
+    public long l36295;
+    public long l36296;
+    public long l36297;
+    public long l36298;
+    public long l36299;
+    public long l36300;
+    public long l36301;
+    public long l36302;
+    public long l36303;
+    public long l36304;
+    public long l36305;
+    public long l36306;
+    public long l36307;
+    public long l36308;
+    public long l36309;
+    public long l36310;
+    public long l36311;
+    public long l36312;
+    public long l36313;
+    public long l36314;
+    public long l36315;
+    public long l36316;
+    public long l36317;
+    public long l36318;
+    public long l36319;
+    public long l36320;
+    public long l36321;
+    public long l36322;
+    public long l36323;
+    public long l36324;
+    public long l36325;
+    public long l36326;
+    public long l36327;
+    public long l36328;
+    public long l36329;
+    public long l36330;
+    public long l36331;
+    public long l36332;
+    public long l36333;
+    public long l36334;
+    public long l36335;
+    public long l36336;
+    public long l36337;
+    public long l36338;
+    public long l36339;
+    public long l36340;
+    public long l36341;
+    public long l36342;
+    public long l36343;
+    public long l36344;
+    public long l36345;
+    public long l36346;
+    public long l36347;
+    public long l36348;
+    public long l36349;
+    public long l36350;
+    public long l36351;
+    public long l36352;
+    public long l36353;
+    public long l36354;
+    public long l36355;
+    public long l36356;
+    public long l36357;
+    public long l36358;
+    public long l36359;
+    public long l36360;
+    public long l36361;
+    public long l36362;
+    public long l36363;
+    public long l36364;
+    public long l36365;
+    public long l36366;
+    public long l36367;
+    public long l36368;
+    public long l36369;
+    public long l36370;
+    public long l36371;
+    public long l36372;
+    public long l36373;
+    public long l36374;
+    public long l36375;
+    public long l36376;
+    public long l36377;
+    public long l36378;
+    public long l36379;
+    public long l36380;
+    public long l36381;
+    public long l36382;
+    public long l36383;
+    public long l36384;
+    public long l36385;
+    public long l36386;
+    public long l36387;
+    public long l36388;
+    public long l36389;
+    public long l36390;
+    public long l36391;
+    public long l36392;
+    public long l36393;
+    public long l36394;
+    public long l36395;
+    public long l36396;
+    public long l36397;
+    public long l36398;
+    public long l36399;
+    public long l36400;
+    public long l36401;
+    public long l36402;
+    public long l36403;
+    public long l36404;
+    public long l36405;
+    public long l36406;
+    public long l36407;
+    public long l36408;
+    public long l36409;
+    public long l36410;
+    public long l36411;
+    public long l36412;
+    public long l36413;
+    public long l36414;
+    public long l36415;
+    public long l36416;
+    public long l36417;
+    public long l36418;
+    public long l36419;
+    public long l36420;
+    public long l36421;
+    public long l36422;
+    public long l36423;
+    public long l36424;
+    public long l36425;
+    public long l36426;
+    public long l36427;
+    public long l36428;
+    public long l36429;
+    public long l36430;
+    public long l36431;
+    public long l36432;
+    public long l36433;
+    public long l36434;
+    public long l36435;
+    public long l36436;
+    public long l36437;
+    public long l36438;
+    public long l36439;
+    public long l36440;
+    public long l36441;
+    public long l36442;
+    public long l36443;
+    public long l36444;
+    public long l36445;
+    public long l36446;
+    public long l36447;
+    public long l36448;
+    public long l36449;
+    public long l36450;
+    public long l36451;
+    public long l36452;
+    public long l36453;
+    public long l36454;
+    public long l36455;
+    public long l36456;
+    public long l36457;
+    public long l36458;
+    public long l36459;
+    public long l36460;
+    public long l36461;
+    public long l36462;
+    public long l36463;
+    public long l36464;
+    public long l36465;
+    public long l36466;
+    public long l36467;
+    public long l36468;
+    public long l36469;
+    public long l36470;
+    public long l36471;
+    public long l36472;
+    public long l36473;
+    public long l36474;
+    public long l36475;
+    public long l36476;
+    public long l36477;
+    public long l36478;
+    public long l36479;
+    public long l36480;
+    public long l36481;
+    public long l36482;
+    public long l36483;
+    public long l36484;
+    public long l36485;
+    public long l36486;
+    public long l36487;
+    public long l36488;
+    public long l36489;
+    public long l36490;
+    public long l36491;
+    public long l36492;
+    public long l36493;
+    public long l36494;
+    public long l36495;
+    public long l36496;
+    public long l36497;
+    public long l36498;
+    public long l36499;
+    public long l36500;
+    public long l36501;
+    public long l36502;
+    public long l36503;
+    public long l36504;
+    public long l36505;
+    public long l36506;
+    public long l36507;
+    public long l36508;
+    public long l36509;
+    public long l36510;
+    public long l36511;
+    public long l36512;
+    public long l36513;
+    public long l36514;
+    public long l36515;
+    public long l36516;
+    public long l36517;
+    public long l36518;
+    public long l36519;
+    public long l36520;
+    public long l36521;
+    public long l36522;
+    public long l36523;
+    public long l36524;
+    public long l36525;
+    public long l36526;
+    public long l36527;
+    public long l36528;
+    public long l36529;
+    public long l36530;
+    public long l36531;
+    public long l36532;
+    public long l36533;
+    public long l36534;
+    public long l36535;
+    public long l36536;
+    public long l36537;
+    public long l36538;
+    public long l36539;
+    public long l36540;
+    public long l36541;
+    public long l36542;
+    public long l36543;
+    public long l36544;
+    public long l36545;
+    public long l36546;
+    public long l36547;
+    public long l36548;
+    public long l36549;
+    public long l36550;
+    public long l36551;
+    public long l36552;
+    public long l36553;
+    public long l36554;
+    public long l36555;
+    public long l36556;
+    public long l36557;
+    public long l36558;
+    public long l36559;
+    public long l36560;
+    public long l36561;
+    public long l36562;
+    public long l36563;
+    public long l36564;
+    public long l36565;
+    public long l36566;
+    public long l36567;
+    public long l36568;
+    public long l36569;
+    public long l36570;
+    public long l36571;
+    public long l36572;
+    public long l36573;
+    public long l36574;
+    public long l36575;
+    public long l36576;
+    public long l36577;
+    public long l36578;
+    public long l36579;
+    public long l36580;
+    public long l36581;
+    public long l36582;
+    public long l36583;
+    public long l36584;
+    public long l36585;
+    public long l36586;
+    public long l36587;
+    public long l36588;
+    public long l36589;
+    public long l36590;
+    public long l36591;
+    public long l36592;
+    public long l36593;
+    public long l36594;
+    public long l36595;
+    public long l36596;
+    public long l36597;
+    public long l36598;
+    public long l36599;
+    public long l36600;
+    public long l36601;
+    public long l36602;
+    public long l36603;
+    public long l36604;
+    public long l36605;
+    public long l36606;
+    public long l36607;
+    public long l36608;
+    public long l36609;
+    public long l36610;
+    public long l36611;
+    public long l36612;
+    public long l36613;
+    public long l36614;
+    public long l36615;
+    public long l36616;
+    public long l36617;
+    public long l36618;
+    public long l36619;
+    public long l36620;
+    public long l36621;
+    public long l36622;
+    public long l36623;
+    public long l36624;
+    public long l36625;
+    public long l36626;
+    public long l36627;
+    public long l36628;
+    public long l36629;
+    public long l36630;
+    public long l36631;
+    public long l36632;
+    public long l36633;
+    public long l36634;
+    public long l36635;
+    public long l36636;
+    public long l36637;
+    public long l36638;
+    public long l36639;
+    public long l36640;
+    public long l36641;
+    public long l36642;
+    public long l36643;
+    public long l36644;
+    public long l36645;
+    public long l36646;
+    public long l36647;
+    public long l36648;
+    public long l36649;
+    public long l36650;
+    public long l36651;
+    public long l36652;
+    public long l36653;
+    public long l36654;
+    public long l36655;
+    public long l36656;
+    public long l36657;
+    public long l36658;
+    public long l36659;
+    public long l36660;
+    public long l36661;
+    public long l36662;
+    public long l36663;
+    public long l36664;
+    public long l36665;
+    public long l36666;
+    public long l36667;
+    public long l36668;
+    public long l36669;
+    public long l36670;
+    public long l36671;
+    public long l36672;
+    public long l36673;
+    public long l36674;
+    public long l36675;
+    public long l36676;
+    public long l36677;
+    public long l36678;
+    public long l36679;
+    public long l36680;
+    public long l36681;
+    public long l36682;
+    public long l36683;
+    public long l36684;
+    public long l36685;
+    public long l36686;
+    public long l36687;
+    public long l36688;
+    public long l36689;
+    public long l36690;
+    public long l36691;
+    public long l36692;
+    public long l36693;
+    public long l36694;
+    public long l36695;
+    public long l36696;
+    public long l36697;
+    public long l36698;
+    public long l36699;
+    public long l36700;
+    public long l36701;
+    public long l36702;
+    public long l36703;
+    public long l36704;
+    public long l36705;
+    public long l36706;
+    public long l36707;
+    public long l36708;
+    public long l36709;
+    public long l36710;
+    public long l36711;
+    public long l36712;
+    public long l36713;
+    public long l36714;
+    public long l36715;
+    public long l36716;
+    public long l36717;
+    public long l36718;
+    public long l36719;
+    public long l36720;
+    public long l36721;
+    public long l36722;
+    public long l36723;
+    public long l36724;
+    public long l36725;
+    public long l36726;
+    public long l36727;
+    public long l36728;
+    public long l36729;
+    public long l36730;
+    public long l36731;
+    public long l36732;
+    public long l36733;
+    public long l36734;
+    public long l36735;
+    public long l36736;
+    public long l36737;
+    public long l36738;
+    public long l36739;
+    public long l36740;
+    public long l36741;
+    public long l36742;
+    public long l36743;
+    public long l36744;
+    public long l36745;
+    public long l36746;
+    public long l36747;
+    public long l36748;
+    public long l36749;
+    public long l36750;
+    public long l36751;
+    public long l36752;
+    public long l36753;
+    public long l36754;
+    public long l36755;
+    public long l36756;
+    public long l36757;
+    public long l36758;
+    public long l36759;
+    public long l36760;
+    public long l36761;
+    public long l36762;
+    public long l36763;
+    public long l36764;
+    public long l36765;
+    public long l36766;
+    public long l36767;
+    public long l36768;
+    public long l36769;
+    public long l36770;
+    public long l36771;
+    public long l36772;
+    public long l36773;
+    public long l36774;
+    public long l36775;
+    public long l36776;
+    public long l36777;
+    public long l36778;
+    public long l36779;
+    public long l36780;
+    public long l36781;
+    public long l36782;
+    public long l36783;
+    public long l36784;
+    public long l36785;
+    public long l36786;
+    public long l36787;
+    public long l36788;
+    public long l36789;
+    public long l36790;
+    public long l36791;
+    public long l36792;
+    public long l36793;
+    public long l36794;
+    public long l36795;
+    public long l36796;
+    public long l36797;
+    public long l36798;
+    public long l36799;
+    public long l36800;
+    public long l36801;
+    public long l36802;
+    public long l36803;
+    public long l36804;
+    public long l36805;
+    public long l36806;
+    public long l36807;
+    public long l36808;
+    public long l36809;
+    public long l36810;
+    public long l36811;
+    public long l36812;
+    public long l36813;
+    public long l36814;
+    public long l36815;
+    public long l36816;
+    public long l36817;
+    public long l36818;
+    public long l36819;
+    public long l36820;
+    public long l36821;
+    public long l36822;
+    public long l36823;
+    public long l36824;
+    public long l36825;
+    public long l36826;
+    public long l36827;
+    public long l36828;
+    public long l36829;
+    public long l36830;
+    public long l36831;
+    public long l36832;
+    public long l36833;
+    public long l36834;
+    public long l36835;
+    public long l36836;
+    public long l36837;
+    public long l36838;
+    public long l36839;
+    public long l36840;
+    public long l36841;
+    public long l36842;
+    public long l36843;
+    public long l36844;
+    public long l36845;
+    public long l36846;
+    public long l36847;
+    public long l36848;
+    public long l36849;
+    public long l36850;
+    public long l36851;
+    public long l36852;
+    public long l36853;
+    public long l36854;
+    public long l36855;
+    public long l36856;
+    public long l36857;
+    public long l36858;
+    public long l36859;
+    public long l36860;
+    public long l36861;
+    public long l36862;
+    public long l36863;
+    public long l36864;
+    public long l36865;
+    public long l36866;
+    public long l36867;
+    public long l36868;
+    public long l36869;
+    public long l36870;
+    public long l36871;
+    public long l36872;
+    public long l36873;
+    public long l36874;
+    public long l36875;
+    public long l36876;
+    public long l36877;
+    public long l36878;
+    public long l36879;
+    public long l36880;
+    public long l36881;
+    public long l36882;
+    public long l36883;
+    public long l36884;
+    public long l36885;
+    public long l36886;
+    public long l36887;
+    public long l36888;
+    public long l36889;
+    public long l36890;
+    public long l36891;
+    public long l36892;
+    public long l36893;
+    public long l36894;
+    public long l36895;
+    public long l36896;
+    public long l36897;
+    public long l36898;
+    public long l36899;
+    public long l36900;
+    public long l36901;
+    public long l36902;
+    public long l36903;
+    public long l36904;
+    public long l36905;
+    public long l36906;
+    public long l36907;
+    public long l36908;
+    public long l36909;
+    public long l36910;
+    public long l36911;
+    public long l36912;
+    public long l36913;
+    public long l36914;
+    public long l36915;
+    public long l36916;
+    public long l36917;
+    public long l36918;
+    public long l36919;
+    public long l36920;
+    public long l36921;
+    public long l36922;
+    public long l36923;
+    public long l36924;
+    public long l36925;
+    public long l36926;
+    public long l36927;
+    public long l36928;
+    public long l36929;
+    public long l36930;
+    public long l36931;
+    public long l36932;
+    public long l36933;
+    public long l36934;
+    public long l36935;
+    public long l36936;
+    public long l36937;
+    public long l36938;
+    public long l36939;
+    public long l36940;
+    public long l36941;
+    public long l36942;
+    public long l36943;
+    public long l36944;
+    public long l36945;
+    public long l36946;
+    public long l36947;
+    public long l36948;
+    public long l36949;
+    public long l36950;
+    public long l36951;
+    public long l36952;
+    public long l36953;
+    public long l36954;
+    public long l36955;
+    public long l36956;
+    public long l36957;
+    public long l36958;
+    public long l36959;
+    public long l36960;
+    public long l36961;
+    public long l36962;
+    public long l36963;
+    public long l36964;
+    public long l36965;
+    public long l36966;
+    public long l36967;
+    public long l36968;
+    public long l36969;
+    public long l36970;
+    public long l36971;
+    public long l36972;
+    public long l36973;
+    public long l36974;
+    public long l36975;
+    public long l36976;
+    public long l36977;
+    public long l36978;
+    public long l36979;
+    public long l36980;
+    public long l36981;
+    public long l36982;
+    public long l36983;
+    public long l36984;
+    public long l36985;
+    public long l36986;
+    public long l36987;
+    public long l36988;
+    public long l36989;
+    public long l36990;
+    public long l36991;
+    public long l36992;
+    public long l36993;
+    public long l36994;
+    public long l36995;
+    public long l36996;
+    public long l36997;
+    public long l36998;
+    public long l36999;
+    public long l37000;
+    public long l37001;
+    public long l37002;
+    public long l37003;
+    public long l37004;
+    public long l37005;
+    public long l37006;
+    public long l37007;
+    public long l37008;
+    public long l37009;
+    public long l37010;
+    public long l37011;
+    public long l37012;
+    public long l37013;
+    public long l37014;
+    public long l37015;
+    public long l37016;
+    public long l37017;
+    public long l37018;
+    public long l37019;
+    public long l37020;
+    public long l37021;
+    public long l37022;
+    public long l37023;
+    public long l37024;
+    public long l37025;
+    public long l37026;
+    public long l37027;
+    public long l37028;
+    public long l37029;
+    public long l37030;
+    public long l37031;
+    public long l37032;
+    public long l37033;
+    public long l37034;
+    public long l37035;
+    public long l37036;
+    public long l37037;
+    public long l37038;
+    public long l37039;
+    public long l37040;
+    public long l37041;
+    public long l37042;
+    public long l37043;
+    public long l37044;
+    public long l37045;
+    public long l37046;
+    public long l37047;
+    public long l37048;
+    public long l37049;
+    public long l37050;
+    public long l37051;
+    public long l37052;
+    public long l37053;
+    public long l37054;
+    public long l37055;
+    public long l37056;
+    public long l37057;
+    public long l37058;
+    public long l37059;
+    public long l37060;
+    public long l37061;
+    public long l37062;
+    public long l37063;
+    public long l37064;
+    public long l37065;
+    public long l37066;
+    public long l37067;
+    public long l37068;
+    public long l37069;
+    public long l37070;
+    public long l37071;
+    public long l37072;
+    public long l37073;
+    public long l37074;
+    public long l37075;
+    public long l37076;
+    public long l37077;
+    public long l37078;
+    public long l37079;
+    public long l37080;
+    public long l37081;
+    public long l37082;
+    public long l37083;
+    public long l37084;
+    public long l37085;
+    public long l37086;
+    public long l37087;
+    public long l37088;
+    public long l37089;
+    public long l37090;
+    public long l37091;
+    public long l37092;
+    public long l37093;
+    public long l37094;
+    public long l37095;
+    public long l37096;
+    public long l37097;
+    public long l37098;
+    public long l37099;
+    public long l37100;
+    public long l37101;
+    public long l37102;
+    public long l37103;
+    public long l37104;
+    public long l37105;
+    public long l37106;
+    public long l37107;
+    public long l37108;
+    public long l37109;
+    public long l37110;
+    public long l37111;
+    public long l37112;
+    public long l37113;
+    public long l37114;
+    public long l37115;
+    public long l37116;
+    public long l37117;
+    public long l37118;
+    public long l37119;
+    public long l37120;
+    public long l37121;
+    public long l37122;
+    public long l37123;
+    public long l37124;
+    public long l37125;
+    public long l37126;
+    public long l37127;
+    public long l37128;
+    public long l37129;
+    public long l37130;
+    public long l37131;
+    public long l37132;
+    public long l37133;
+    public long l37134;
+    public long l37135;
+    public long l37136;
+    public long l37137;
+    public long l37138;
+    public long l37139;
+    public long l37140;
+    public long l37141;
+    public long l37142;
+    public long l37143;
+    public long l37144;
+    public long l37145;
+    public long l37146;
+    public long l37147;
+    public long l37148;
+    public long l37149;
+    public long l37150;
+    public long l37151;
+    public long l37152;
+    public long l37153;
+    public long l37154;
+    public long l37155;
+    public long l37156;
+    public long l37157;
+    public long l37158;
+    public long l37159;
+    public long l37160;
+    public long l37161;
+    public long l37162;
+    public long l37163;
+    public long l37164;
+    public long l37165;
+    public long l37166;
+    public long l37167;
+    public long l37168;
+    public long l37169;
+    public long l37170;
+    public long l37171;
+    public long l37172;
+    public long l37173;
+    public long l37174;
+    public long l37175;
+    public long l37176;
+    public long l37177;
+    public long l37178;
+    public long l37179;
+    public long l37180;
+    public long l37181;
+    public long l37182;
+    public long l37183;
+    public long l37184;
+    public long l37185;
+    public long l37186;
+    public long l37187;
+    public long l37188;
+    public long l37189;
+    public long l37190;
+    public long l37191;
+    public long l37192;
+    public long l37193;
+    public long l37194;
+    public long l37195;
+    public long l37196;
+    public long l37197;
+    public long l37198;
+    public long l37199;
+    public long l37200;
+    public long l37201;
+    public long l37202;
+    public long l37203;
+    public long l37204;
+    public long l37205;
+    public long l37206;
+    public long l37207;
+    public long l37208;
+    public long l37209;
+    public long l37210;
+    public long l37211;
+    public long l37212;
+    public long l37213;
+    public long l37214;
+    public long l37215;
+    public long l37216;
+    public long l37217;
+    public long l37218;
+    public long l37219;
+    public long l37220;
+    public long l37221;
+    public long l37222;
+    public long l37223;
+    public long l37224;
+    public long l37225;
+    public long l37226;
+    public long l37227;
+    public long l37228;
+    public long l37229;
+    public long l37230;
+    public long l37231;
+    public long l37232;
+    public long l37233;
+    public long l37234;
+    public long l37235;
+    public long l37236;
+    public long l37237;
+    public long l37238;
+    public long l37239;
+    public long l37240;
+    public long l37241;
+    public long l37242;
+    public long l37243;
+    public long l37244;
+    public long l37245;
+    public long l37246;
+    public long l37247;
+    public long l37248;
+    public long l37249;
+    public long l37250;
+    public long l37251;
+    public long l37252;
+    public long l37253;
+    public long l37254;
+    public long l37255;
+    public long l37256;
+    public long l37257;
+    public long l37258;
+    public long l37259;
+    public long l37260;
+    public long l37261;
+    public long l37262;
+    public long l37263;
+    public long l37264;
+    public long l37265;
+    public long l37266;
+    public long l37267;
+    public long l37268;
+    public long l37269;
+    public long l37270;
+    public long l37271;
+    public long l37272;
+    public long l37273;
+    public long l37274;
+    public long l37275;
+    public long l37276;
+    public long l37277;
+    public long l37278;
+    public long l37279;
+    public long l37280;
+    public long l37281;
+    public long l37282;
+    public long l37283;
+    public long l37284;
+    public long l37285;
+    public long l37286;
+    public long l37287;
+    public long l37288;
+    public long l37289;
+    public long l37290;
+    public long l37291;
+    public long l37292;
+    public long l37293;
+    public long l37294;
+    public long l37295;
+    public long l37296;
+    public long l37297;
+    public long l37298;
+    public long l37299;
+    public long l37300;
+    public long l37301;
+    public long l37302;
+    public long l37303;
+    public long l37304;
+    public long l37305;
+    public long l37306;
+    public long l37307;
+    public long l37308;
+    public long l37309;
+    public long l37310;
+    public long l37311;
+    public long l37312;
+    public long l37313;
+    public long l37314;
+    public long l37315;
+    public long l37316;
+    public long l37317;
+    public long l37318;
+    public long l37319;
+    public long l37320;
+    public long l37321;
+    public long l37322;
+    public long l37323;
+    public long l37324;
+    public long l37325;
+    public long l37326;
+    public long l37327;
+    public long l37328;
+    public long l37329;
+    public long l37330;
+    public long l37331;
+    public long l37332;
+    public long l37333;
+    public long l37334;
+    public long l37335;
+    public long l37336;
+    public long l37337;
+    public long l37338;
+    public long l37339;
+    public long l37340;
+    public long l37341;
+    public long l37342;
+    public long l37343;
+    public long l37344;
+    public long l37345;
+    public long l37346;
+    public long l37347;
+    public long l37348;
+    public long l37349;
+    public long l37350;
+    public long l37351;
+    public long l37352;
+    public long l37353;
+    public long l37354;
+    public long l37355;
+    public long l37356;
+    public long l37357;
+    public long l37358;
+    public long l37359;
+    public long l37360;
+    public long l37361;
+    public long l37362;
+    public long l37363;
+    public long l37364;
+    public long l37365;
+    public long l37366;
+    public long l37367;
+    public long l37368;
+    public long l37369;
+    public long l37370;
+    public long l37371;
+    public long l37372;
+    public long l37373;
+    public long l37374;
+    public long l37375;
+    public long l37376;
+    public long l37377;
+    public long l37378;
+    public long l37379;
+    public long l37380;
+    public long l37381;
+    public long l37382;
+    public long l37383;
+    public long l37384;
+    public long l37385;
+    public long l37386;
+    public long l37387;
+    public long l37388;
+    public long l37389;
+    public long l37390;
+    public long l37391;
+    public long l37392;
+    public long l37393;
+    public long l37394;
+    public long l37395;
+    public long l37396;
+    public long l37397;
+    public long l37398;
+    public long l37399;
+    public long l37400;
+    public long l37401;
+    public long l37402;
+    public long l37403;
+    public long l37404;
+    public long l37405;
+    public long l37406;
+    public long l37407;
+    public long l37408;
+    public long l37409;
+    public long l37410;
+    public long l37411;
+    public long l37412;
+    public long l37413;
+    public long l37414;
+    public long l37415;
+    public long l37416;
+    public long l37417;
+    public long l37418;
+    public long l37419;
+    public long l37420;
+    public long l37421;
+    public long l37422;
+    public long l37423;
+    public long l37424;
+    public long l37425;
+    public long l37426;
+    public long l37427;
+    public long l37428;
+    public long l37429;
+    public long l37430;
+    public long l37431;
+    public long l37432;
+    public long l37433;
+    public long l37434;
+    public long l37435;
+    public long l37436;
+    public long l37437;
+    public long l37438;
+    public long l37439;
+    public long l37440;
+    public long l37441;
+    public long l37442;
+    public long l37443;
+    public long l37444;
+    public long l37445;
+    public long l37446;
+    public long l37447;
+    public long l37448;
+    public long l37449;
+    public long l37450;
+    public long l37451;
+    public long l37452;
+    public long l37453;
+    public long l37454;
+    public long l37455;
+    public long l37456;
+    public long l37457;
+    public long l37458;
+    public long l37459;
+    public long l37460;
+    public long l37461;
+    public long l37462;
+    public long l37463;
+    public long l37464;
+    public long l37465;
+    public long l37466;
+    public long l37467;
+    public long l37468;
+    public long l37469;
+    public long l37470;
+    public long l37471;
+    public long l37472;
+    public long l37473;
+    public long l37474;
+    public long l37475;
+    public long l37476;
+    public long l37477;
+    public long l37478;
+    public long l37479;
+    public long l37480;
+    public long l37481;
+    public long l37482;
+    public long l37483;
+    public long l37484;
+    public long l37485;
+    public long l37486;
+    public long l37487;
+    public long l37488;
+    public long l37489;
+    public long l37490;
+    public long l37491;
+    public long l37492;
+    public long l37493;
+    public long l37494;
+    public long l37495;
+    public long l37496;
+    public long l37497;
+    public long l37498;
+    public long l37499;
+    public long l37500;
+    public long l37501;
+    public long l37502;
+    public long l37503;
+    public long l37504;
+    public long l37505;
+    public long l37506;
+    public long l37507;
+    public long l37508;
+    public long l37509;
+    public long l37510;
+    public long l37511;
+    public long l37512;
+    public long l37513;
+    public long l37514;
+    public long l37515;
+    public long l37516;
+    public long l37517;
+    public long l37518;
+    public long l37519;
+    public long l37520;
+    public long l37521;
+    public long l37522;
+    public long l37523;
+    public long l37524;
+    public long l37525;
+    public long l37526;
+    public long l37527;
+    public long l37528;
+    public long l37529;
+    public long l37530;
+    public long l37531;
+    public long l37532;
+    public long l37533;
+    public long l37534;
+    public long l37535;
+    public long l37536;
+    public long l37537;
+    public long l37538;
+    public long l37539;
+    public long l37540;
+    public long l37541;
+    public long l37542;
+    public long l37543;
+    public long l37544;
+    public long l37545;
+    public long l37546;
+    public long l37547;
+    public long l37548;
+    public long l37549;
+    public long l37550;
+    public long l37551;
+    public long l37552;
+    public long l37553;
+    public long l37554;
+    public long l37555;
+    public long l37556;
+    public long l37557;
+    public long l37558;
+    public long l37559;
+    public long l37560;
+    public long l37561;
+    public long l37562;
+    public long l37563;
+    public long l37564;
+    public long l37565;
+    public long l37566;
+    public long l37567;
+    public long l37568;
+    public long l37569;
+    public long l37570;
+    public long l37571;
+    public long l37572;
+    public long l37573;
+    public long l37574;
+    public long l37575;
+    public long l37576;
+    public long l37577;
+    public long l37578;
+    public long l37579;
+    public long l37580;
+    public long l37581;
+    public long l37582;
+    public long l37583;
+    public long l37584;
+    public long l37585;
+    public long l37586;
+    public long l37587;
+    public long l37588;
+    public long l37589;
+    public long l37590;
+    public long l37591;
+    public long l37592;
+    public long l37593;
+    public long l37594;
+    public long l37595;
+    public long l37596;
+    public long l37597;
+    public long l37598;
+    public long l37599;
+    public long l37600;
+    public long l37601;
+    public long l37602;
+    public long l37603;
+    public long l37604;
+    public long l37605;
+    public long l37606;
+    public long l37607;
+    public long l37608;
+    public long l37609;
+    public long l37610;
+    public long l37611;
+    public long l37612;
+    public long l37613;
+    public long l37614;
+    public long l37615;
+    public long l37616;
+    public long l37617;
+    public long l37618;
+    public long l37619;
+    public long l37620;
+    public long l37621;
+    public long l37622;
+    public long l37623;
+    public long l37624;
+    public long l37625;
+    public long l37626;
+    public long l37627;
+    public long l37628;
+    public long l37629;
+    public long l37630;
+    public long l37631;
+    public long l37632;
+    public long l37633;
+    public long l37634;
+    public long l37635;
+    public long l37636;
+    public long l37637;
+    public long l37638;
+    public long l37639;
+    public long l37640;
+    public long l37641;
+    public long l37642;
+    public long l37643;
+    public long l37644;
+    public long l37645;
+    public long l37646;
+    public long l37647;
+    public long l37648;
+    public long l37649;
+    public long l37650;
+    public long l37651;
+    public long l37652;
+    public long l37653;
+    public long l37654;
+    public long l37655;
+    public long l37656;
+    public long l37657;
+    public long l37658;
+    public long l37659;
+    public long l37660;
+    public long l37661;
+    public long l37662;
+    public long l37663;
+    public long l37664;
+    public long l37665;
+    public long l37666;
+    public long l37667;
+    public long l37668;
+    public long l37669;
+    public long l37670;
+    public long l37671;
+    public long l37672;
+    public long l37673;
+    public long l37674;
+    public long l37675;
+    public long l37676;
+    public long l37677;
+    public long l37678;
+    public long l37679;
+    public long l37680;
+    public long l37681;
+    public long l37682;
+    public long l37683;
+    public long l37684;
+    public long l37685;
+    public long l37686;
+    public long l37687;
+    public long l37688;
+    public long l37689;
+    public long l37690;
+    public long l37691;
+    public long l37692;
+    public long l37693;
+    public long l37694;
+    public long l37695;
+    public long l37696;
+    public long l37697;
+    public long l37698;
+    public long l37699;
+    public long l37700;
+    public long l37701;
+    public long l37702;
+    public long l37703;
+    public long l37704;
+    public long l37705;
+    public long l37706;
+    public long l37707;
+    public long l37708;
+    public long l37709;
+    public long l37710;
+    public long l37711;
+    public long l37712;
+    public long l37713;
+    public long l37714;
+    public long l37715;
+    public long l37716;
+    public long l37717;
+    public long l37718;
+    public long l37719;
+    public long l37720;
+    public long l37721;
+    public long l37722;
+    public long l37723;
+    public long l37724;
+    public long l37725;
+    public long l37726;
+    public long l37727;
+    public long l37728;
+    public long l37729;
+    public long l37730;
+    public long l37731;
+    public long l37732;
+    public long l37733;
+    public long l37734;
+    public long l37735;
+    public long l37736;
+    public long l37737;
+    public long l37738;
+    public long l37739;
+    public long l37740;
+    public long l37741;
+    public long l37742;
+    public long l37743;
+    public long l37744;
+    public long l37745;
+    public long l37746;
+    public long l37747;
+    public long l37748;
+    public long l37749;
+    public long l37750;
+    public long l37751;
+    public long l37752;
+    public long l37753;
+    public long l37754;
+    public long l37755;
+    public long l37756;
+    public long l37757;
+    public long l37758;
+    public long l37759;
+    public long l37760;
+    public long l37761;
+    public long l37762;
+    public long l37763;
+    public long l37764;
+    public long l37765;
+    public long l37766;
+    public long l37767;
+    public long l37768;
+    public long l37769;
+    public long l37770;
+    public long l37771;
+    public long l37772;
+    public long l37773;
+    public long l37774;
+    public long l37775;
+    public long l37776;
+    public long l37777;
+    public long l37778;
+    public long l37779;
+    public long l37780;
+    public long l37781;
+    public long l37782;
+    public long l37783;
+    public long l37784;
+    public long l37785;
+    public long l37786;
+    public long l37787;
+    public long l37788;
+    public long l37789;
+    public long l37790;
+    public long l37791;
+    public long l37792;
+    public long l37793;
+    public long l37794;
+    public long l37795;
+    public long l37796;
+    public long l37797;
+    public long l37798;
+    public long l37799;
+    public long l37800;
+    public long l37801;
+    public long l37802;
+    public long l37803;
+    public long l37804;
+    public long l37805;
+    public long l37806;
+    public long l37807;
+    public long l37808;
+    public long l37809;
+    public long l37810;
+    public long l37811;
+    public long l37812;
+    public long l37813;
+    public long l37814;
+    public long l37815;
+    public long l37816;
+    public long l37817;
+    public long l37818;
+    public long l37819;
+    public long l37820;
+    public long l37821;
+    public long l37822;
+    public long l37823;
+    public long l37824;
+    public long l37825;
+    public long l37826;
+    public long l37827;
+    public long l37828;
+    public long l37829;
+    public long l37830;
+    public long l37831;
+    public long l37832;
+    public long l37833;
+    public long l37834;
+    public long l37835;
+    public long l37836;
+    public long l37837;
+    public long l37838;
+    public long l37839;
+    public long l37840;
+    public long l37841;
+    public long l37842;
+    public long l37843;
+    public long l37844;
+    public long l37845;
+    public long l37846;
+    public long l37847;
+    public long l37848;
+    public long l37849;
+    public long l37850;
+    public long l37851;
+    public long l37852;
+    public long l37853;
+    public long l37854;
+    public long l37855;
+    public long l37856;
+    public long l37857;
+    public long l37858;
+    public long l37859;
+    public long l37860;
+    public long l37861;
+    public long l37862;
+    public long l37863;
+    public long l37864;
+    public long l37865;
+    public long l37866;
+    public long l37867;
+    public long l37868;
+    public long l37869;
+    public long l37870;
+    public long l37871;
+    public long l37872;
+    public long l37873;
+    public long l37874;
+    public long l37875;
+    public long l37876;
+    public long l37877;
+    public long l37878;
+    public long l37879;
+    public long l37880;
+    public long l37881;
+    public long l37882;
+    public long l37883;
+    public long l37884;
+    public long l37885;
+    public long l37886;
+    public long l37887;
+    public long l37888;
+    public long l37889;
+    public long l37890;
+    public long l37891;
+    public long l37892;
+    public long l37893;
+    public long l37894;
+    public long l37895;
+    public long l37896;
+    public long l37897;
+    public long l37898;
+    public long l37899;
+    public long l37900;
+    public long l37901;
+    public long l37902;
+    public long l37903;
+    public long l37904;
+    public long l37905;
+    public long l37906;
+    public long l37907;
+    public long l37908;
+    public long l37909;
+    public long l37910;
+    public long l37911;
+    public long l37912;
+    public long l37913;
+    public long l37914;
+    public long l37915;
+    public long l37916;
+    public long l37917;
+    public long l37918;
+    public long l37919;
+    public long l37920;
+    public long l37921;
+    public long l37922;
+    public long l37923;
+    public long l37924;
+    public long l37925;
+    public long l37926;
+    public long l37927;
+    public long l37928;
+    public long l37929;
+    public long l37930;
+    public long l37931;
+    public long l37932;
+    public long l37933;
+    public long l37934;
+    public long l37935;
+    public long l37936;
+    public long l37937;
+    public long l37938;
+    public long l37939;
+    public long l37940;
+    public long l37941;
+    public long l37942;
+    public long l37943;
+    public long l37944;
+    public long l37945;
+    public long l37946;
+    public long l37947;
+    public long l37948;
+    public long l37949;
+    public long l37950;
+    public long l37951;
+    public long l37952;
+    public long l37953;
+    public long l37954;
+    public long l37955;
+    public long l37956;
+    public long l37957;
+    public long l37958;
+    public long l37959;
+    public long l37960;
+    public long l37961;
+    public long l37962;
+    public long l37963;
+    public long l37964;
+    public long l37965;
+    public long l37966;
+    public long l37967;
+    public long l37968;
+    public long l37969;
+    public long l37970;
+    public long l37971;
+    public long l37972;
+    public long l37973;
+    public long l37974;
+    public long l37975;
+    public long l37976;
+    public long l37977;
+    public long l37978;
+    public long l37979;
+    public long l37980;
+    public long l37981;
+    public long l37982;
+    public long l37983;
+    public long l37984;
+    public long l37985;
+    public long l37986;
+    public long l37987;
+    public long l37988;
+    public long l37989;
+    public long l37990;
+    public long l37991;
+    public long l37992;
+    public long l37993;
+    public long l37994;
+    public long l37995;
+    public long l37996;
+    public long l37997;
+    public long l37998;
+    public long l37999;
+    public long l38000;
+    public long l38001;
+    public long l38002;
+    public long l38003;
+    public long l38004;
+    public long l38005;
+    public long l38006;
+    public long l38007;
+    public long l38008;
+    public long l38009;
+    public long l38010;
+    public long l38011;
+    public long l38012;
+    public long l38013;
+    public long l38014;
+    public long l38015;
+    public long l38016;
+    public long l38017;
+    public long l38018;
+    public long l38019;
+    public long l38020;
+    public long l38021;
+    public long l38022;
+    public long l38023;
+    public long l38024;
+    public long l38025;
+    public long l38026;
+    public long l38027;
+    public long l38028;
+    public long l38029;
+    public long l38030;
+    public long l38031;
+    public long l38032;
+    public long l38033;
+    public long l38034;
+    public long l38035;
+    public long l38036;
+    public long l38037;
+    public long l38038;
+    public long l38039;
+    public long l38040;
+    public long l38041;
+    public long l38042;
+    public long l38043;
+    public long l38044;
+    public long l38045;
+    public long l38046;
+    public long l38047;
+    public long l38048;
+    public long l38049;
+    public long l38050;
+    public long l38051;
+    public long l38052;
+    public long l38053;
+    public long l38054;
+    public long l38055;
+    public long l38056;
+    public long l38057;
+    public long l38058;
+    public long l38059;
+    public long l38060;
+    public long l38061;
+    public long l38062;
+    public long l38063;
+    public long l38064;
+    public long l38065;
+    public long l38066;
+    public long l38067;
+    public long l38068;
+    public long l38069;
+    public long l38070;
+    public long l38071;
+    public long l38072;
+    public long l38073;
+    public long l38074;
+    public long l38075;
+    public long l38076;
+    public long l38077;
+    public long l38078;
+    public long l38079;
+    public long l38080;
+    public long l38081;
+    public long l38082;
+    public long l38083;
+    public long l38084;
+    public long l38085;
+    public long l38086;
+    public long l38087;
+    public long l38088;
+    public long l38089;
+    public long l38090;
+    public long l38091;
+    public long l38092;
+    public long l38093;
+    public long l38094;
+    public long l38095;
+    public long l38096;
+    public long l38097;
+    public long l38098;
+    public long l38099;
+    public long l38100;
+    public long l38101;
+    public long l38102;
+    public long l38103;
+    public long l38104;
+    public long l38105;
+    public long l38106;
+    public long l38107;
+    public long l38108;
+    public long l38109;
+    public long l38110;
+    public long l38111;
+    public long l38112;
+    public long l38113;
+    public long l38114;
+    public long l38115;
+    public long l38116;
+    public long l38117;
+    public long l38118;
+    public long l38119;
+    public long l38120;
+    public long l38121;
+    public long l38122;
+    public long l38123;
+    public long l38124;
+    public long l38125;
+    public long l38126;
+    public long l38127;
+    public long l38128;
+    public long l38129;
+    public long l38130;
+    public long l38131;
+    public long l38132;
+    public long l38133;
+    public long l38134;
+    public long l38135;
+    public long l38136;
+    public long l38137;
+    public long l38138;
+    public long l38139;
+    public long l38140;
+    public long l38141;
+    public long l38142;
+    public long l38143;
+    public long l38144;
+    public long l38145;
+    public long l38146;
+    public long l38147;
+    public long l38148;
+    public long l38149;
+    public long l38150;
+    public long l38151;
+    public long l38152;
+    public long l38153;
+    public long l38154;
+    public long l38155;
+    public long l38156;
+    public long l38157;
+    public long l38158;
+    public long l38159;
+    public long l38160;
+    public long l38161;
+    public long l38162;
+    public long l38163;
+    public long l38164;
+    public long l38165;
+    public long l38166;
+    public long l38167;
+    public long l38168;
+    public long l38169;
+    public long l38170;
+    public long l38171;
+    public long l38172;
+    public long l38173;
+    public long l38174;
+    public long l38175;
+    public long l38176;
+    public long l38177;
+    public long l38178;
+    public long l38179;
+    public long l38180;
+    public long l38181;
+    public long l38182;
+    public long l38183;
+    public long l38184;
+    public long l38185;
+    public long l38186;
+    public long l38187;
+    public long l38188;
+    public long l38189;
+    public long l38190;
+    public long l38191;
+    public long l38192;
+    public long l38193;
+    public long l38194;
+    public long l38195;
+    public long l38196;
+    public long l38197;
+    public long l38198;
+    public long l38199;
+    public long l38200;
+    public long l38201;
+    public long l38202;
+    public long l38203;
+    public long l38204;
+    public long l38205;
+    public long l38206;
+    public long l38207;
+    public long l38208;
+    public long l38209;
+    public long l38210;
+    public long l38211;
+    public long l38212;
+    public long l38213;
+    public long l38214;
+    public long l38215;
+    public long l38216;
+    public long l38217;
+    public long l38218;
+    public long l38219;
+    public long l38220;
+    public long l38221;
+    public long l38222;
+    public long l38223;
+    public long l38224;
+    public long l38225;
+    public long l38226;
+    public long l38227;
+    public long l38228;
+    public long l38229;
+    public long l38230;
+    public long l38231;
+    public long l38232;
+    public long l38233;
+    public long l38234;
+    public long l38235;
+    public long l38236;
+    public long l38237;
+    public long l38238;
+    public long l38239;
+    public long l38240;
+    public long l38241;
+    public long l38242;
+    public long l38243;
+    public long l38244;
+    public long l38245;
+    public long l38246;
+    public long l38247;
+    public long l38248;
+    public long l38249;
+    public long l38250;
+    public long l38251;
+    public long l38252;
+    public long l38253;
+    public long l38254;
+    public long l38255;
+    public long l38256;
+    public long l38257;
+    public long l38258;
+    public long l38259;
+    public long l38260;
+    public long l38261;
+    public long l38262;
+    public long l38263;
+    public long l38264;
+    public long l38265;
+    public long l38266;
+    public long l38267;
+    public long l38268;
+    public long l38269;
+    public long l38270;
+    public long l38271;
+    public long l38272;
+    public long l38273;
+    public long l38274;
+    public long l38275;
+    public long l38276;
+    public long l38277;
+    public long l38278;
+    public long l38279;
+    public long l38280;
+    public long l38281;
+    public long l38282;
+    public long l38283;
+    public long l38284;
+    public long l38285;
+    public long l38286;
+    public long l38287;
+    public long l38288;
+    public long l38289;
+    public long l38290;
+    public long l38291;
+    public long l38292;
+    public long l38293;
+    public long l38294;
+    public long l38295;
+    public long l38296;
+    public long l38297;
+    public long l38298;
+    public long l38299;
+    public long l38300;
+    public long l38301;
+    public long l38302;
+    public long l38303;
+    public long l38304;
+    public long l38305;
+    public long l38306;
+    public long l38307;
+    public long l38308;
+    public long l38309;
+    public long l38310;
+    public long l38311;
+    public long l38312;
+    public long l38313;
+    public long l38314;
+    public long l38315;
+    public long l38316;
+    public long l38317;
+    public long l38318;
+    public long l38319;
+    public long l38320;
+    public long l38321;
+    public long l38322;
+    public long l38323;
+    public long l38324;
+    public long l38325;
+    public long l38326;
+    public long l38327;
+    public long l38328;
+    public long l38329;
+    public long l38330;
+    public long l38331;
+    public long l38332;
+    public long l38333;
+    public long l38334;
+    public long l38335;
+    public long l38336;
+    public long l38337;
+    public long l38338;
+    public long l38339;
+    public long l38340;
+    public long l38341;
+    public long l38342;
+    public long l38343;
+    public long l38344;
+    public long l38345;
+    public long l38346;
+    public long l38347;
+    public long l38348;
+    public long l38349;
+    public long l38350;
+    public long l38351;
+    public long l38352;
+    public long l38353;
+    public long l38354;
+    public long l38355;
+    public long l38356;
+    public long l38357;
+    public long l38358;
+    public long l38359;
+    public long l38360;
+    public long l38361;
+    public long l38362;
+    public long l38363;
+    public long l38364;
+    public long l38365;
+    public long l38366;
+    public long l38367;
+    public long l38368;
+    public long l38369;
+    public long l38370;
+    public long l38371;
+    public long l38372;
+    public long l38373;
+    public long l38374;
+    public long l38375;
+    public long l38376;
+    public long l38377;
+    public long l38378;
+    public long l38379;
+    public long l38380;
+    public long l38381;
+    public long l38382;
+    public long l38383;
+    public long l38384;
+    public long l38385;
+    public long l38386;
+    public long l38387;
+    public long l38388;
+    public long l38389;
+    public long l38390;
+    public long l38391;
+    public long l38392;
+    public long l38393;
+    public long l38394;
+    public long l38395;
+    public long l38396;
+    public long l38397;
+    public long l38398;
+    public long l38399;
+    public long l38400;
+    public long l38401;
+    public long l38402;
+    public long l38403;
+    public long l38404;
+    public long l38405;
+    public long l38406;
+    public long l38407;
+    public long l38408;
+    public long l38409;
+    public long l38410;
+    public long l38411;
+    public long l38412;
+    public long l38413;
+    public long l38414;
+    public long l38415;
+    public long l38416;
+    public long l38417;
+    public long l38418;
+    public long l38419;
+    public long l38420;
+    public long l38421;
+    public long l38422;
+    public long l38423;
+    public long l38424;
+    public long l38425;
+    public long l38426;
+    public long l38427;
+    public long l38428;
+    public long l38429;
+    public long l38430;
+    public long l38431;
+    public long l38432;
+    public long l38433;
+    public long l38434;
+    public long l38435;
+    public long l38436;
+    public long l38437;
+    public long l38438;
+    public long l38439;
+    public long l38440;
+    public long l38441;
+    public long l38442;
+    public long l38443;
+    public long l38444;
+    public long l38445;
+    public long l38446;
+    public long l38447;
+    public long l38448;
+    public long l38449;
+    public long l38450;
+    public long l38451;
+    public long l38452;
+    public long l38453;
+    public long l38454;
+    public long l38455;
+    public long l38456;
+    public long l38457;
+    public long l38458;
+    public long l38459;
+    public long l38460;
+    public long l38461;
+    public long l38462;
+    public long l38463;
+    public long l38464;
+    public long l38465;
+    public long l38466;
+    public long l38467;
+    public long l38468;
+    public long l38469;
+    public long l38470;
+    public long l38471;
+    public long l38472;
+    public long l38473;
+    public long l38474;
+    public long l38475;
+    public long l38476;
+    public long l38477;
+    public long l38478;
+    public long l38479;
+    public long l38480;
+    public long l38481;
+    public long l38482;
+    public long l38483;
+    public long l38484;
+    public long l38485;
+    public long l38486;
+    public long l38487;
+    public long l38488;
+    public long l38489;
+    public long l38490;
+    public long l38491;
+    public long l38492;
+    public long l38493;
+    public long l38494;
+    public long l38495;
+    public long l38496;
+    public long l38497;
+    public long l38498;
+    public long l38499;
+    public long l38500;
+    public long l38501;
+    public long l38502;
+    public long l38503;
+    public long l38504;
+    public long l38505;
+    public long l38506;
+    public long l38507;
+    public long l38508;
+    public long l38509;
+    public long l38510;
+    public long l38511;
+    public long l38512;
+    public long l38513;
+    public long l38514;
+    public long l38515;
+    public long l38516;
+    public long l38517;
+    public long l38518;
+    public long l38519;
+    public long l38520;
+    public long l38521;
+    public long l38522;
+    public long l38523;
+    public long l38524;
+    public long l38525;
+    public long l38526;
+    public long l38527;
+    public long l38528;
+    public long l38529;
+    public long l38530;
+    public long l38531;
+    public long l38532;
+    public long l38533;
+    public long l38534;
+    public long l38535;
+    public long l38536;
+    public long l38537;
+    public long l38538;
+    public long l38539;
+    public long l38540;
+    public long l38541;
+    public long l38542;
+    public long l38543;
+    public long l38544;
+    public long l38545;
+    public long l38546;
+    public long l38547;
+    public long l38548;
+    public long l38549;
+    public long l38550;
+    public long l38551;
+    public long l38552;
+    public long l38553;
+    public long l38554;
+    public long l38555;
+    public long l38556;
+    public long l38557;
+    public long l38558;
+    public long l38559;
+    public long l38560;
+    public long l38561;
+    public long l38562;
+    public long l38563;
+    public long l38564;
+    public long l38565;
+    public long l38566;
+    public long l38567;
+    public long l38568;
+    public long l38569;
+    public long l38570;
+    public long l38571;
+    public long l38572;
+    public long l38573;
+    public long l38574;
+    public long l38575;
+    public long l38576;
+    public long l38577;
+    public long l38578;
+    public long l38579;
+    public long l38580;
+    public long l38581;
+    public long l38582;
+    public long l38583;
+    public long l38584;
+    public long l38585;
+    public long l38586;
+    public long l38587;
+    public long l38588;
+    public long l38589;
+    public long l38590;
+    public long l38591;
+    public long l38592;
+    public long l38593;
+    public long l38594;
+    public long l38595;
+    public long l38596;
+    public long l38597;
+    public long l38598;
+    public long l38599;
+    public long l38600;
+    public long l38601;
+    public long l38602;
+    public long l38603;
+    public long l38604;
+    public long l38605;
+    public long l38606;
+    public long l38607;
+    public long l38608;
+    public long l38609;
+    public long l38610;
+    public long l38611;
+    public long l38612;
+    public long l38613;
+    public long l38614;
+    public long l38615;
+    public long l38616;
+    public long l38617;
+    public long l38618;
+    public long l38619;
+    public long l38620;
+    public long l38621;
+    public long l38622;
+    public long l38623;
+    public long l38624;
+    public long l38625;
+    public long l38626;
+    public long l38627;
+    public long l38628;
+    public long l38629;
+    public long l38630;
+    public long l38631;
+    public long l38632;
+    public long l38633;
+    public long l38634;
+    public long l38635;
+    public long l38636;
+    public long l38637;
+    public long l38638;
+    public long l38639;
+    public long l38640;
+    public long l38641;
+    public long l38642;
+    public long l38643;
+    public long l38644;
+    public long l38645;
+    public long l38646;
+    public long l38647;
+    public long l38648;
+    public long l38649;
+    public long l38650;
+    public long l38651;
+    public long l38652;
+    public long l38653;
+    public long l38654;
+    public long l38655;
+    public long l38656;
+    public long l38657;
+    public long l38658;
+    public long l38659;
+    public long l38660;
+    public long l38661;
+    public long l38662;
+    public long l38663;
+    public long l38664;
+    public long l38665;
+    public long l38666;
+    public long l38667;
+    public long l38668;
+    public long l38669;
+    public long l38670;
+    public long l38671;
+    public long l38672;
+    public long l38673;
+    public long l38674;
+    public long l38675;
+    public long l38676;
+    public long l38677;
+    public long l38678;
+    public long l38679;
+    public long l38680;
+    public long l38681;
+    public long l38682;
+    public long l38683;
+    public long l38684;
+    public long l38685;
+    public long l38686;
+    public long l38687;
+    public long l38688;
+    public long l38689;
+    public long l38690;
+    public long l38691;
+    public long l38692;
+    public long l38693;
+    public long l38694;
+    public long l38695;
+    public long l38696;
+    public long l38697;
+    public long l38698;
+    public long l38699;
+    public long l38700;
+    public long l38701;
+    public long l38702;
+    public long l38703;
+    public long l38704;
+    public long l38705;
+    public long l38706;
+    public long l38707;
+    public long l38708;
+    public long l38709;
+    public long l38710;
+    public long l38711;
+    public long l38712;
+    public long l38713;
+    public long l38714;
+    public long l38715;
+    public long l38716;
+    public long l38717;
+    public long l38718;
+    public long l38719;
+    public long l38720;
+    public long l38721;
+    public long l38722;
+    public long l38723;
+    public long l38724;
+    public long l38725;
+    public long l38726;
+    public long l38727;
+    public long l38728;
+    public long l38729;
+    public long l38730;
+    public long l38731;
+    public long l38732;
+    public long l38733;
+    public long l38734;
+    public long l38735;
+    public long l38736;
+    public long l38737;
+    public long l38738;
+    public long l38739;
+    public long l38740;
+    public long l38741;
+    public long l38742;
+    public long l38743;
+    public long l38744;
+    public long l38745;
+    public long l38746;
+    public long l38747;
+    public long l38748;
+    public long l38749;
+    public long l38750;
+    public long l38751;
+    public long l38752;
+    public long l38753;
+    public long l38754;
+    public long l38755;
+    public long l38756;
+    public long l38757;
+    public long l38758;
+    public long l38759;
+    public long l38760;
+    public long l38761;
+    public long l38762;
+    public long l38763;
+    public long l38764;
+    public long l38765;
+    public long l38766;
+    public long l38767;
+    public long l38768;
+    public long l38769;
+    public long l38770;
+    public long l38771;
+    public long l38772;
+    public long l38773;
+    public long l38774;
+    public long l38775;
+    public long l38776;
+    public long l38777;
+    public long l38778;
+    public long l38779;
+    public long l38780;
+    public long l38781;
+    public long l38782;
+    public long l38783;
+    public long l38784;
+    public long l38785;
+    public long l38786;
+    public long l38787;
+    public long l38788;
+    public long l38789;
+    public long l38790;
+    public long l38791;
+    public long l38792;
+    public long l38793;
+    public long l38794;
+    public long l38795;
+    public long l38796;
+    public long l38797;
+    public long l38798;
+    public long l38799;
+    public long l38800;
+    public long l38801;
+    public long l38802;
+    public long l38803;
+    public long l38804;
+    public long l38805;
+    public long l38806;
+    public long l38807;
+    public long l38808;
+    public long l38809;
+    public long l38810;
+    public long l38811;
+    public long l38812;
+    public long l38813;
+    public long l38814;
+    public long l38815;
+    public long l38816;
+    public long l38817;
+    public long l38818;
+    public long l38819;
+    public long l38820;
+    public long l38821;
+    public long l38822;
+    public long l38823;
+    public long l38824;
+    public long l38825;
+    public long l38826;
+    public long l38827;
+    public long l38828;
+    public long l38829;
+    public long l38830;
+    public long l38831;
+    public long l38832;
+    public long l38833;
+    public long l38834;
+    public long l38835;
+    public long l38836;
+    public long l38837;
+    public long l38838;
+    public long l38839;
+    public long l38840;
+    public long l38841;
+    public long l38842;
+    public long l38843;
+    public long l38844;
+    public long l38845;
+    public long l38846;
+    public long l38847;
+    public long l38848;
+    public long l38849;
+    public long l38850;
+    public long l38851;
+    public long l38852;
+    public long l38853;
+    public long l38854;
+    public long l38855;
+    public long l38856;
+    public long l38857;
+    public long l38858;
+    public long l38859;
+    public long l38860;
+    public long l38861;
+    public long l38862;
+    public long l38863;
+    public long l38864;
+    public long l38865;
+    public long l38866;
+    public long l38867;
+    public long l38868;
+    public long l38869;
+    public long l38870;
+    public long l38871;
+    public long l38872;
+    public long l38873;
+    public long l38874;
+    public long l38875;
+    public long l38876;
+    public long l38877;
+    public long l38878;
+    public long l38879;
+    public long l38880;
+    public long l38881;
+    public long l38882;
+    public long l38883;
+    public long l38884;
+    public long l38885;
+    public long l38886;
+    public long l38887;
+    public long l38888;
+    public long l38889;
+    public long l38890;
+    public long l38891;
+    public long l38892;
+    public long l38893;
+    public long l38894;
+    public long l38895;
+    public long l38896;
+    public long l38897;
+    public long l38898;
+    public long l38899;
+    public long l38900;
+    public long l38901;
+    public long l38902;
+    public long l38903;
+    public long l38904;
+    public long l38905;
+    public long l38906;
+    public long l38907;
+    public long l38908;
+    public long l38909;
+    public long l38910;
+    public long l38911;
+    public long l38912;
+    public long l38913;
+    public long l38914;
+    public long l38915;
+    public long l38916;
+    public long l38917;
+    public long l38918;
+    public long l38919;
+    public long l38920;
+    public long l38921;
+    public long l38922;
+    public long l38923;
+    public long l38924;
+    public long l38925;
+    public long l38926;
+    public long l38927;
+    public long l38928;
+    public long l38929;
+    public long l38930;
+    public long l38931;
+    public long l38932;
+    public long l38933;
+    public long l38934;
+    public long l38935;
+    public long l38936;
+    public long l38937;
+    public long l38938;
+    public long l38939;
+    public long l38940;
+    public long l38941;
+    public long l38942;
+    public long l38943;
+    public long l38944;
+    public long l38945;
+    public long l38946;
+    public long l38947;
+    public long l38948;
+    public long l38949;
+    public long l38950;
+    public long l38951;
+    public long l38952;
+    public long l38953;
+    public long l38954;
+    public long l38955;
+    public long l38956;
+    public long l38957;
+    public long l38958;
+    public long l38959;
+    public long l38960;
+    public long l38961;
+    public long l38962;
+    public long l38963;
+    public long l38964;
+    public long l38965;
+    public long l38966;
+    public long l38967;
+    public long l38968;
+    public long l38969;
+    public long l38970;
+    public long l38971;
+    public long l38972;
+    public long l38973;
+    public long l38974;
+    public long l38975;
+    public long l38976;
+    public long l38977;
+    public long l38978;
+    public long l38979;
+    public long l38980;
+    public long l38981;
+    public long l38982;
+    public long l38983;
+    public long l38984;
+    public long l38985;
+    public long l38986;
+    public long l38987;
+    public long l38988;
+    public long l38989;
+    public long l38990;
+    public long l38991;
+    public long l38992;
+    public long l38993;
+    public long l38994;
+    public long l38995;
+    public long l38996;
+    public long l38997;
+    public long l38998;
+    public long l38999;
+    public long l39000;
+    public long l39001;
+    public long l39002;
+    public long l39003;
+    public long l39004;
+    public long l39005;
+    public long l39006;
+    public long l39007;
+    public long l39008;
+    public long l39009;
+    public long l39010;
+    public long l39011;
+    public long l39012;
+    public long l39013;
+    public long l39014;
+    public long l39015;
+    public long l39016;
+    public long l39017;
+    public long l39018;
+    public long l39019;
+    public long l39020;
+    public long l39021;
+    public long l39022;
+    public long l39023;
+    public long l39024;
+    public long l39025;
+    public long l39026;
+    public long l39027;
+    public long l39028;
+    public long l39029;
+    public long l39030;
+    public long l39031;
+    public long l39032;
+    public long l39033;
+    public long l39034;
+    public long l39035;
+    public long l39036;
+    public long l39037;
+    public long l39038;
+    public long l39039;
+    public long l39040;
+    public long l39041;
+    public long l39042;
+    public long l39043;
+    public long l39044;
+    public long l39045;
+    public long l39046;
+    public long l39047;
+    public long l39048;
+    public long l39049;
+    public long l39050;
+    public long l39051;
+    public long l39052;
+    public long l39053;
+    public long l39054;
+    public long l39055;
+    public long l39056;
+    public long l39057;
+    public long l39058;
+    public long l39059;
+    public long l39060;
+    public long l39061;
+    public long l39062;
+    public long l39063;
+    public long l39064;
+    public long l39065;
+    public long l39066;
+    public long l39067;
+    public long l39068;
+    public long l39069;
+    public long l39070;
+    public long l39071;
+    public long l39072;
+    public long l39073;
+    public long l39074;
+    public long l39075;
+    public long l39076;
+    public long l39077;
+    public long l39078;
+    public long l39079;
+    public long l39080;
+    public long l39081;
+    public long l39082;
+    public long l39083;
+    public long l39084;
+    public long l39085;
+    public long l39086;
+    public long l39087;
+    public long l39088;
+    public long l39089;
+    public long l39090;
+    public long l39091;
+    public long l39092;
+    public long l39093;
+    public long l39094;
+    public long l39095;
+    public long l39096;
+    public long l39097;
+    public long l39098;
+    public long l39099;
+    public long l39100;
+    public long l39101;
+    public long l39102;
+    public long l39103;
+    public long l39104;
+    public long l39105;
+    public long l39106;
+    public long l39107;
+    public long l39108;
+    public long l39109;
+    public long l39110;
+    public long l39111;
+    public long l39112;
+    public long l39113;
+    public long l39114;
+    public long l39115;
+    public long l39116;
+    public long l39117;
+    public long l39118;
+    public long l39119;
+    public long l39120;
+    public long l39121;
+    public long l39122;
+    public long l39123;
+    public long l39124;
+    public long l39125;
+    public long l39126;
+    public long l39127;
+    public long l39128;
+    public long l39129;
+    public long l39130;
+    public long l39131;
+    public long l39132;
+    public long l39133;
+    public long l39134;
+    public long l39135;
+    public long l39136;
+    public long l39137;
+    public long l39138;
+    public long l39139;
+    public long l39140;
+    public long l39141;
+    public long l39142;
+    public long l39143;
+    public long l39144;
+    public long l39145;
+    public long l39146;
+    public long l39147;
+    public long l39148;
+    public long l39149;
+    public long l39150;
+    public long l39151;
+    public long l39152;
+    public long l39153;
+    public long l39154;
+    public long l39155;
+    public long l39156;
+    public long l39157;
+    public long l39158;
+    public long l39159;
+    public long l39160;
+    public long l39161;
+    public long l39162;
+    public long l39163;
+    public long l39164;
+    public long l39165;
+    public long l39166;
+    public long l39167;
+    public long l39168;
+    public long l39169;
+    public long l39170;
+    public long l39171;
+    public long l39172;
+    public long l39173;
+    public long l39174;
+    public long l39175;
+    public long l39176;
+    public long l39177;
+    public long l39178;
+    public long l39179;
+    public long l39180;
+    public long l39181;
+    public long l39182;
+    public long l39183;
+    public long l39184;
+    public long l39185;
+    public long l39186;
+    public long l39187;
+    public long l39188;
+    public long l39189;
+    public long l39190;
+    public long l39191;
+    public long l39192;
+    public long l39193;
+    public long l39194;
+    public long l39195;
+    public long l39196;
+    public long l39197;
+    public long l39198;
+    public long l39199;
+    public long l39200;
+    public long l39201;
+    public long l39202;
+    public long l39203;
+    public long l39204;
+    public long l39205;
+    public long l39206;
+    public long l39207;
+    public long l39208;
+    public long l39209;
+    public long l39210;
+    public long l39211;
+    public long l39212;
+    public long l39213;
+    public long l39214;
+    public long l39215;
+    public long l39216;
+    public long l39217;
+    public long l39218;
+    public long l39219;
+    public long l39220;
+    public long l39221;
+    public long l39222;
+    public long l39223;
+    public long l39224;
+    public long l39225;
+    public long l39226;
+    public long l39227;
+    public long l39228;
+    public long l39229;
+    public long l39230;
+    public long l39231;
+    public long l39232;
+    public long l39233;
+    public long l39234;
+    public long l39235;
+    public long l39236;
+    public long l39237;
+    public long l39238;
+    public long l39239;
+    public long l39240;
+    public long l39241;
+    public long l39242;
+    public long l39243;
+    public long l39244;
+    public long l39245;
+    public long l39246;
+    public long l39247;
+    public long l39248;
+    public long l39249;
+    public long l39250;
+    public long l39251;
+    public long l39252;
+    public long l39253;
+    public long l39254;
+    public long l39255;
+    public long l39256;
+    public long l39257;
+    public long l39258;
+    public long l39259;
+    public long l39260;
+    public long l39261;
+    public long l39262;
+    public long l39263;
+    public long l39264;
+    public long l39265;
+    public long l39266;
+    public long l39267;
+    public long l39268;
+    public long l39269;
+    public long l39270;
+    public long l39271;
+    public long l39272;
+    public long l39273;
+    public long l39274;
+    public long l39275;
+    public long l39276;
+    public long l39277;
+    public long l39278;
+    public long l39279;
+    public long l39280;
+    public long l39281;
+    public long l39282;
+    public long l39283;
+    public long l39284;
+    public long l39285;
+    public long l39286;
+    public long l39287;
+    public long l39288;
+    public long l39289;
+    public long l39290;
+    public long l39291;
+    public long l39292;
+    public long l39293;
+    public long l39294;
+    public long l39295;
+    public long l39296;
+    public long l39297;
+    public long l39298;
+    public long l39299;
+    public long l39300;
+    public long l39301;
+    public long l39302;
+    public long l39303;
+    public long l39304;
+    public long l39305;
+    public long l39306;
+    public long l39307;
+    public long l39308;
+    public long l39309;
+    public long l39310;
+    public long l39311;
+    public long l39312;
+    public long l39313;
+    public long l39314;
+    public long l39315;
+    public long l39316;
+    public long l39317;
+    public long l39318;
+    public long l39319;
+    public long l39320;
+    public long l39321;
+    public long l39322;
+    public long l39323;
+    public long l39324;
+    public long l39325;
+    public long l39326;
+    public long l39327;
+    public long l39328;
+    public long l39329;
+    public long l39330;
+    public long l39331;
+    public long l39332;
+    public long l39333;
+    public long l39334;
+    public long l39335;
+    public long l39336;
+    public long l39337;
+    public long l39338;
+    public long l39339;
+    public long l39340;
+    public long l39341;
+    public long l39342;
+    public long l39343;
+    public long l39344;
+    public long l39345;
+    public long l39346;
+    public long l39347;
+    public long l39348;
+    public long l39349;
+    public long l39350;
+    public long l39351;
+    public long l39352;
+    public long l39353;
+    public long l39354;
+    public long l39355;
+    public long l39356;
+    public long l39357;
+    public long l39358;
+    public long l39359;
+    public long l39360;
+    public long l39361;
+    public long l39362;
+    public long l39363;
+    public long l39364;
+    public long l39365;
+    public long l39366;
+    public long l39367;
+    public long l39368;
+    public long l39369;
+    public long l39370;
+    public long l39371;
+    public long l39372;
+    public long l39373;
+    public long l39374;
+    public long l39375;
+    public long l39376;
+    public long l39377;
+    public long l39378;
+    public long l39379;
+    public long l39380;
+    public long l39381;
+    public long l39382;
+    public long l39383;
+    public long l39384;
+    public long l39385;
+    public long l39386;
+    public long l39387;
+    public long l39388;
+    public long l39389;
+    public long l39390;
+    public long l39391;
+    public long l39392;
+    public long l39393;
+    public long l39394;
+    public long l39395;
+    public long l39396;
+    public long l39397;
+    public long l39398;
+    public long l39399;
+    public long l39400;
+    public long l39401;
+    public long l39402;
+    public long l39403;
+    public long l39404;
+    public long l39405;
+    public long l39406;
+    public long l39407;
+    public long l39408;
+    public long l39409;
+    public long l39410;
+    public long l39411;
+    public long l39412;
+    public long l39413;
+    public long l39414;
+    public long l39415;
+    public long l39416;
+    public long l39417;
+    public long l39418;
+    public long l39419;
+    public long l39420;
+    public long l39421;
+    public long l39422;
+    public long l39423;
+    public long l39424;
+    public long l39425;
+    public long l39426;
+    public long l39427;
+    public long l39428;
+    public long l39429;
+    public long l39430;
+    public long l39431;
+    public long l39432;
+    public long l39433;
+    public long l39434;
+    public long l39435;
+    public long l39436;
+    public long l39437;
+    public long l39438;
+    public long l39439;
+    public long l39440;
+    public long l39441;
+    public long l39442;
+    public long l39443;
+    public long l39444;
+    public long l39445;
+    public long l39446;
+    public long l39447;
+    public long l39448;
+    public long l39449;
+    public long l39450;
+    public long l39451;
+    public long l39452;
+    public long l39453;
+    public long l39454;
+    public long l39455;
+    public long l39456;
+    public long l39457;
+    public long l39458;
+    public long l39459;
+    public long l39460;
+    public long l39461;
+    public long l39462;
+    public long l39463;
+    public long l39464;
+    public long l39465;
+    public long l39466;
+    public long l39467;
+    public long l39468;
+    public long l39469;
+    public long l39470;
+    public long l39471;
+    public long l39472;
+    public long l39473;
+    public long l39474;
+    public long l39475;
+    public long l39476;
+    public long l39477;
+    public long l39478;
+    public long l39479;
+    public long l39480;
+    public long l39481;
+    public long l39482;
+    public long l39483;
+    public long l39484;
+    public long l39485;
+    public long l39486;
+    public long l39487;
+    public long l39488;
+    public long l39489;
+    public long l39490;
+    public long l39491;
+    public long l39492;
+    public long l39493;
+    public long l39494;
+    public long l39495;
+    public long l39496;
+    public long l39497;
+    public long l39498;
+    public long l39499;
+    public long l39500;
+    public long l39501;
+    public long l39502;
+    public long l39503;
+    public long l39504;
+    public long l39505;
+    public long l39506;
+    public long l39507;
+    public long l39508;
+    public long l39509;
+    public long l39510;
+    public long l39511;
+    public long l39512;
+    public long l39513;
+    public long l39514;
+    public long l39515;
+    public long l39516;
+    public long l39517;
+    public long l39518;
+    public long l39519;
+    public long l39520;
+    public long l39521;
+    public long l39522;
+    public long l39523;
+    public long l39524;
+    public long l39525;
+    public long l39526;
+    public long l39527;
+    public long l39528;
+    public long l39529;
+    public long l39530;
+    public long l39531;
+    public long l39532;
+    public long l39533;
+    public long l39534;
+    public long l39535;
+    public long l39536;
+    public long l39537;
+    public long l39538;
+    public long l39539;
+    public long l39540;
+    public long l39541;
+    public long l39542;
+    public long l39543;
+    public long l39544;
+    public long l39545;
+    public long l39546;
+    public long l39547;
+    public long l39548;
+    public long l39549;
+    public long l39550;
+    public long l39551;
+    public long l39552;
+    public long l39553;
+    public long l39554;
+    public long l39555;
+    public long l39556;
+    public long l39557;
+    public long l39558;
+    public long l39559;
+    public long l39560;
+    public long l39561;
+    public long l39562;
+    public long l39563;
+    public long l39564;
+    public long l39565;
+    public long l39566;
+    public long l39567;
+    public long l39568;
+    public long l39569;
+    public long l39570;
+    public long l39571;
+    public long l39572;
+    public long l39573;
+    public long l39574;
+    public long l39575;
+    public long l39576;
+    public long l39577;
+    public long l39578;
+    public long l39579;
+    public long l39580;
+    public long l39581;
+    public long l39582;
+    public long l39583;
+    public long l39584;
+    public long l39585;
+    public long l39586;
+    public long l39587;
+    public long l39588;
+    public long l39589;
+    public long l39590;
+    public long l39591;
+    public long l39592;
+    public long l39593;
+    public long l39594;
+    public long l39595;
+    public long l39596;
+    public long l39597;
+    public long l39598;
+    public long l39599;
+    public long l39600;
+    public long l39601;
+    public long l39602;
+    public long l39603;
+    public long l39604;
+    public long l39605;
+    public long l39606;
+    public long l39607;
+    public long l39608;
+    public long l39609;
+    public long l39610;
+    public long l39611;
+    public long l39612;
+    public long l39613;
+    public long l39614;
+    public long l39615;
+    public long l39616;
+    public long l39617;
+    public long l39618;
+    public long l39619;
+    public long l39620;
+    public long l39621;
+    public long l39622;
+    public long l39623;
+    public long l39624;
+    public long l39625;
+    public long l39626;
+    public long l39627;
+    public long l39628;
+    public long l39629;
+    public long l39630;
+    public long l39631;
+    public long l39632;
+    public long l39633;
+    public long l39634;
+    public long l39635;
+    public long l39636;
+    public long l39637;
+    public long l39638;
+    public long l39639;
+    public long l39640;
+    public long l39641;
+    public long l39642;
+    public long l39643;
+    public long l39644;
+    public long l39645;
+    public long l39646;
+    public long l39647;
+    public long l39648;
+    public long l39649;
+    public long l39650;
+    public long l39651;
+    public long l39652;
+    public long l39653;
+    public long l39654;
+    public long l39655;
+    public long l39656;
+    public long l39657;
+    public long l39658;
+    public long l39659;
+    public long l39660;
+    public long l39661;
+    public long l39662;
+    public long l39663;
+    public long l39664;
+    public long l39665;
+    public long l39666;
+    public long l39667;
+    public long l39668;
+    public long l39669;
+    public long l39670;
+    public long l39671;
+    public long l39672;
+    public long l39673;
+    public long l39674;
+    public long l39675;
+    public long l39676;
+    public long l39677;
+    public long l39678;
+    public long l39679;
+    public long l39680;
+    public long l39681;
+    public long l39682;
+    public long l39683;
+    public long l39684;
+    public long l39685;
+    public long l39686;
+    public long l39687;
+    public long l39688;
+    public long l39689;
+    public long l39690;
+    public long l39691;
+    public long l39692;
+    public long l39693;
+    public long l39694;
+    public long l39695;
+    public long l39696;
+    public long l39697;
+    public long l39698;
+    public long l39699;
+    public long l39700;
+    public long l39701;
+    public long l39702;
+    public long l39703;
+    public long l39704;
+    public long l39705;
+    public long l39706;
+    public long l39707;
+    public long l39708;
+    public long l39709;
+    public long l39710;
+    public long l39711;
+    public long l39712;
+    public long l39713;
+    public long l39714;
+    public long l39715;
+    public long l39716;
+    public long l39717;
+    public long l39718;
+    public long l39719;
+    public long l39720;
+    public long l39721;
+    public long l39722;
+    public long l39723;
+    public long l39724;
+    public long l39725;
+    public long l39726;
+    public long l39727;
+    public long l39728;
+    public long l39729;
+    public long l39730;
+    public long l39731;
+    public long l39732;
+    public long l39733;
+    public long l39734;
+    public long l39735;
+    public long l39736;
+    public long l39737;
+    public long l39738;
+    public long l39739;
+    public long l39740;
+    public long l39741;
+    public long l39742;
+    public long l39743;
+    public long l39744;
+    public long l39745;
+    public long l39746;
+    public long l39747;
+    public long l39748;
+    public long l39749;
+    public long l39750;
+    public long l39751;
+    public long l39752;
+    public long l39753;
+    public long l39754;
+    public long l39755;
+    public long l39756;
+    public long l39757;
+    public long l39758;
+    public long l39759;
+    public long l39760;
+    public long l39761;
+    public long l39762;
+    public long l39763;
+    public long l39764;
+    public long l39765;
+    public long l39766;
+    public long l39767;
+    public long l39768;
+    public long l39769;
+    public long l39770;
+    public long l39771;
+    public long l39772;
+    public long l39773;
+    public long l39774;
+    public long l39775;
+    public long l39776;
+    public long l39777;
+    public long l39778;
+    public long l39779;
+    public long l39780;
+    public long l39781;
+    public long l39782;
+    public long l39783;
+    public long l39784;
+    public long l39785;
+    public long l39786;
+    public long l39787;
+    public long l39788;
+    public long l39789;
+    public long l39790;
+    public long l39791;
+    public long l39792;
+    public long l39793;
+    public long l39794;
+    public long l39795;
+    public long l39796;
+    public long l39797;
+    public long l39798;
+    public long l39799;
+    public long l39800;
+    public long l39801;
+    public long l39802;
+    public long l39803;
+    public long l39804;
+    public long l39805;
+    public long l39806;
+    public long l39807;
+    public long l39808;
+    public long l39809;
+    public long l39810;
+    public long l39811;
+    public long l39812;
+    public long l39813;
+    public long l39814;
+    public long l39815;
+    public long l39816;
+    public long l39817;
+    public long l39818;
+    public long l39819;
+    public long l39820;
+    public long l39821;
+    public long l39822;
+    public long l39823;
+    public long l39824;
+    public long l39825;
+    public long l39826;
+    public long l39827;
+    public long l39828;
+    public long l39829;
+    public long l39830;
+    public long l39831;
+    public long l39832;
+    public long l39833;
+    public long l39834;
+    public long l39835;
+    public long l39836;
+    public long l39837;
+    public long l39838;
+    public long l39839;
+    public long l39840;
+    public long l39841;
+    public long l39842;
+    public long l39843;
+    public long l39844;
+    public long l39845;
+    public long l39846;
+    public long l39847;
+    public long l39848;
+    public long l39849;
+    public long l39850;
+    public long l39851;
+    public long l39852;
+    public long l39853;
+    public long l39854;
+    public long l39855;
+    public long l39856;
+    public long l39857;
+    public long l39858;
+    public long l39859;
+    public long l39860;
+    public long l39861;
+    public long l39862;
+    public long l39863;
+    public long l39864;
+    public long l39865;
+    public long l39866;
+    public long l39867;
+    public long l39868;
+    public long l39869;
+    public long l39870;
+    public long l39871;
+    public long l39872;
+    public long l39873;
+    public long l39874;
+    public long l39875;
+    public long l39876;
+    public long l39877;
+    public long l39878;
+    public long l39879;
+    public long l39880;
+    public long l39881;
+    public long l39882;
+    public long l39883;
+    public long l39884;
+    public long l39885;
+    public long l39886;
+    public long l39887;
+    public long l39888;
+    public long l39889;
+    public long l39890;
+    public long l39891;
+    public long l39892;
+    public long l39893;
+    public long l39894;
+    public long l39895;
+    public long l39896;
+    public long l39897;
+    public long l39898;
+    public long l39899;
+    public long l39900;
+    public long l39901;
+    public long l39902;
+    public long l39903;
+    public long l39904;
+    public long l39905;
+    public long l39906;
+    public long l39907;
+    public long l39908;
+    public long l39909;
+    public long l39910;
+    public long l39911;
+    public long l39912;
+    public long l39913;
+    public long l39914;
+    public long l39915;
+    public long l39916;
+    public long l39917;
+    public long l39918;
+    public long l39919;
+    public long l39920;
+    public long l39921;
+    public long l39922;
+    public long l39923;
+    public long l39924;
+    public long l39925;
+    public long l39926;
+    public long l39927;
+    public long l39928;
+    public long l39929;
+    public long l39930;
+    public long l39931;
+    public long l39932;
+    public long l39933;
+    public long l39934;
+    public long l39935;
+    public long l39936;
+    public long l39937;
+    public long l39938;
+    public long l39939;
+    public long l39940;
+    public long l39941;
+    public long l39942;
+    public long l39943;
+    public long l39944;
+    public long l39945;
+    public long l39946;
+    public long l39947;
+    public long l39948;
+    public long l39949;
+    public long l39950;
+    public long l39951;
+    public long l39952;
+    public long l39953;
+    public long l39954;
+    public long l39955;
+    public long l39956;
+    public long l39957;
+    public long l39958;
+    public long l39959;
+    public long l39960;
+    public long l39961;
+    public long l39962;
+    public long l39963;
+    public long l39964;
+    public long l39965;
+    public long l39966;
+    public long l39967;
+    public long l39968;
+    public long l39969;
+    public long l39970;
+    public long l39971;
+    public long l39972;
+    public long l39973;
+    public long l39974;
+    public long l39975;
+    public long l39976;
+    public long l39977;
+    public long l39978;
+    public long l39979;
+    public long l39980;
+    public long l39981;
+    public long l39982;
+    public long l39983;
+    public long l39984;
+    public long l39985;
+    public long l39986;
+    public long l39987;
+    public long l39988;
+    public long l39989;
+    public long l39990;
+    public long l39991;
+    public long l39992;
+    public long l39993;
+    public long l39994;
+    public long l39995;
+    public long l39996;
+    public long l39997;
+    public long l39998;
+    public long l39999;
+    public long l40000;
+    public long l40001;
+    public long l40002;
+    public long l40003;
+    public long l40004;
+    public long l40005;
+    public long l40006;
+    public long l40007;
+    public long l40008;
+    public long l40009;
+    public long l40010;
+    public long l40011;
+    public long l40012;
+    public long l40013;
+    public long l40014;
+    public long l40015;
+    public long l40016;
+    public long l40017;
+    public long l40018;
+    public long l40019;
+    public long l40020;
+    public long l40021;
+    public long l40022;
+    public long l40023;
+    public long l40024;
+    public long l40025;
+    public long l40026;
+    public long l40027;
+    public long l40028;
+    public long l40029;
+    public long l40030;
+    public long l40031;
+    public long l40032;
+    public long l40033;
+    public long l40034;
+    public long l40035;
+    public long l40036;
+    public long l40037;
+    public long l40038;
+    public long l40039;
+    public long l40040;
+    public long l40041;
+    public long l40042;
+    public long l40043;
+    public long l40044;
+    public long l40045;
+    public long l40046;
+    public long l40047;
+    public long l40048;
+    public long l40049;
+    public long l40050;
+    public long l40051;
+    public long l40052;
+    public long l40053;
+    public long l40054;
+    public long l40055;
+    public long l40056;
+    public long l40057;
+    public long l40058;
+    public long l40059;
+    public long l40060;
+    public long l40061;
+    public long l40062;
+    public long l40063;
+    public long l40064;
+    public long l40065;
+    public long l40066;
+    public long l40067;
+    public long l40068;
+    public long l40069;
+    public long l40070;
+    public long l40071;
+    public long l40072;
+    public long l40073;
+    public long l40074;
+    public long l40075;
+    public long l40076;
+    public long l40077;
+    public long l40078;
+    public long l40079;
+    public long l40080;
+    public long l40081;
+    public long l40082;
+    public long l40083;
+    public long l40084;
+    public long l40085;
+    public long l40086;
+    public long l40087;
+    public long l40088;
+    public long l40089;
+    public long l40090;
+    public long l40091;
+    public long l40092;
+    public long l40093;
+    public long l40094;
+    public long l40095;
+    public long l40096;
+    public long l40097;
+    public long l40098;
+    public long l40099;
+    public long l40100;
+    public long l40101;
+    public long l40102;
+    public long l40103;
+    public long l40104;
+    public long l40105;
+    public long l40106;
+    public long l40107;
+    public long l40108;
+    public long l40109;
+    public long l40110;
+    public long l40111;
+    public long l40112;
+    public long l40113;
+    public long l40114;
+    public long l40115;
+    public long l40116;
+    public long l40117;
+    public long l40118;
+    public long l40119;
+    public long l40120;
+    public long l40121;
+    public long l40122;
+    public long l40123;
+    public long l40124;
+    public long l40125;
+    public long l40126;
+    public long l40127;
+    public long l40128;
+    public long l40129;
+    public long l40130;
+    public long l40131;
+    public long l40132;
+    public long l40133;
+    public long l40134;
+    public long l40135;
+    public long l40136;
+    public long l40137;
+    public long l40138;
+    public long l40139;
+    public long l40140;
+    public long l40141;
+    public long l40142;
+    public long l40143;
+    public long l40144;
+    public long l40145;
+    public long l40146;
+    public long l40147;
+    public long l40148;
+    public long l40149;
+    public long l40150;
+    public long l40151;
+    public long l40152;
+    public long l40153;
+    public long l40154;
+    public long l40155;
+    public long l40156;
+    public long l40157;
+    public long l40158;
+    public long l40159;
+    public long l40160;
+    public long l40161;
+    public long l40162;
+    public long l40163;
+    public long l40164;
+    public long l40165;
+    public long l40166;
+    public long l40167;
+    public long l40168;
+    public long l40169;
+    public long l40170;
+    public long l40171;
+    public long l40172;
+    public long l40173;
+    public long l40174;
+    public long l40175;
+    public long l40176;
+    public long l40177;
+    public long l40178;
+    public long l40179;
+    public long l40180;
+    public long l40181;
+    public long l40182;
+    public long l40183;
+    public long l40184;
+    public long l40185;
+    public long l40186;
+    public long l40187;
+    public long l40188;
+    public long l40189;
+    public long l40190;
+    public long l40191;
+    public long l40192;
+    public long l40193;
+    public long l40194;
+    public long l40195;
+    public long l40196;
+    public long l40197;
+    public long l40198;
+    public long l40199;
+    public long l40200;
+    public long l40201;
+    public long l40202;
+    public long l40203;
+    public long l40204;
+    public long l40205;
+    public long l40206;
+    public long l40207;
+    public long l40208;
+    public long l40209;
+    public long l40210;
+    public long l40211;
+    public long l40212;
+    public long l40213;
+    public long l40214;
+    public long l40215;
+    public long l40216;
+    public long l40217;
+    public long l40218;
+    public long l40219;
+    public long l40220;
+    public long l40221;
+    public long l40222;
+    public long l40223;
+    public long l40224;
+    public long l40225;
+    public long l40226;
+    public long l40227;
+    public long l40228;
+    public long l40229;
+    public long l40230;
+    public long l40231;
+    public long l40232;
+    public long l40233;
+    public long l40234;
+    public long l40235;
+    public long l40236;
+    public long l40237;
+    public long l40238;
+    public long l40239;
+    public long l40240;
+    public long l40241;
+    public long l40242;
+    public long l40243;
+    public long l40244;
+    public long l40245;
+    public long l40246;
+    public long l40247;
+    public long l40248;
+    public long l40249;
+    public long l40250;
+    public long l40251;
+    public long l40252;
+    public long l40253;
+    public long l40254;
+    public long l40255;
+    public long l40256;
+    public long l40257;
+    public long l40258;
+    public long l40259;
+    public long l40260;
+    public long l40261;
+    public long l40262;
+    public long l40263;
+    public long l40264;
+    public long l40265;
+    public long l40266;
+    public long l40267;
+    public long l40268;
+    public long l40269;
+    public long l40270;
+    public long l40271;
+    public long l40272;
+    public long l40273;
+    public long l40274;
+    public long l40275;
+    public long l40276;
+    public long l40277;
+    public long l40278;
+    public long l40279;
+    public long l40280;
+    public long l40281;
+    public long l40282;
+    public long l40283;
+    public long l40284;
+    public long l40285;
+    public long l40286;
+    public long l40287;
+    public long l40288;
+    public long l40289;
+    public long l40290;
+    public long l40291;
+    public long l40292;
+    public long l40293;
+    public long l40294;
+    public long l40295;
+    public long l40296;
+    public long l40297;
+    public long l40298;
+    public long l40299;
+    public long l40300;
+    public long l40301;
+    public long l40302;
+    public long l40303;
+    public long l40304;
+    public long l40305;
+    public long l40306;
+    public long l40307;
+    public long l40308;
+    public long l40309;
+    public long l40310;
+    public long l40311;
+    public long l40312;
+    public long l40313;
+    public long l40314;
+    public long l40315;
+    public long l40316;
+    public long l40317;
+    public long l40318;
+    public long l40319;
+    public long l40320;
+    public long l40321;
+    public long l40322;
+    public long l40323;
+    public long l40324;
+    public long l40325;
+    public long l40326;
+    public long l40327;
+    public long l40328;
+    public long l40329;
+    public long l40330;
+    public long l40331;
+    public long l40332;
+    public long l40333;
+    public long l40334;
+    public long l40335;
+    public long l40336;
+    public long l40337;
+    public long l40338;
+    public long l40339;
+    public long l40340;
+    public long l40341;
+    public long l40342;
+    public long l40343;
+    public long l40344;
+    public long l40345;
+    public long l40346;
+    public long l40347;
+    public long l40348;
+    public long l40349;
+    public long l40350;
+    public long l40351;
+    public long l40352;
+    public long l40353;
+    public long l40354;
+    public long l40355;
+    public long l40356;
+    public long l40357;
+    public long l40358;
+    public long l40359;
+    public long l40360;
+    public long l40361;
+    public long l40362;
+    public long l40363;
+    public long l40364;
+    public long l40365;
+    public long l40366;
+    public long l40367;
+    public long l40368;
+    public long l40369;
+    public long l40370;
+    public long l40371;
+    public long l40372;
+    public long l40373;
+    public long l40374;
+    public long l40375;
+    public long l40376;
+    public long l40377;
+    public long l40378;
+    public long l40379;
+    public long l40380;
+    public long l40381;
+    public long l40382;
+    public long l40383;
+    public long l40384;
+    public long l40385;
+    public long l40386;
+    public long l40387;
+    public long l40388;
+    public long l40389;
+    public long l40390;
+    public long l40391;
+    public long l40392;
+    public long l40393;
+    public long l40394;
+    public long l40395;
+    public long l40396;
+    public long l40397;
+    public long l40398;
+    public long l40399;
+    public long l40400;
+    public long l40401;
+    public long l40402;
+    public long l40403;
+    public long l40404;
+    public long l40405;
+    public long l40406;
+    public long l40407;
+    public long l40408;
+    public long l40409;
+    public long l40410;
+    public long l40411;
+    public long l40412;
+    public long l40413;
+    public long l40414;
+    public long l40415;
+    public long l40416;
+    public long l40417;
+    public long l40418;
+    public long l40419;
+    public long l40420;
+    public long l40421;
+    public long l40422;
+    public long l40423;
+    public long l40424;
+    public long l40425;
+    public long l40426;
+    public long l40427;
+    public long l40428;
+    public long l40429;
+    public long l40430;
+    public long l40431;
+    public long l40432;
+    public long l40433;
+    public long l40434;
+    public long l40435;
+    public long l40436;
+    public long l40437;
+    public long l40438;
+    public long l40439;
+    public long l40440;
+    public long l40441;
+    public long l40442;
+    public long l40443;
+    public long l40444;
+    public long l40445;
+    public long l40446;
+    public long l40447;
+    public long l40448;
+    public long l40449;
+    public long l40450;
+    public long l40451;
+    public long l40452;
+    public long l40453;
+    public long l40454;
+    public long l40455;
+    public long l40456;
+    public long l40457;
+    public long l40458;
+    public long l40459;
+    public long l40460;
+    public long l40461;
+    public long l40462;
+    public long l40463;
+    public long l40464;
+    public long l40465;
+    public long l40466;
+    public long l40467;
+    public long l40468;
+    public long l40469;
+    public long l40470;
+    public long l40471;
+    public long l40472;
+    public long l40473;
+    public long l40474;
+    public long l40475;
+    public long l40476;
+    public long l40477;
+    public long l40478;
+    public long l40479;
+    public long l40480;
+    public long l40481;
+    public long l40482;
+    public long l40483;
+    public long l40484;
+    public long l40485;
+    public long l40486;
+    public long l40487;
+    public long l40488;
+    public long l40489;
+    public long l40490;
+    public long l40491;
+    public long l40492;
+    public long l40493;
+    public long l40494;
+    public long l40495;
+    public long l40496;
+    public long l40497;
+    public long l40498;
+    public long l40499;
+    public long l40500;
+    public long l40501;
+    public long l40502;
+    public long l40503;
+    public long l40504;
+    public long l40505;
+    public long l40506;
+    public long l40507;
+    public long l40508;
+    public long l40509;
+    public long l40510;
+    public long l40511;
+    public long l40512;
+    public long l40513;
+    public long l40514;
+    public long l40515;
+    public long l40516;
+    public long l40517;
+    public long l40518;
+    public long l40519;
+    public long l40520;
+    public long l40521;
+    public long l40522;
+    public long l40523;
+    public long l40524;
+    public long l40525;
+    public long l40526;
+    public long l40527;
+    public long l40528;
+    public long l40529;
+    public long l40530;
+    public long l40531;
+    public long l40532;
+    public long l40533;
+    public long l40534;
+    public long l40535;
+    public long l40536;
+    public long l40537;
+    public long l40538;
+    public long l40539;
+    public long l40540;
+    public long l40541;
+    public long l40542;
+    public long l40543;
+    public long l40544;
+    public long l40545;
+    public long l40546;
+    public long l40547;
+    public long l40548;
+    public long l40549;
+    public long l40550;
+    public long l40551;
+    public long l40552;
+    public long l40553;
+    public long l40554;
+    public long l40555;
+    public long l40556;
+    public long l40557;
+    public long l40558;
+    public long l40559;
+    public long l40560;
+    public long l40561;
+    public long l40562;
+    public long l40563;
+    public long l40564;
+    public long l40565;
+    public long l40566;
+    public long l40567;
+    public long l40568;
+    public long l40569;
+    public long l40570;
+    public long l40571;
+    public long l40572;
+    public long l40573;
+    public long l40574;
+    public long l40575;
+    public long l40576;
+    public long l40577;
+    public long l40578;
+    public long l40579;
+    public long l40580;
+    public long l40581;
+    public long l40582;
+    public long l40583;
+    public long l40584;
+    public long l40585;
+    public long l40586;
+    public long l40587;
+    public long l40588;
+    public long l40589;
+    public long l40590;
+    public long l40591;
+    public long l40592;
+    public long l40593;
+    public long l40594;
+    public long l40595;
+    public long l40596;
+    public long l40597;
+    public long l40598;
+    public long l40599;
+    public long l40600;
+    public long l40601;
+    public long l40602;
+    public long l40603;
+    public long l40604;
+    public long l40605;
+    public long l40606;
+    public long l40607;
+    public long l40608;
+    public long l40609;
+    public long l40610;
+    public long l40611;
+    public long l40612;
+    public long l40613;
+    public long l40614;
+    public long l40615;
+    public long l40616;
+    public long l40617;
+    public long l40618;
+    public long l40619;
+    public long l40620;
+    public long l40621;
+    public long l40622;
+    public long l40623;
+    public long l40624;
+    public long l40625;
+    public long l40626;
+    public long l40627;
+    public long l40628;
+    public long l40629;
+    public long l40630;
+    public long l40631;
+    public long l40632;
+    public long l40633;
+    public long l40634;
+    public long l40635;
+    public long l40636;
+    public long l40637;
+    public long l40638;
+    public long l40639;
+    public long l40640;
+    public long l40641;
+    public long l40642;
+    public long l40643;
+    public long l40644;
+    public long l40645;
+    public long l40646;
+    public long l40647;
+    public long l40648;
+    public long l40649;
+    public long l40650;
+    public long l40651;
+    public long l40652;
+    public long l40653;
+    public long l40654;
+    public long l40655;
+    public long l40656;
+    public long l40657;
+    public long l40658;
+    public long l40659;
+    public long l40660;
+    public long l40661;
+    public long l40662;
+    public long l40663;
+    public long l40664;
+    public long l40665;
+    public long l40666;
+    public long l40667;
+    public long l40668;
+    public long l40669;
+    public long l40670;
+    public long l40671;
+    public long l40672;
+    public long l40673;
+    public long l40674;
+    public long l40675;
+    public long l40676;
+    public long l40677;
+    public long l40678;
+    public long l40679;
+    public long l40680;
+    public long l40681;
+    public long l40682;
+    public long l40683;
+    public long l40684;
+    public long l40685;
+    public long l40686;
+    public long l40687;
+    public long l40688;
+    public long l40689;
+    public long l40690;
+    public long l40691;
+    public long l40692;
+    public long l40693;
+    public long l40694;
+    public long l40695;
+    public long l40696;
+    public long l40697;
+    public long l40698;
+    public long l40699;
+    public long l40700;
+    public long l40701;
+    public long l40702;
+    public long l40703;
+    public long l40704;
+    public long l40705;
+    public long l40706;
+    public long l40707;
+    public long l40708;
+    public long l40709;
+    public long l40710;
+    public long l40711;
+    public long l40712;
+    public long l40713;
+    public long l40714;
+    public long l40715;
+    public long l40716;
+    public long l40717;
+    public long l40718;
+    public long l40719;
+    public long l40720;
+    public long l40721;
+    public long l40722;
+    public long l40723;
+    public long l40724;
+    public long l40725;
+    public long l40726;
+    public long l40727;
+    public long l40728;
+    public long l40729;
+    public long l40730;
+    public long l40731;
+    public long l40732;
+    public long l40733;
+    public long l40734;
+    public long l40735;
+    public long l40736;
+    public long l40737;
+    public long l40738;
+    public long l40739;
+    public long l40740;
+    public long l40741;
+    public long l40742;
+    public long l40743;
+    public long l40744;
+    public long l40745;
+    public long l40746;
+    public long l40747;
+    public long l40748;
+    public long l40749;
+    public long l40750;
+    public long l40751;
+    public long l40752;
+    public long l40753;
+    public long l40754;
+    public long l40755;
+    public long l40756;
+    public long l40757;
+    public long l40758;
+    public long l40759;
+    public long l40760;
+    public long l40761;
+    public long l40762;
+    public long l40763;
+    public long l40764;
+    public long l40765;
+    public long l40766;
+    public long l40767;
+    public long l40768;
+    public long l40769;
+    public long l40770;
+    public long l40771;
+    public long l40772;
+    public long l40773;
+    public long l40774;
+    public long l40775;
+    public long l40776;
+    public long l40777;
+    public long l40778;
+    public long l40779;
+    public long l40780;
+    public long l40781;
+    public long l40782;
+    public long l40783;
+    public long l40784;
+    public long l40785;
+    public long l40786;
+    public long l40787;
+    public long l40788;
+    public long l40789;
+    public long l40790;
+    public long l40791;
+    public long l40792;
+    public long l40793;
+    public long l40794;
+    public long l40795;
+    public long l40796;
+    public long l40797;
+    public long l40798;
+    public long l40799;
+    public long l40800;
+    public long l40801;
+    public long l40802;
+    public long l40803;
+    public long l40804;
+    public long l40805;
+    public long l40806;
+    public long l40807;
+    public long l40808;
+    public long l40809;
+    public long l40810;
+    public long l40811;
+    public long l40812;
+    public long l40813;
+    public long l40814;
+    public long l40815;
+    public long l40816;
+    public long l40817;
+    public long l40818;
+    public long l40819;
+    public long l40820;
+    public long l40821;
+    public long l40822;
+    public long l40823;
+    public long l40824;
+    public long l40825;
+    public long l40826;
+    public long l40827;
+    public long l40828;
+    public long l40829;
+    public long l40830;
+    public long l40831;
+    public long l40832;
+    public long l40833;
+    public long l40834;
+    public long l40835;
+    public long l40836;
+    public long l40837;
+    public long l40838;
+    public long l40839;
+    public long l40840;
+    public long l40841;
+    public long l40842;
+    public long l40843;
+    public long l40844;
+    public long l40845;
+    public long l40846;
+    public long l40847;
+    public long l40848;
+    public long l40849;
+    public long l40850;
+    public long l40851;
+    public long l40852;
+    public long l40853;
+    public long l40854;
+    public long l40855;
+    public long l40856;
+    public long l40857;
+    public long l40858;
+    public long l40859;
+    public long l40860;
+    public long l40861;
+    public long l40862;
+    public long l40863;
+    public long l40864;
+    public long l40865;
+    public long l40866;
+    public long l40867;
+    public long l40868;
+    public long l40869;
+    public long l40870;
+    public long l40871;
+    public long l40872;
+    public long l40873;
+    public long l40874;
+    public long l40875;
+    public long l40876;
+    public long l40877;
+    public long l40878;
+    public long l40879;
+    public long l40880;
+    public long l40881;
+    public long l40882;
+    public long l40883;
+    public long l40884;
+    public long l40885;
+    public long l40886;
+    public long l40887;
+    public long l40888;
+    public long l40889;
+    public long l40890;
+    public long l40891;
+    public long l40892;
+    public long l40893;
+    public long l40894;
+    public long l40895;
+    public long l40896;
+    public long l40897;
+    public long l40898;
+    public long l40899;
+    public long l40900;
+    public long l40901;
+    public long l40902;
+    public long l40903;
+    public long l40904;
+    public long l40905;
+    public long l40906;
+    public long l40907;
+    public long l40908;
+    public long l40909;
+    public long l40910;
+    public long l40911;
+    public long l40912;
+    public long l40913;
+    public long l40914;
+    public long l40915;
+    public long l40916;
+    public long l40917;
+    public long l40918;
+    public long l40919;
+    public long l40920;
+    public long l40921;
+    public long l40922;
+    public long l40923;
+    public long l40924;
+    public long l40925;
+    public long l40926;
+    public long l40927;
+    public long l40928;
+    public long l40929;
+    public long l40930;
+    public long l40931;
+    public long l40932;
+    public long l40933;
+    public long l40934;
+    public long l40935;
+    public long l40936;
+    public long l40937;
+    public long l40938;
+    public long l40939;
+    public long l40940;
+    public long l40941;
+    public long l40942;
+    public long l40943;
+    public long l40944;
+    public long l40945;
+    public long l40946;
+    public long l40947;
+    public long l40948;
+    public long l40949;
+    public long l40950;
+    public long l40951;
+    public long l40952;
+    public long l40953;
+    public long l40954;
+    public long l40955;
+    public long l40956;
+    public long l40957;
+    public long l40958;
+    public long l40959;
+    public long l40960;
+    public long l40961;
+    public long l40962;
+    public long l40963;
+    public long l40964;
+    public long l40965;
+    public long l40966;
+    public long l40967;
+    public long l40968;
+    public long l40969;
+    public long l40970;
+    public long l40971;
+    public long l40972;
+    public long l40973;
+    public long l40974;
+    public long l40975;
+    public long l40976;
+    public long l40977;
+    public long l40978;
+    public long l40979;
+    public long l40980;
+    public long l40981;
+    public long l40982;
+    public long l40983;
+    public long l40984;
+    public long l40985;
+    public long l40986;
+    public long l40987;
+    public long l40988;
+    public long l40989;
+    public long l40990;
+    public long l40991;
+    public long l40992;
+    public long l40993;
+    public long l40994;
+    public long l40995;
+    public long l40996;
+    public long l40997;
+    public long l40998;
+    public long l40999;
+    public long l41000;
+    public long l41001;
+    public long l41002;
+    public long l41003;
+    public long l41004;
+    public long l41005;
+    public long l41006;
+    public long l41007;
+    public long l41008;
+    public long l41009;
+    public long l41010;
+    public long l41011;
+    public long l41012;
+    public long l41013;
+    public long l41014;
+    public long l41015;
+    public long l41016;
+    public long l41017;
+    public long l41018;
+    public long l41019;
+    public long l41020;
+    public long l41021;
+    public long l41022;
+    public long l41023;
+    public long l41024;
+    public long l41025;
+    public long l41026;
+    public long l41027;
+    public long l41028;
+    public long l41029;
+    public long l41030;
+    public long l41031;
+    public long l41032;
+    public long l41033;
+    public long l41034;
+    public long l41035;
+    public long l41036;
+    public long l41037;
+    public long l41038;
+    public long l41039;
+    public long l41040;
+    public long l41041;
+    public long l41042;
+    public long l41043;
+    public long l41044;
+    public long l41045;
+    public long l41046;
+    public long l41047;
+    public long l41048;
+    public long l41049;
+    public long l41050;
+    public long l41051;
+    public long l41052;
+    public long l41053;
+    public long l41054;
+    public long l41055;
+    public long l41056;
+    public long l41057;
+    public long l41058;
+    public long l41059;
+    public long l41060;
+    public long l41061;
+    public long l41062;
+    public long l41063;
+    public long l41064;
+    public long l41065;
+    public long l41066;
+    public long l41067;
+    public long l41068;
+    public long l41069;
+    public long l41070;
+    public long l41071;
+    public long l41072;
+    public long l41073;
+    public long l41074;
+    public long l41075;
+    public long l41076;
+    public long l41077;
+    public long l41078;
+    public long l41079;
+    public long l41080;
+    public long l41081;
+    public long l41082;
+    public long l41083;
+    public long l41084;
+    public long l41085;
+    public long l41086;
+    public long l41087;
+    public long l41088;
+    public long l41089;
+    public long l41090;
+    public long l41091;
+    public long l41092;
+    public long l41093;
+    public long l41094;
+    public long l41095;
+    public long l41096;
+    public long l41097;
+    public long l41098;
+    public long l41099;
+    public long l41100;
+    public long l41101;
+    public long l41102;
+    public long l41103;
+    public long l41104;
+    public long l41105;
+    public long l41106;
+    public long l41107;
+    public long l41108;
+    public long l41109;
+    public long l41110;
+    public long l41111;
+    public long l41112;
+    public long l41113;
+    public long l41114;
+    public long l41115;
+    public long l41116;
+    public long l41117;
+    public long l41118;
+    public long l41119;
+    public long l41120;
+    public long l41121;
+    public long l41122;
+    public long l41123;
+    public long l41124;
+    public long l41125;
+    public long l41126;
+    public long l41127;
+    public long l41128;
+    public long l41129;
+    public long l41130;
+    public long l41131;
+    public long l41132;
+    public long l41133;
+    public long l41134;
+    public long l41135;
+    public long l41136;
+    public long l41137;
+    public long l41138;
+    public long l41139;
+    public long l41140;
+    public long l41141;
+    public long l41142;
+    public long l41143;
+    public long l41144;
+    public long l41145;
+    public long l41146;
+    public long l41147;
+    public long l41148;
+    public long l41149;
+    public long l41150;
+    public long l41151;
+    public long l41152;
+    public long l41153;
+    public long l41154;
+    public long l41155;
+    public long l41156;
+    public long l41157;
+    public long l41158;
+    public long l41159;
+    public long l41160;
+    public long l41161;
+    public long l41162;
+    public long l41163;
+    public long l41164;
+    public long l41165;
+    public long l41166;
+    public long l41167;
+    public long l41168;
+    public long l41169;
+    public long l41170;
+    public long l41171;
+    public long l41172;
+    public long l41173;
+    public long l41174;
+    public long l41175;
+    public long l41176;
+    public long l41177;
+    public long l41178;
+    public long l41179;
+    public long l41180;
+    public long l41181;
+    public long l41182;
+    public long l41183;
+    public long l41184;
+    public long l41185;
+    public long l41186;
+    public long l41187;
+    public long l41188;
+    public long l41189;
+    public long l41190;
+    public long l41191;
+    public long l41192;
+    public long l41193;
+    public long l41194;
+    public long l41195;
+    public long l41196;
+    public long l41197;
+    public long l41198;
+    public long l41199;
+    public long l41200;
+    public long l41201;
+    public long l41202;
+    public long l41203;
+    public long l41204;
+    public long l41205;
+    public long l41206;
+    public long l41207;
+    public long l41208;
+    public long l41209;
+    public long l41210;
+    public long l41211;
+    public long l41212;
+    public long l41213;
+    public long l41214;
+    public long l41215;
+    public long l41216;
+    public long l41217;
+    public long l41218;
+    public long l41219;
+    public long l41220;
+    public long l41221;
+    public long l41222;
+    public long l41223;
+    public long l41224;
+    public long l41225;
+    public long l41226;
+    public long l41227;
+    public long l41228;
+    public long l41229;
+    public long l41230;
+    public long l41231;
+    public long l41232;
+    public long l41233;
+    public long l41234;
+    public long l41235;
+    public long l41236;
+    public long l41237;
+    public long l41238;
+    public long l41239;
+    public long l41240;
+    public long l41241;
+    public long l41242;
+    public long l41243;
+    public long l41244;
+    public long l41245;
+    public long l41246;
+    public long l41247;
+    public long l41248;
+    public long l41249;
+    public long l41250;
+    public long l41251;
+    public long l41252;
+    public long l41253;
+    public long l41254;
+    public long l41255;
+    public long l41256;
+    public long l41257;
+    public long l41258;
+    public long l41259;
+    public long l41260;
+    public long l41261;
+    public long l41262;
+    public long l41263;
+    public long l41264;
+    public long l41265;
+    public long l41266;
+    public long l41267;
+    public long l41268;
+    public long l41269;
+    public long l41270;
+    public long l41271;
+    public long l41272;
+    public long l41273;
+    public long l41274;
+    public long l41275;
+    public long l41276;
+    public long l41277;
+    public long l41278;
+    public long l41279;
+    public long l41280;
+    public long l41281;
+    public long l41282;
+    public long l41283;
+    public long l41284;
+    public long l41285;
+    public long l41286;
+    public long l41287;
+    public long l41288;
+    public long l41289;
+    public long l41290;
+    public long l41291;
+    public long l41292;
+    public long l41293;
+    public long l41294;
+    public long l41295;
+    public long l41296;
+    public long l41297;
+    public long l41298;
+    public long l41299;
+    public long l41300;
+    public long l41301;
+    public long l41302;
+    public long l41303;
+    public long l41304;
+    public long l41305;
+    public long l41306;
+    public long l41307;
+    public long l41308;
+    public long l41309;
+    public long l41310;
+    public long l41311;
+    public long l41312;
+    public long l41313;
+    public long l41314;
+    public long l41315;
+    public long l41316;
+    public long l41317;
+    public long l41318;
+    public long l41319;
+    public long l41320;
+    public long l41321;
+    public long l41322;
+    public long l41323;
+    public long l41324;
+    public long l41325;
+    public long l41326;
+    public long l41327;
+    public long l41328;
+    public long l41329;
+    public long l41330;
+    public long l41331;
+    public long l41332;
+    public long l41333;
+    public long l41334;
+    public long l41335;
+    public long l41336;
+    public long l41337;
+    public long l41338;
+    public long l41339;
+    public long l41340;
+    public long l41341;
+    public long l41342;
+    public long l41343;
+    public long l41344;
+    public long l41345;
+    public long l41346;
+    public long l41347;
+    public long l41348;
+    public long l41349;
+    public long l41350;
+    public long l41351;
+    public long l41352;
+    public long l41353;
+    public long l41354;
+    public long l41355;
+    public long l41356;
+    public long l41357;
+    public long l41358;
+    public long l41359;
+    public long l41360;
+    public long l41361;
+    public long l41362;
+    public long l41363;
+    public long l41364;
+    public long l41365;
+    public long l41366;
+    public long l41367;
+    public long l41368;
+    public long l41369;
+    public long l41370;
+    public long l41371;
+    public long l41372;
+    public long l41373;
+    public long l41374;
+    public long l41375;
+    public long l41376;
+    public long l41377;
+    public long l41378;
+    public long l41379;
+    public long l41380;
+    public long l41381;
+    public long l41382;
+    public long l41383;
+    public long l41384;
+    public long l41385;
+    public long l41386;
+    public long l41387;
+    public long l41388;
+    public long l41389;
+    public long l41390;
+    public long l41391;
+    public long l41392;
+    public long l41393;
+    public long l41394;
+    public long l41395;
+    public long l41396;
+    public long l41397;
+    public long l41398;
+    public long l41399;
+    public long l41400;
+    public long l41401;
+    public long l41402;
+    public long l41403;
+    public long l41404;
+    public long l41405;
+    public long l41406;
+    public long l41407;
+    public long l41408;
+    public long l41409;
+    public long l41410;
+    public long l41411;
+    public long l41412;
+    public long l41413;
+    public long l41414;
+    public long l41415;
+    public long l41416;
+    public long l41417;
+    public long l41418;
+    public long l41419;
+    public long l41420;
+    public long l41421;
+    public long l41422;
+    public long l41423;
+    public long l41424;
+    public long l41425;
+    public long l41426;
+    public long l41427;
+    public long l41428;
+    public long l41429;
+    public long l41430;
+    public long l41431;
+    public long l41432;
+    public long l41433;
+    public long l41434;
+    public long l41435;
+    public long l41436;
+    public long l41437;
+    public long l41438;
+    public long l41439;
+    public long l41440;
+    public long l41441;
+    public long l41442;
+    public long l41443;
+    public long l41444;
+    public long l41445;
+    public long l41446;
+    public long l41447;
+    public long l41448;
+    public long l41449;
+    public long l41450;
+    public long l41451;
+    public long l41452;
+    public long l41453;
+    public long l41454;
+    public long l41455;
+    public long l41456;
+    public long l41457;
+    public long l41458;
+    public long l41459;
+    public long l41460;
+    public long l41461;
+    public long l41462;
+    public long l41463;
+    public long l41464;
+    public long l41465;
+    public long l41466;
+    public long l41467;
+    public long l41468;
+    public long l41469;
+    public long l41470;
+    public long l41471;
+    public long l41472;
+    public long l41473;
+    public long l41474;
+    public long l41475;
+    public long l41476;
+    public long l41477;
+    public long l41478;
+    public long l41479;
+    public long l41480;
+    public long l41481;
+    public long l41482;
+    public long l41483;
+    public long l41484;
+    public long l41485;
+    public long l41486;
+    public long l41487;
+    public long l41488;
+    public long l41489;
+    public long l41490;
+    public long l41491;
+    public long l41492;
+    public long l41493;
+    public long l41494;
+    public long l41495;
+    public long l41496;
+    public long l41497;
+    public long l41498;
+    public long l41499;
+    public long l41500;
+    public long l41501;
+    public long l41502;
+    public long l41503;
+    public long l41504;
+    public long l41505;
+    public long l41506;
+    public long l41507;
+    public long l41508;
+    public long l41509;
+    public long l41510;
+    public long l41511;
+    public long l41512;
+    public long l41513;
+    public long l41514;
+    public long l41515;
+    public long l41516;
+    public long l41517;
+    public long l41518;
+    public long l41519;
+    public long l41520;
+    public long l41521;
+    public long l41522;
+    public long l41523;
+    public long l41524;
+    public long l41525;
+    public long l41526;
+    public long l41527;
+    public long l41528;
+    public long l41529;
+    public long l41530;
+    public long l41531;
+    public long l41532;
+    public long l41533;
+    public long l41534;
+    public long l41535;
+    public long l41536;
+    public long l41537;
+    public long l41538;
+    public long l41539;
+    public long l41540;
+    public long l41541;
+    public long l41542;
+    public long l41543;
+    public long l41544;
+    public long l41545;
+    public long l41546;
+    public long l41547;
+    public long l41548;
+    public long l41549;
+    public long l41550;
+    public long l41551;
+    public long l41552;
+    public long l41553;
+    public long l41554;
+    public long l41555;
+    public long l41556;
+    public long l41557;
+    public long l41558;
+    public long l41559;
+    public long l41560;
+    public long l41561;
+    public long l41562;
+    public long l41563;
+    public long l41564;
+    public long l41565;
+    public long l41566;
+    public long l41567;
+    public long l41568;
+    public long l41569;
+    public long l41570;
+    public long l41571;
+    public long l41572;
+    public long l41573;
+    public long l41574;
+    public long l41575;
+    public long l41576;
+    public long l41577;
+    public long l41578;
+    public long l41579;
+    public long l41580;
+    public long l41581;
+    public long l41582;
+    public long l41583;
+    public long l41584;
+    public long l41585;
+    public long l41586;
+    public long l41587;
+    public long l41588;
+    public long l41589;
+    public long l41590;
+    public long l41591;
+    public long l41592;
+    public long l41593;
+    public long l41594;
+    public long l41595;
+    public long l41596;
+    public long l41597;
+    public long l41598;
+    public long l41599;
+    public long l41600;
+    public long l41601;
+    public long l41602;
+    public long l41603;
+    public long l41604;
+    public long l41605;
+    public long l41606;
+    public long l41607;
+    public long l41608;
+    public long l41609;
+    public long l41610;
+    public long l41611;
+    public long l41612;
+    public long l41613;
+    public long l41614;
+    public long l41615;
+    public long l41616;
+    public long l41617;
+    public long l41618;
+    public long l41619;
+    public long l41620;
+    public long l41621;
+    public long l41622;
+    public long l41623;
+    public long l41624;
+    public long l41625;
+    public long l41626;
+    public long l41627;
+    public long l41628;
+    public long l41629;
+    public long l41630;
+    public long l41631;
+    public long l41632;
+    public long l41633;
+    public long l41634;
+    public long l41635;
+    public long l41636;
+    public long l41637;
+    public long l41638;
+    public long l41639;
+    public long l41640;
+    public long l41641;
+    public long l41642;
+    public long l41643;
+    public long l41644;
+    public long l41645;
+    public long l41646;
+    public long l41647;
+    public long l41648;
+    public long l41649;
+    public long l41650;
+    public long l41651;
+    public long l41652;
+    public long l41653;
+    public long l41654;
+    public long l41655;
+    public long l41656;
+    public long l41657;
+    public long l41658;
+    public long l41659;
+    public long l41660;
+    public long l41661;
+    public long l41662;
+    public long l41663;
+    public long l41664;
+    public long l41665;
+    public long l41666;
+    public long l41667;
+    public long l41668;
+    public long l41669;
+    public long l41670;
+    public long l41671;
+    public long l41672;
+    public long l41673;
+    public long l41674;
+    public long l41675;
+    public long l41676;
+    public long l41677;
+    public long l41678;
+    public long l41679;
+    public long l41680;
+    public long l41681;
+    public long l41682;
+    public long l41683;
+    public long l41684;
+    public long l41685;
+    public long l41686;
+    public long l41687;
+    public long l41688;
+    public long l41689;
+    public long l41690;
+    public long l41691;
+    public long l41692;
+    public long l41693;
+    public long l41694;
+    public long l41695;
+    public long l41696;
+    public long l41697;
+    public long l41698;
+    public long l41699;
+    public long l41700;
+    public long l41701;
+    public long l41702;
+    public long l41703;
+    public long l41704;
+    public long l41705;
+    public long l41706;
+    public long l41707;
+    public long l41708;
+    public long l41709;
+    public long l41710;
+    public long l41711;
+    public long l41712;
+    public long l41713;
+    public long l41714;
+    public long l41715;
+    public long l41716;
+    public long l41717;
+    public long l41718;
+    public long l41719;
+    public long l41720;
+    public long l41721;
+    public long l41722;
+    public long l41723;
+    public long l41724;
+    public long l41725;
+    public long l41726;
+    public long l41727;
+    public long l41728;
+    public long l41729;
+    public long l41730;
+    public long l41731;
+    public long l41732;
+    public long l41733;
+    public long l41734;
+    public long l41735;
+    public long l41736;
+    public long l41737;
+    public long l41738;
+    public long l41739;
+    public long l41740;
+    public long l41741;
+    public long l41742;
+    public long l41743;
+    public long l41744;
+    public long l41745;
+    public long l41746;
+    public long l41747;
+    public long l41748;
+    public long l41749;
+    public long l41750;
+    public long l41751;
+    public long l41752;
+    public long l41753;
+    public long l41754;
+    public long l41755;
+    public long l41756;
+    public long l41757;
+    public long l41758;
+    public long l41759;
+    public long l41760;
+    public long l41761;
+    public long l41762;
+    public long l41763;
+    public long l41764;
+    public long l41765;
+    public long l41766;
+    public long l41767;
+    public long l41768;
+    public long l41769;
+    public long l41770;
+    public long l41771;
+    public long l41772;
+    public long l41773;
+    public long l41774;
+    public long l41775;
+    public long l41776;
+    public long l41777;
+    public long l41778;
+    public long l41779;
+    public long l41780;
+    public long l41781;
+    public long l41782;
+    public long l41783;
+    public long l41784;
+    public long l41785;
+    public long l41786;
+    public long l41787;
+    public long l41788;
+    public long l41789;
+    public long l41790;
+    public long l41791;
+    public long l41792;
+    public long l41793;
+    public long l41794;
+    public long l41795;
+    public long l41796;
+    public long l41797;
+    public long l41798;
+    public long l41799;
+    public long l41800;
+    public long l41801;
+    public long l41802;
+    public long l41803;
+    public long l41804;
+    public long l41805;
+    public long l41806;
+    public long l41807;
+    public long l41808;
+    public long l41809;
+    public long l41810;
+    public long l41811;
+    public long l41812;
+    public long l41813;
+    public long l41814;
+    public long l41815;
+    public long l41816;
+    public long l41817;
+    public long l41818;
+    public long l41819;
+    public long l41820;
+    public long l41821;
+    public long l41822;
+    public long l41823;
+    public long l41824;
+    public long l41825;
+    public long l41826;
+    public long l41827;
+    public long l41828;
+    public long l41829;
+    public long l41830;
+    public long l41831;
+    public long l41832;
+    public long l41833;
+    public long l41834;
+    public long l41835;
+    public long l41836;
+    public long l41837;
+    public long l41838;
+    public long l41839;
+    public long l41840;
+    public long l41841;
+    public long l41842;
+    public long l41843;
+    public long l41844;
+    public long l41845;
+    public long l41846;
+    public long l41847;
+    public long l41848;
+    public long l41849;
+    public long l41850;
+    public long l41851;
+    public long l41852;
+    public long l41853;
+    public long l41854;
+    public long l41855;
+    public long l41856;
+    public long l41857;
+    public long l41858;
+    public long l41859;
+    public long l41860;
+    public long l41861;
+    public long l41862;
+    public long l41863;
+    public long l41864;
+    public long l41865;
+    public long l41866;
+    public long l41867;
+    public long l41868;
+    public long l41869;
+    public long l41870;
+    public long l41871;
+    public long l41872;
+    public long l41873;
+    public long l41874;
+    public long l41875;
+    public long l41876;
+    public long l41877;
+    public long l41878;
+    public long l41879;
+    public long l41880;
+    public long l41881;
+    public long l41882;
+    public long l41883;
+    public long l41884;
+    public long l41885;
+    public long l41886;
+    public long l41887;
+    public long l41888;
+    public long l41889;
+    public long l41890;
+    public long l41891;
+    public long l41892;
+    public long l41893;
+    public long l41894;
+    public long l41895;
+    public long l41896;
+    public long l41897;
+    public long l41898;
+    public long l41899;
+    public long l41900;
+    public long l41901;
+    public long l41902;
+    public long l41903;
+    public long l41904;
+    public long l41905;
+    public long l41906;
+    public long l41907;
+    public long l41908;
+    public long l41909;
+    public long l41910;
+    public long l41911;
+    public long l41912;
+    public long l41913;
+    public long l41914;
+    public long l41915;
+    public long l41916;
+    public long l41917;
+    public long l41918;
+    public long l41919;
+    public long l41920;
+    public long l41921;
+    public long l41922;
+    public long l41923;
+    public long l41924;
+    public long l41925;
+    public long l41926;
+    public long l41927;
+    public long l41928;
+    public long l41929;
+    public long l41930;
+    public long l41931;
+    public long l41932;
+    public long l41933;
+    public long l41934;
+    public long l41935;
+    public long l41936;
+    public long l41937;
+    public long l41938;
+    public long l41939;
+    public long l41940;
+    public long l41941;
+    public long l41942;
+    public long l41943;
+    public long l41944;
+    public long l41945;
+    public long l41946;
+    public long l41947;
+    public long l41948;
+    public long l41949;
+    public long l41950;
+    public long l41951;
+    public long l41952;
+    public long l41953;
+    public long l41954;
+    public long l41955;
+    public long l41956;
+    public long l41957;
+    public long l41958;
+    public long l41959;
+    public long l41960;
+    public long l41961;
+    public long l41962;
+    public long l41963;
+    public long l41964;
+    public long l41965;
+    public long l41966;
+    public long l41967;
+    public long l41968;
+    public long l41969;
+    public long l41970;
+    public long l41971;
+    public long l41972;
+    public long l41973;
+    public long l41974;
+    public long l41975;
+    public long l41976;
+    public long l41977;
+    public long l41978;
+    public long l41979;
+    public long l41980;
+    public long l41981;
+    public long l41982;
+    public long l41983;
+    public long l41984;
+    public long l41985;
+    public long l41986;
+    public long l41987;
+    public long l41988;
+    public long l41989;
+    public long l41990;
+    public long l41991;
+    public long l41992;
+    public long l41993;
+    public long l41994;
+    public long l41995;
+    public long l41996;
+    public long l41997;
+    public long l41998;
+    public long l41999;
+    public long l42000;
+    public long l42001;
+    public long l42002;
+    public long l42003;
+    public long l42004;
+    public long l42005;
+    public long l42006;
+    public long l42007;
+    public long l42008;
+    public long l42009;
+    public long l42010;
+    public long l42011;
+    public long l42012;
+    public long l42013;
+    public long l42014;
+    public long l42015;
+    public long l42016;
+    public long l42017;
+    public long l42018;
+    public long l42019;
+    public long l42020;
+    public long l42021;
+    public long l42022;
+    public long l42023;
+    public long l42024;
+    public long l42025;
+    public long l42026;
+    public long l42027;
+    public long l42028;
+    public long l42029;
+    public long l42030;
+    public long l42031;
+    public long l42032;
+    public long l42033;
+    public long l42034;
+    public long l42035;
+    public long l42036;
+    public long l42037;
+    public long l42038;
+    public long l42039;
+    public long l42040;
+    public long l42041;
+    public long l42042;
+    public long l42043;
+    public long l42044;
+    public long l42045;
+    public long l42046;
+    public long l42047;
+    public long l42048;
+    public long l42049;
+    public long l42050;
+    public long l42051;
+    public long l42052;
+    public long l42053;
+    public long l42054;
+    public long l42055;
+    public long l42056;
+    public long l42057;
+    public long l42058;
+    public long l42059;
+    public long l42060;
+    public long l42061;
+    public long l42062;
+    public long l42063;
+    public long l42064;
+    public long l42065;
+    public long l42066;
+    public long l42067;
+    public long l42068;
+    public long l42069;
+    public long l42070;
+    public long l42071;
+    public long l42072;
+    public long l42073;
+    public long l42074;
+    public long l42075;
+    public long l42076;
+    public long l42077;
+    public long l42078;
+    public long l42079;
+    public long l42080;
+    public long l42081;
+    public long l42082;
+    public long l42083;
+    public long l42084;
+    public long l42085;
+    public long l42086;
+    public long l42087;
+    public long l42088;
+    public long l42089;
+    public long l42090;
+    public long l42091;
+    public long l42092;
+    public long l42093;
+    public long l42094;
+    public long l42095;
+    public long l42096;
+    public long l42097;
+    public long l42098;
+    public long l42099;
+    public long l42100;
+    public long l42101;
+    public long l42102;
+    public long l42103;
+    public long l42104;
+    public long l42105;
+    public long l42106;
+    public long l42107;
+    public long l42108;
+    public long l42109;
+    public long l42110;
+    public long l42111;
+    public long l42112;
+    public long l42113;
+    public long l42114;
+    public long l42115;
+    public long l42116;
+    public long l42117;
+    public long l42118;
+    public long l42119;
+    public long l42120;
+    public long l42121;
+    public long l42122;
+    public long l42123;
+    public long l42124;
+    public long l42125;
+    public long l42126;
+    public long l42127;
+    public long l42128;
+    public long l42129;
+    public long l42130;
+    public long l42131;
+    public long l42132;
+    public long l42133;
+    public long l42134;
+    public long l42135;
+    public long l42136;
+    public long l42137;
+    public long l42138;
+    public long l42139;
+    public long l42140;
+    public long l42141;
+    public long l42142;
+    public long l42143;
+    public long l42144;
+    public long l42145;
+    public long l42146;
+    public long l42147;
+    public long l42148;
+    public long l42149;
+    public long l42150;
+    public long l42151;
+    public long l42152;
+    public long l42153;
+    public long l42154;
+    public long l42155;
+    public long l42156;
+    public long l42157;
+    public long l42158;
+    public long l42159;
+    public long l42160;
+    public long l42161;
+    public long l42162;
+    public long l42163;
+    public long l42164;
+    public long l42165;
+    public long l42166;
+    public long l42167;
+    public long l42168;
+    public long l42169;
+    public long l42170;
+    public long l42171;
+    public long l42172;
+    public long l42173;
+    public long l42174;
+    public long l42175;
+    public long l42176;
+    public long l42177;
+    public long l42178;
+    public long l42179;
+    public long l42180;
+    public long l42181;
+    public long l42182;
+    public long l42183;
+    public long l42184;
+    public long l42185;
+    public long l42186;
+    public long l42187;
+    public long l42188;
+    public long l42189;
+    public long l42190;
+    public long l42191;
+    public long l42192;
+    public long l42193;
+    public long l42194;
+    public long l42195;
+    public long l42196;
+    public long l42197;
+    public long l42198;
+    public long l42199;
+    public long l42200;
+    public long l42201;
+    public long l42202;
+    public long l42203;
+    public long l42204;
+    public long l42205;
+    public long l42206;
+    public long l42207;
+    public long l42208;
+    public long l42209;
+    public long l42210;
+    public long l42211;
+    public long l42212;
+    public long l42213;
+    public long l42214;
+    public long l42215;
+    public long l42216;
+    public long l42217;
+    public long l42218;
+    public long l42219;
+    public long l42220;
+    public long l42221;
+    public long l42222;
+    public long l42223;
+    public long l42224;
+    public long l42225;
+    public long l42226;
+    public long l42227;
+    public long l42228;
+    public long l42229;
+    public long l42230;
+    public long l42231;
+    public long l42232;
+    public long l42233;
+    public long l42234;
+    public long l42235;
+    public long l42236;
+    public long l42237;
+    public long l42238;
+    public long l42239;
+    public long l42240;
+    public long l42241;
+    public long l42242;
+    public long l42243;
+    public long l42244;
+    public long l42245;
+    public long l42246;
+    public long l42247;
+    public long l42248;
+    public long l42249;
+    public long l42250;
+    public long l42251;
+    public long l42252;
+    public long l42253;
+    public long l42254;
+    public long l42255;
+    public long l42256;
+    public long l42257;
+    public long l42258;
+    public long l42259;
+    public long l42260;
+    public long l42261;
+    public long l42262;
+    public long l42263;
+    public long l42264;
+    public long l42265;
+    public long l42266;
+    public long l42267;
+    public long l42268;
+    public long l42269;
+    public long l42270;
+    public long l42271;
+    public long l42272;
+    public long l42273;
+    public long l42274;
+    public long l42275;
+    public long l42276;
+    public long l42277;
+    public long l42278;
+    public long l42279;
+    public long l42280;
+    public long l42281;
+    public long l42282;
+    public long l42283;
+    public long l42284;
+    public long l42285;
+    public long l42286;
+    public long l42287;
+    public long l42288;
+    public long l42289;
+    public long l42290;
+    public long l42291;
+    public long l42292;
+    public long l42293;
+    public long l42294;
+    public long l42295;
+    public long l42296;
+    public long l42297;
+    public long l42298;
+    public long l42299;
+    public long l42300;
+    public long l42301;
+    public long l42302;
+    public long l42303;
+    public long l42304;
+    public long l42305;
+    public long l42306;
+    public long l42307;
+    public long l42308;
+    public long l42309;
+    public long l42310;
+    public long l42311;
+    public long l42312;
+    public long l42313;
+    public long l42314;
+    public long l42315;
+    public long l42316;
+    public long l42317;
+    public long l42318;
+    public long l42319;
+    public long l42320;
+    public long l42321;
+    public long l42322;
+    public long l42323;
+    public long l42324;
+    public long l42325;
+    public long l42326;
+    public long l42327;
+    public long l42328;
+    public long l42329;
+    public long l42330;
+    public long l42331;
+    public long l42332;
+    public long l42333;
+    public long l42334;
+    public long l42335;
+    public long l42336;
+    public long l42337;
+    public long l42338;
+    public long l42339;
+    public long l42340;
+    public long l42341;
+    public long l42342;
+    public long l42343;
+    public long l42344;
+    public long l42345;
+    public long l42346;
+    public long l42347;
+    public long l42348;
+    public long l42349;
+    public long l42350;
+    public long l42351;
+    public long l42352;
+    public long l42353;
+    public long l42354;
+    public long l42355;
+    public long l42356;
+    public long l42357;
+    public long l42358;
+    public long l42359;
+    public long l42360;
+    public long l42361;
+    public long l42362;
+    public long l42363;
+    public long l42364;
+    public long l42365;
+    public long l42366;
+    public long l42367;
+    public long l42368;
+    public long l42369;
+    public long l42370;
+    public long l42371;
+    public long l42372;
+    public long l42373;
+    public long l42374;
+    public long l42375;
+    public long l42376;
+    public long l42377;
+    public long l42378;
+    public long l42379;
+    public long l42380;
+    public long l42381;
+    public long l42382;
+    public long l42383;
+    public long l42384;
+    public long l42385;
+    public long l42386;
+    public long l42387;
+    public long l42388;
+    public long l42389;
+    public long l42390;
+    public long l42391;
+    public long l42392;
+    public long l42393;
+    public long l42394;
+    public long l42395;
+    public long l42396;
+    public long l42397;
+    public long l42398;
+    public long l42399;
+    public long l42400;
+    public long l42401;
+    public long l42402;
+    public long l42403;
+    public long l42404;
+    public long l42405;
+    public long l42406;
+    public long l42407;
+    public long l42408;
+    public long l42409;
+    public long l42410;
+    public long l42411;
+    public long l42412;
+    public long l42413;
+    public long l42414;
+    public long l42415;
+    public long l42416;
+    public long l42417;
+    public long l42418;
+    public long l42419;
+    public long l42420;
+    public long l42421;
+    public long l42422;
+    public long l42423;
+    public long l42424;
+    public long l42425;
+    public long l42426;
+    public long l42427;
+    public long l42428;
+    public long l42429;
+    public long l42430;
+    public long l42431;
+    public long l42432;
+    public long l42433;
+    public long l42434;
+    public long l42435;
+    public long l42436;
+    public long l42437;
+    public long l42438;
+    public long l42439;
+    public long l42440;
+    public long l42441;
+    public long l42442;
+    public long l42443;
+    public long l42444;
+    public long l42445;
+    public long l42446;
+    public long l42447;
+    public long l42448;
+    public long l42449;
+    public long l42450;
+    public long l42451;
+    public long l42452;
+    public long l42453;
+    public long l42454;
+    public long l42455;
+    public long l42456;
+    public long l42457;
+    public long l42458;
+    public long l42459;
+    public long l42460;
+    public long l42461;
+    public long l42462;
+    public long l42463;
+    public long l42464;
+    public long l42465;
+    public long l42466;
+    public long l42467;
+    public long l42468;
+    public long l42469;
+    public long l42470;
+    public long l42471;
+    public long l42472;
+    public long l42473;
+    public long l42474;
+    public long l42475;
+    public long l42476;
+    public long l42477;
+    public long l42478;
+    public long l42479;
+    public long l42480;
+    public long l42481;
+    public long l42482;
+    public long l42483;
+    public long l42484;
+    public long l42485;
+    public long l42486;
+    public long l42487;
+    public long l42488;
+    public long l42489;
+    public long l42490;
+    public long l42491;
+    public long l42492;
+    public long l42493;
+    public long l42494;
+    public long l42495;
+    public long l42496;
+    public long l42497;
+    public long l42498;
+    public long l42499;
+    public long l42500;
+    public long l42501;
+    public long l42502;
+    public long l42503;
+    public long l42504;
+    public long l42505;
+    public long l42506;
+    public long l42507;
+    public long l42508;
+    public long l42509;
+    public long l42510;
+    public long l42511;
+    public long l42512;
+    public long l42513;
+    public long l42514;
+    public long l42515;
+    public long l42516;
+    public long l42517;
+    public long l42518;
+    public long l42519;
+    public long l42520;
+    public long l42521;
+    public long l42522;
+    public long l42523;
+    public long l42524;
+    public long l42525;
+    public long l42526;
+    public long l42527;
+    public long l42528;
+    public long l42529;
+    public long l42530;
+    public long l42531;
+    public long l42532;
+    public long l42533;
+    public long l42534;
+    public long l42535;
+    public long l42536;
+    public long l42537;
+    public long l42538;
+    public long l42539;
+    public long l42540;
+    public long l42541;
+    public long l42542;
+    public long l42543;
+    public long l42544;
+    public long l42545;
+    public long l42546;
+    public long l42547;
+    public long l42548;
+    public long l42549;
+    public long l42550;
+    public long l42551;
+    public long l42552;
+    public long l42553;
+    public long l42554;
+    public long l42555;
+    public long l42556;
+    public long l42557;
+    public long l42558;
+    public long l42559;
+    public long l42560;
+    public long l42561;
+    public long l42562;
+    public long l42563;
+    public long l42564;
+    public long l42565;
+    public long l42566;
+    public long l42567;
+    public long l42568;
+    public long l42569;
+    public long l42570;
+    public long l42571;
+    public long l42572;
+    public long l42573;
+    public long l42574;
+    public long l42575;
+    public long l42576;
+    public long l42577;
+    public long l42578;
+    public long l42579;
+    public long l42580;
+    public long l42581;
+    public long l42582;
+    public long l42583;
+    public long l42584;
+    public long l42585;
+    public long l42586;
+    public long l42587;
+    public long l42588;
+    public long l42589;
+    public long l42590;
+    public long l42591;
+    public long l42592;
+    public long l42593;
+    public long l42594;
+    public long l42595;
+    public long l42596;
+    public long l42597;
+    public long l42598;
+    public long l42599;
+    public long l42600;
+    public long l42601;
+    public long l42602;
+    public long l42603;
+    public long l42604;
+    public long l42605;
+    public long l42606;
+    public long l42607;
+    public long l42608;
+    public long l42609;
+    public long l42610;
+    public long l42611;
+    public long l42612;
+    public long l42613;
+    public long l42614;
+    public long l42615;
+    public long l42616;
+    public long l42617;
+    public long l42618;
+    public long l42619;
+    public long l42620;
+    public long l42621;
+    public long l42622;
+    public long l42623;
+    public long l42624;
+    public long l42625;
+    public long l42626;
+    public long l42627;
+    public long l42628;
+    public long l42629;
+    public long l42630;
+    public long l42631;
+    public long l42632;
+    public long l42633;
+    public long l42634;
+    public long l42635;
+    public long l42636;
+    public long l42637;
+    public long l42638;
+    public long l42639;
+    public long l42640;
+    public long l42641;
+    public long l42642;
+    public long l42643;
+    public long l42644;
+    public long l42645;
+    public long l42646;
+    public long l42647;
+    public long l42648;
+    public long l42649;
+    public long l42650;
+    public long l42651;
+    public long l42652;
+    public long l42653;
+    public long l42654;
+    public long l42655;
+    public long l42656;
+    public long l42657;
+    public long l42658;
+    public long l42659;
+    public long l42660;
+    public long l42661;
+    public long l42662;
+    public long l42663;
+    public long l42664;
+    public long l42665;
+    public long l42666;
+    public long l42667;
+    public long l42668;
+    public long l42669;
+    public long l42670;
+    public long l42671;
+    public long l42672;
+    public long l42673;
+    public long l42674;
+    public long l42675;
+    public long l42676;
+    public long l42677;
+    public long l42678;
+    public long l42679;
+    public long l42680;
+    public long l42681;
+    public long l42682;
+    public long l42683;
+    public long l42684;
+    public long l42685;
+    public long l42686;
+    public long l42687;
+    public long l42688;
+    public long l42689;
+    public long l42690;
+    public long l42691;
+    public long l42692;
+    public long l42693;
+    public long l42694;
+    public long l42695;
+    public long l42696;
+    public long l42697;
+    public long l42698;
+    public long l42699;
+    public long l42700;
+    public long l42701;
+    public long l42702;
+    public long l42703;
+    public long l42704;
+    public long l42705;
+    public long l42706;
+    public long l42707;
+    public long l42708;
+    public long l42709;
+    public long l42710;
+    public long l42711;
+    public long l42712;
+    public long l42713;
+    public long l42714;
+    public long l42715;
+    public long l42716;
+    public long l42717;
+    public long l42718;
+    public long l42719;
+    public long l42720;
+    public long l42721;
+    public long l42722;
+    public long l42723;
+    public long l42724;
+    public long l42725;
+    public long l42726;
+    public long l42727;
+    public long l42728;
+    public long l42729;
+    public long l42730;
+    public long l42731;
+    public long l42732;
+    public long l42733;
+    public long l42734;
+    public long l42735;
+    public long l42736;
+    public long l42737;
+    public long l42738;
+    public long l42739;
+    public long l42740;
+    public long l42741;
+    public long l42742;
+    public long l42743;
+    public long l42744;
+    public long l42745;
+    public long l42746;
+    public long l42747;
+    public long l42748;
+    public long l42749;
+    public long l42750;
+    public long l42751;
+    public long l42752;
+    public long l42753;
+    public long l42754;
+    public long l42755;
+    public long l42756;
+    public long l42757;
+    public long l42758;
+    public long l42759;
+    public long l42760;
+    public long l42761;
+    public long l42762;
+    public long l42763;
+    public long l42764;
+    public long l42765;
+    public long l42766;
+    public long l42767;
+    public long l42768;
+    public long l42769;
+    public long l42770;
+    public long l42771;
+    public long l42772;
+    public long l42773;
+    public long l42774;
+    public long l42775;
+    public long l42776;
+    public long l42777;
+    public long l42778;
+    public long l42779;
+    public long l42780;
+    public long l42781;
+    public long l42782;
+    public long l42783;
+    public long l42784;
+    public long l42785;
+    public long l42786;
+    public long l42787;
+    public long l42788;
+    public long l42789;
+    public long l42790;
+    public long l42791;
+    public long l42792;
+    public long l42793;
+    public long l42794;
+    public long l42795;
+    public long l42796;
+    public long l42797;
+    public long l42798;
+    public long l42799;
+    public long l42800;
+    public long l42801;
+    public long l42802;
+    public long l42803;
+    public long l42804;
+    public long l42805;
+    public long l42806;
+    public long l42807;
+    public long l42808;
+    public long l42809;
+    public long l42810;
+    public long l42811;
+    public long l42812;
+    public long l42813;
+    public long l42814;
+    public long l42815;
+    public long l42816;
+    public long l42817;
+    public long l42818;
+    public long l42819;
+    public long l42820;
+    public long l42821;
+    public long l42822;
+    public long l42823;
+    public long l42824;
+    public long l42825;
+    public long l42826;
+    public long l42827;
+    public long l42828;
+    public long l42829;
+    public long l42830;
+    public long l42831;
+    public long l42832;
+    public long l42833;
+    public long l42834;
+    public long l42835;
+    public long l42836;
+    public long l42837;
+    public long l42838;
+    public long l42839;
+    public long l42840;
+    public long l42841;
+    public long l42842;
+    public long l42843;
+    public long l42844;
+    public long l42845;
+    public long l42846;
+    public long l42847;
+    public long l42848;
+    public long l42849;
+    public long l42850;
+    public long l42851;
+    public long l42852;
+    public long l42853;
+    public long l42854;
+    public long l42855;
+    public long l42856;
+    public long l42857;
+    public long l42858;
+    public long l42859;
+    public long l42860;
+    public long l42861;
+    public long l42862;
+    public long l42863;
+    public long l42864;
+    public long l42865;
+    public long l42866;
+    public long l42867;
+    public long l42868;
+    public long l42869;
+    public long l42870;
+    public long l42871;
+    public long l42872;
+    public long l42873;
+    public long l42874;
+    public long l42875;
+    public long l42876;
+    public long l42877;
+    public long l42878;
+    public long l42879;
+    public long l42880;
+    public long l42881;
+    public long l42882;
+    public long l42883;
+    public long l42884;
+    public long l42885;
+    public long l42886;
+    public long l42887;
+    public long l42888;
+    public long l42889;
+    public long l42890;
+    public long l42891;
+    public long l42892;
+    public long l42893;
+    public long l42894;
+    public long l42895;
+    public long l42896;
+    public long l42897;
+    public long l42898;
+    public long l42899;
+    public long l42900;
+    public long l42901;
+    public long l42902;
+    public long l42903;
+    public long l42904;
+    public long l42905;
+    public long l42906;
+    public long l42907;
+    public long l42908;
+    public long l42909;
+    public long l42910;
+    public long l42911;
+    public long l42912;
+    public long l42913;
+    public long l42914;
+    public long l42915;
+    public long l42916;
+    public long l42917;
+    public long l42918;
+    public long l42919;
+    public long l42920;
+    public long l42921;
+    public long l42922;
+    public long l42923;
+    public long l42924;
+    public long l42925;
+    public long l42926;
+    public long l42927;
+    public long l42928;
+    public long l42929;
+    public long l42930;
+    public long l42931;
+    public long l42932;
+    public long l42933;
+    public long l42934;
+    public long l42935;
+    public long l42936;
+    public long l42937;
+    public long l42938;
+    public long l42939;
+    public long l42940;
+    public long l42941;
+    public long l42942;
+    public long l42943;
+    public long l42944;
+    public long l42945;
+    public long l42946;
+    public long l42947;
+    public long l42948;
+    public long l42949;
+    public long l42950;
+    public long l42951;
+    public long l42952;
+    public long l42953;
+    public long l42954;
+    public long l42955;
+    public long l42956;
+    public long l42957;
+    public long l42958;
+    public long l42959;
+    public long l42960;
+    public long l42961;
+    public long l42962;
+    public long l42963;
+    public long l42964;
+    public long l42965;
+    public long l42966;
+    public long l42967;
+    public long l42968;
+    public long l42969;
+    public long l42970;
+    public long l42971;
+    public long l42972;
+    public long l42973;
+    public long l42974;
+    public long l42975;
+    public long l42976;
+    public long l42977;
+    public long l42978;
+    public long l42979;
+    public long l42980;
+    public long l42981;
+    public long l42982;
+    public long l42983;
+    public long l42984;
+    public long l42985;
+    public long l42986;
+    public long l42987;
+    public long l42988;
+    public long l42989;
+    public long l42990;
+    public long l42991;
+    public long l42992;
+    public long l42993;
+    public long l42994;
+    public long l42995;
+    public long l42996;
+    public long l42997;
+    public long l42998;
+    public long l42999;
+    public long l43000;
+    public long l43001;
+    public long l43002;
+    public long l43003;
+    public long l43004;
+    public long l43005;
+    public long l43006;
+    public long l43007;
+    public long l43008;
+    public long l43009;
+    public long l43010;
+    public long l43011;
+    public long l43012;
+    public long l43013;
+    public long l43014;
+    public long l43015;
+    public long l43016;
+    public long l43017;
+    public long l43018;
+    public long l43019;
+    public long l43020;
+    public long l43021;
+    public long l43022;
+    public long l43023;
+    public long l43024;
+    public long l43025;
+    public long l43026;
+    public long l43027;
+    public long l43028;
+    public long l43029;
+    public long l43030;
+    public long l43031;
+    public long l43032;
+    public long l43033;
+    public long l43034;
+    public long l43035;
+    public long l43036;
+    public long l43037;
+    public long l43038;
+    public long l43039;
+    public long l43040;
+    public long l43041;
+    public long l43042;
+    public long l43043;
+    public long l43044;
+    public long l43045;
+    public long l43046;
+    public long l43047;
+    public long l43048;
+    public long l43049;
+    public long l43050;
+    public long l43051;
+    public long l43052;
+    public long l43053;
+    public long l43054;
+    public long l43055;
+    public long l43056;
+    public long l43057;
+    public long l43058;
+    public long l43059;
+    public long l43060;
+    public long l43061;
+    public long l43062;
+    public long l43063;
+    public long l43064;
+    public long l43065;
+    public long l43066;
+    public long l43067;
+    public long l43068;
+    public long l43069;
+    public long l43070;
+    public long l43071;
+    public long l43072;
+    public long l43073;
+    public long l43074;
+    public long l43075;
+    public long l43076;
+    public long l43077;
+    public long l43078;
+    public long l43079;
+    public long l43080;
+    public long l43081;
+    public long l43082;
+    public long l43083;
+    public long l43084;
+    public long l43085;
+    public long l43086;
+    public long l43087;
+    public long l43088;
+    public long l43089;
+    public long l43090;
+    public long l43091;
+    public long l43092;
+    public long l43093;
+    public long l43094;
+    public long l43095;
+    public long l43096;
+    public long l43097;
+    public long l43098;
+    public long l43099;
+    public long l43100;
+    public long l43101;
+    public long l43102;
+    public long l43103;
+    public long l43104;
+    public long l43105;
+    public long l43106;
+    public long l43107;
+    public long l43108;
+    public long l43109;
+    public long l43110;
+    public long l43111;
+    public long l43112;
+    public long l43113;
+    public long l43114;
+    public long l43115;
+    public long l43116;
+    public long l43117;
+    public long l43118;
+    public long l43119;
+    public long l43120;
+    public long l43121;
+    public long l43122;
+    public long l43123;
+    public long l43124;
+    public long l43125;
+    public long l43126;
+    public long l43127;
+    public long l43128;
+    public long l43129;
+    public long l43130;
+    public long l43131;
+    public long l43132;
+    public long l43133;
+    public long l43134;
+    public long l43135;
+    public long l43136;
+    public long l43137;
+    public long l43138;
+    public long l43139;
+    public long l43140;
+    public long l43141;
+    public long l43142;
+    public long l43143;
+    public long l43144;
+    public long l43145;
+    public long l43146;
+    public long l43147;
+    public long l43148;
+    public long l43149;
+    public long l43150;
+    public long l43151;
+    public long l43152;
+    public long l43153;
+    public long l43154;
+    public long l43155;
+    public long l43156;
+    public long l43157;
+    public long l43158;
+    public long l43159;
+    public long l43160;
+    public long l43161;
+    public long l43162;
+    public long l43163;
+    public long l43164;
+    public long l43165;
+    public long l43166;
+    public long l43167;
+    public long l43168;
+    public long l43169;
+    public long l43170;
+    public long l43171;
+    public long l43172;
+    public long l43173;
+    public long l43174;
+    public long l43175;
+    public long l43176;
+    public long l43177;
+    public long l43178;
+    public long l43179;
+    public long l43180;
+    public long l43181;
+    public long l43182;
+    public long l43183;
+    public long l43184;
+    public long l43185;
+    public long l43186;
+    public long l43187;
+    public long l43188;
+    public long l43189;
+    public long l43190;
+    public long l43191;
+    public long l43192;
+    public long l43193;
+    public long l43194;
+    public long l43195;
+    public long l43196;
+    public long l43197;
+    public long l43198;
+    public long l43199;
+    public long l43200;
+    public long l43201;
+    public long l43202;
+    public long l43203;
+    public long l43204;
+    public long l43205;
+    public long l43206;
+    public long l43207;
+    public long l43208;
+    public long l43209;
+    public long l43210;
+    public long l43211;
+    public long l43212;
+    public long l43213;
+    public long l43214;
+    public long l43215;
+    public long l43216;
+    public long l43217;
+    public long l43218;
+    public long l43219;
+    public long l43220;
+    public long l43221;
+    public long l43222;
+    public long l43223;
+    public long l43224;
+    public long l43225;
+    public long l43226;
+    public long l43227;
+    public long l43228;
+    public long l43229;
+    public long l43230;
+    public long l43231;
+    public long l43232;
+    public long l43233;
+    public long l43234;
+    public long l43235;
+    public long l43236;
+    public long l43237;
+    public long l43238;
+    public long l43239;
+    public long l43240;
+    public long l43241;
+    public long l43242;
+    public long l43243;
+    public long l43244;
+    public long l43245;
+    public long l43246;
+    public long l43247;
+    public long l43248;
+    public long l43249;
+    public long l43250;
+    public long l43251;
+    public long l43252;
+    public long l43253;
+    public long l43254;
+    public long l43255;
+    public long l43256;
+    public long l43257;
+    public long l43258;
+    public long l43259;
+    public long l43260;
+    public long l43261;
+    public long l43262;
+    public long l43263;
+    public long l43264;
+    public long l43265;
+    public long l43266;
+    public long l43267;
+    public long l43268;
+    public long l43269;
+    public long l43270;
+    public long l43271;
+    public long l43272;
+    public long l43273;
+    public long l43274;
+    public long l43275;
+    public long l43276;
+    public long l43277;
+    public long l43278;
+    public long l43279;
+    public long l43280;
+    public long l43281;
+    public long l43282;
+    public long l43283;
+    public long l43284;
+    public long l43285;
+    public long l43286;
+    public long l43287;
+    public long l43288;
+    public long l43289;
+    public long l43290;
+    public long l43291;
+    public long l43292;
+    public long l43293;
+    public long l43294;
+    public long l43295;
+    public long l43296;
+    public long l43297;
+    public long l43298;
+    public long l43299;
+    public long l43300;
+    public long l43301;
+    public long l43302;
+    public long l43303;
+    public long l43304;
+    public long l43305;
+    public long l43306;
+    public long l43307;
+    public long l43308;
+    public long l43309;
+    public long l43310;
+    public long l43311;
+    public long l43312;
+    public long l43313;
+    public long l43314;
+    public long l43315;
+    public long l43316;
+    public long l43317;
+    public long l43318;
+    public long l43319;
+    public long l43320;
+    public long l43321;
+    public long l43322;
+    public long l43323;
+    public long l43324;
+    public long l43325;
+    public long l43326;
+    public long l43327;
+    public long l43328;
+    public long l43329;
+    public long l43330;
+    public long l43331;
+    public long l43332;
+    public long l43333;
+    public long l43334;
+    public long l43335;
+    public long l43336;
+    public long l43337;
+    public long l43338;
+    public long l43339;
+    public long l43340;
+    public long l43341;
+    public long l43342;
+    public long l43343;
+    public long l43344;
+    public long l43345;
+    public long l43346;
+    public long l43347;
+    public long l43348;
+    public long l43349;
+    public long l43350;
+    public long l43351;
+    public long l43352;
+    public long l43353;
+    public long l43354;
+    public long l43355;
+    public long l43356;
+    public long l43357;
+    public long l43358;
+    public long l43359;
+    public long l43360;
+    public long l43361;
+    public long l43362;
+    public long l43363;
+    public long l43364;
+    public long l43365;
+    public long l43366;
+    public long l43367;
+    public long l43368;
+    public long l43369;
+    public long l43370;
+    public long l43371;
+    public long l43372;
+    public long l43373;
+    public long l43374;
+    public long l43375;
+    public long l43376;
+    public long l43377;
+    public long l43378;
+    public long l43379;
+    public long l43380;
+    public long l43381;
+    public long l43382;
+    public long l43383;
+    public long l43384;
+    public long l43385;
+    public long l43386;
+    public long l43387;
+    public long l43388;
+    public long l43389;
+    public long l43390;
+    public long l43391;
+    public long l43392;
+    public long l43393;
+    public long l43394;
+    public long l43395;
+    public long l43396;
+    public long l43397;
+    public long l43398;
+    public long l43399;
+    public long l43400;
+    public long l43401;
+    public long l43402;
+    public long l43403;
+    public long l43404;
+    public long l43405;
+    public long l43406;
+    public long l43407;
+    public long l43408;
+    public long l43409;
+    public long l43410;
+    public long l43411;
+    public long l43412;
+    public long l43413;
+    public long l43414;
+    public long l43415;
+    public long l43416;
+    public long l43417;
+    public long l43418;
+    public long l43419;
+    public long l43420;
+    public long l43421;
+    public long l43422;
+    public long l43423;
+    public long l43424;
+    public long l43425;
+    public long l43426;
+    public long l43427;
+    public long l43428;
+    public long l43429;
+    public long l43430;
+    public long l43431;
+    public long l43432;
+    public long l43433;
+    public long l43434;
+    public long l43435;
+    public long l43436;
+    public long l43437;
+    public long l43438;
+    public long l43439;
+    public long l43440;
+    public long l43441;
+    public long l43442;
+    public long l43443;
+    public long l43444;
+    public long l43445;
+    public long l43446;
+    public long l43447;
+    public long l43448;
+    public long l43449;
+    public long l43450;
+    public long l43451;
+    public long l43452;
+    public long l43453;
+    public long l43454;
+    public long l43455;
+    public long l43456;
+    public long l43457;
+    public long l43458;
+    public long l43459;
+    public long l43460;
+    public long l43461;
+    public long l43462;
+    public long l43463;
+    public long l43464;
+    public long l43465;
+    public long l43466;
+    public long l43467;
+    public long l43468;
+    public long l43469;
+    public long l43470;
+    public long l43471;
+    public long l43472;
+    public long l43473;
+    public long l43474;
+    public long l43475;
+    public long l43476;
+    public long l43477;
+    public long l43478;
+    public long l43479;
+    public long l43480;
+    public long l43481;
+    public long l43482;
+    public long l43483;
+    public long l43484;
+    public long l43485;
+    public long l43486;
+    public long l43487;
+    public long l43488;
+    public long l43489;
+    public long l43490;
+    public long l43491;
+    public long l43492;
+    public long l43493;
+    public long l43494;
+    public long l43495;
+    public long l43496;
+    public long l43497;
+    public long l43498;
+    public long l43499;
+    public long l43500;
+    public long l43501;
+    public long l43502;
+    public long l43503;
+    public long l43504;
+    public long l43505;
+    public long l43506;
+    public long l43507;
+    public long l43508;
+    public long l43509;
+    public long l43510;
+    public long l43511;
+    public long l43512;
+    public long l43513;
+    public long l43514;
+    public long l43515;
+    public long l43516;
+    public long l43517;
+    public long l43518;
+    public long l43519;
+    public long l43520;
+    public long l43521;
+    public long l43522;
+    public long l43523;
+    public long l43524;
+    public long l43525;
+    public long l43526;
+    public long l43527;
+    public long l43528;
+    public long l43529;
+    public long l43530;
+    public long l43531;
+    public long l43532;
+    public long l43533;
+    public long l43534;
+    public long l43535;
+    public long l43536;
+    public long l43537;
+    public long l43538;
+    public long l43539;
+    public long l43540;
+    public long l43541;
+    public long l43542;
+    public long l43543;
+    public long l43544;
+    public long l43545;
+    public long l43546;
+    public long l43547;
+    public long l43548;
+    public long l43549;
+    public long l43550;
+    public long l43551;
+    public long l43552;
+    public long l43553;
+    public long l43554;
+    public long l43555;
+    public long l43556;
+    public long l43557;
+    public long l43558;
+    public long l43559;
+    public long l43560;
+    public long l43561;
+    public long l43562;
+    public long l43563;
+    public long l43564;
+    public long l43565;
+    public long l43566;
+    public long l43567;
+    public long l43568;
+    public long l43569;
+    public long l43570;
+    public long l43571;
+    public long l43572;
+    public long l43573;
+    public long l43574;
+    public long l43575;
+    public long l43576;
+    public long l43577;
+    public long l43578;
+    public long l43579;
+    public long l43580;
+    public long l43581;
+    public long l43582;
+    public long l43583;
+    public long l43584;
+    public long l43585;
+    public long l43586;
+    public long l43587;
+    public long l43588;
+    public long l43589;
+    public long l43590;
+    public long l43591;
+    public long l43592;
+    public long l43593;
+    public long l43594;
+    public long l43595;
+    public long l43596;
+    public long l43597;
+    public long l43598;
+    public long l43599;
+    public long l43600;
+    public long l43601;
+    public long l43602;
+    public long l43603;
+    public long l43604;
+    public long l43605;
+    public long l43606;
+    public long l43607;
+    public long l43608;
+    public long l43609;
+    public long l43610;
+    public long l43611;
+    public long l43612;
+    public long l43613;
+    public long l43614;
+    public long l43615;
+    public long l43616;
+    public long l43617;
+    public long l43618;
+    public long l43619;
+    public long l43620;
+    public long l43621;
+    public long l43622;
+    public long l43623;
+    public long l43624;
+    public long l43625;
+    public long l43626;
+    public long l43627;
+    public long l43628;
+    public long l43629;
+    public long l43630;
+    public long l43631;
+    public long l43632;
+    public long l43633;
+    public long l43634;
+    public long l43635;
+    public long l43636;
+    public long l43637;
+    public long l43638;
+    public long l43639;
+    public long l43640;
+    public long l43641;
+    public long l43642;
+    public long l43643;
+    public long l43644;
+    public long l43645;
+    public long l43646;
+    public long l43647;
+    public long l43648;
+    public long l43649;
+    public long l43650;
+    public long l43651;
+    public long l43652;
+    public long l43653;
+    public long l43654;
+    public long l43655;
+    public long l43656;
+    public long l43657;
+    public long l43658;
+    public long l43659;
+    public long l43660;
+    public long l43661;
+    public long l43662;
+    public long l43663;
+    public long l43664;
+    public long l43665;
+    public long l43666;
+    public long l43667;
+    public long l43668;
+    public long l43669;
+    public long l43670;
+    public long l43671;
+    public long l43672;
+    public long l43673;
+    public long l43674;
+    public long l43675;
+    public long l43676;
+    public long l43677;
+    public long l43678;
+    public long l43679;
+    public long l43680;
+    public long l43681;
+    public long l43682;
+    public long l43683;
+    public long l43684;
+    public long l43685;
+    public long l43686;
+    public long l43687;
+    public long l43688;
+    public long l43689;
+    public long l43690;
+    public long l43691;
+    public long l43692;
+    public long l43693;
+    public long l43694;
+    public long l43695;
+    public long l43696;
+    public long l43697;
+    public long l43698;
+    public long l43699;
+    public long l43700;
+    public long l43701;
+    public long l43702;
+    public long l43703;
+    public long l43704;
+    public long l43705;
+    public long l43706;
+    public long l43707;
+    public long l43708;
+    public long l43709;
+    public long l43710;
+    public long l43711;
+    public long l43712;
+    public long l43713;
+    public long l43714;
+    public long l43715;
+    public long l43716;
+    public long l43717;
+    public long l43718;
+    public long l43719;
+    public long l43720;
+    public long l43721;
+    public long l43722;
+    public long l43723;
+    public long l43724;
+    public long l43725;
+    public long l43726;
+    public long l43727;
+    public long l43728;
+    public long l43729;
+    public long l43730;
+    public long l43731;
+    public long l43732;
+    public long l43733;
+    public long l43734;
+    public long l43735;
+    public long l43736;
+    public long l43737;
+    public long l43738;
+    public long l43739;
+    public long l43740;
+    public long l43741;
+    public long l43742;
+    public long l43743;
+    public long l43744;
+    public long l43745;
+    public long l43746;
+    public long l43747;
+    public long l43748;
+    public long l43749;
+    public long l43750;
+    public long l43751;
+    public long l43752;
+    public long l43753;
+    public long l43754;
+    public long l43755;
+    public long l43756;
+    public long l43757;
+    public long l43758;
+    public long l43759;
+    public long l43760;
+    public long l43761;
+    public long l43762;
+    public long l43763;
+    public long l43764;
+    public long l43765;
+    public long l43766;
+    public long l43767;
+    public long l43768;
+    public long l43769;
+    public long l43770;
+    public long l43771;
+    public long l43772;
+    public long l43773;
+    public long l43774;
+    public long l43775;
+    public long l43776;
+    public long l43777;
+    public long l43778;
+    public long l43779;
+    public long l43780;
+    public long l43781;
+    public long l43782;
+    public long l43783;
+    public long l43784;
+    public long l43785;
+    public long l43786;
+    public long l43787;
+    public long l43788;
+    public long l43789;
+    public long l43790;
+    public long l43791;
+    public long l43792;
+    public long l43793;
+    public long l43794;
+    public long l43795;
+    public long l43796;
+    public long l43797;
+    public long l43798;
+    public long l43799;
+    public long l43800;
+    public long l43801;
+    public long l43802;
+    public long l43803;
+    public long l43804;
+    public long l43805;
+    public long l43806;
+    public long l43807;
+    public long l43808;
+    public long l43809;
+    public long l43810;
+    public long l43811;
+    public long l43812;
+    public long l43813;
+    public long l43814;
+    public long l43815;
+    public long l43816;
+    public long l43817;
+    public long l43818;
+    public long l43819;
+    public long l43820;
+    public long l43821;
+    public long l43822;
+    public long l43823;
+    public long l43824;
+    public long l43825;
+    public long l43826;
+    public long l43827;
+    public long l43828;
+    public long l43829;
+    public long l43830;
+    public long l43831;
+    public long l43832;
+    public long l43833;
+    public long l43834;
+    public long l43835;
+    public long l43836;
+    public long l43837;
+    public long l43838;
+    public long l43839;
+    public long l43840;
+    public long l43841;
+    public long l43842;
+    public long l43843;
+    public long l43844;
+    public long l43845;
+    public long l43846;
+    public long l43847;
+    public long l43848;
+    public long l43849;
+    public long l43850;
+    public long l43851;
+    public long l43852;
+    public long l43853;
+    public long l43854;
+    public long l43855;
+    public long l43856;
+    public long l43857;
+    public long l43858;
+    public long l43859;
+    public long l43860;
+    public long l43861;
+    public long l43862;
+    public long l43863;
+    public long l43864;
+    public long l43865;
+    public long l43866;
+    public long l43867;
+    public long l43868;
+    public long l43869;
+    public long l43870;
+    public long l43871;
+    public long l43872;
+    public long l43873;
+    public long l43874;
+    public long l43875;
+    public long l43876;
+    public long l43877;
+    public long l43878;
+    public long l43879;
+    public long l43880;
+    public long l43881;
+    public long l43882;
+    public long l43883;
+    public long l43884;
+    public long l43885;
+    public long l43886;
+    public long l43887;
+    public long l43888;
+    public long l43889;
+    public long l43890;
+    public long l43891;
+    public long l43892;
+    public long l43893;
+    public long l43894;
+    public long l43895;
+    public long l43896;
+    public long l43897;
+    public long l43898;
+    public long l43899;
+    public long l43900;
+    public long l43901;
+    public long l43902;
+    public long l43903;
+    public long l43904;
+    public long l43905;
+    public long l43906;
+    public long l43907;
+    public long l43908;
+    public long l43909;
+    public long l43910;
+    public long l43911;
+    public long l43912;
+    public long l43913;
+    public long l43914;
+    public long l43915;
+    public long l43916;
+    public long l43917;
+    public long l43918;
+    public long l43919;
+    public long l43920;
+    public long l43921;
+    public long l43922;
+    public long l43923;
+    public long l43924;
+    public long l43925;
+    public long l43926;
+    public long l43927;
+    public long l43928;
+    public long l43929;
+    public long l43930;
+    public long l43931;
+    public long l43932;
+    public long l43933;
+    public long l43934;
+    public long l43935;
+    public long l43936;
+    public long l43937;
+    public long l43938;
+    public long l43939;
+    public long l43940;
+    public long l43941;
+    public long l43942;
+    public long l43943;
+    public long l43944;
+    public long l43945;
+    public long l43946;
+    public long l43947;
+    public long l43948;
+    public long l43949;
+    public long l43950;
+    public long l43951;
+    public long l43952;
+    public long l43953;
+    public long l43954;
+    public long l43955;
+    public long l43956;
+    public long l43957;
+    public long l43958;
+    public long l43959;
+    public long l43960;
+    public long l43961;
+    public long l43962;
+    public long l43963;
+    public long l43964;
+    public long l43965;
+    public long l43966;
+    public long l43967;
+    public long l43968;
+    public long l43969;
+    public long l43970;
+    public long l43971;
+    public long l43972;
+    public long l43973;
+    public long l43974;
+    public long l43975;
+    public long l43976;
+    public long l43977;
+    public long l43978;
+    public long l43979;
+    public long l43980;
+    public long l43981;
+    public long l43982;
+    public long l43983;
+    public long l43984;
+    public long l43985;
+    public long l43986;
+    public long l43987;
+    public long l43988;
+    public long l43989;
+    public long l43990;
+    public long l43991;
+    public long l43992;
+    public long l43993;
+    public long l43994;
+    public long l43995;
+    public long l43996;
+    public long l43997;
+    public long l43998;
+    public long l43999;
+    public long l44000;
+    public long l44001;
+    public long l44002;
+    public long l44003;
+    public long l44004;
+    public long l44005;
+    public long l44006;
+    public long l44007;
+    public long l44008;
+    public long l44009;
+    public long l44010;
+    public long l44011;
+    public long l44012;
+    public long l44013;
+    public long l44014;
+    public long l44015;
+    public long l44016;
+    public long l44017;
+    public long l44018;
+    public long l44019;
+    public long l44020;
+    public long l44021;
+    public long l44022;
+    public long l44023;
+    public long l44024;
+    public long l44025;
+    public long l44026;
+    public long l44027;
+    public long l44028;
+    public long l44029;
+    public long l44030;
+    public long l44031;
+    public long l44032;
+    public long l44033;
+    public long l44034;
+    public long l44035;
+    public long l44036;
+    public long l44037;
+    public long l44038;
+    public long l44039;
+    public long l44040;
+    public long l44041;
+    public long l44042;
+    public long l44043;
+    public long l44044;
+    public long l44045;
+    public long l44046;
+    public long l44047;
+    public long l44048;
+    public long l44049;
+    public long l44050;
+    public long l44051;
+    public long l44052;
+    public long l44053;
+    public long l44054;
+    public long l44055;
+    public long l44056;
+    public long l44057;
+    public long l44058;
+    public long l44059;
+    public long l44060;
+    public long l44061;
+    public long l44062;
+    public long l44063;
+    public long l44064;
+    public long l44065;
+    public long l44066;
+    public long l44067;
+    public long l44068;
+    public long l44069;
+    public long l44070;
+    public long l44071;
+    public long l44072;
+    public long l44073;
+    public long l44074;
+    public long l44075;
+    public long l44076;
+    public long l44077;
+    public long l44078;
+    public long l44079;
+    public long l44080;
+    public long l44081;
+    public long l44082;
+    public long l44083;
+    public long l44084;
+    public long l44085;
+    public long l44086;
+    public long l44087;
+    public long l44088;
+    public long l44089;
+    public long l44090;
+    public long l44091;
+    public long l44092;
+    public long l44093;
+    public long l44094;
+    public long l44095;
+    public long l44096;
+    public long l44097;
+    public long l44098;
+    public long l44099;
+    public long l44100;
+    public long l44101;
+    public long l44102;
+    public long l44103;
+    public long l44104;
+    public long l44105;
+    public long l44106;
+    public long l44107;
+    public long l44108;
+    public long l44109;
+    public long l44110;
+    public long l44111;
+    public long l44112;
+    public long l44113;
+    public long l44114;
+    public long l44115;
+    public long l44116;
+    public long l44117;
+    public long l44118;
+    public long l44119;
+    public long l44120;
+    public long l44121;
+    public long l44122;
+    public long l44123;
+    public long l44124;
+    public long l44125;
+    public long l44126;
+    public long l44127;
+    public long l44128;
+    public long l44129;
+    public long l44130;
+    public long l44131;
+    public long l44132;
+    public long l44133;
+    public long l44134;
+    public long l44135;
+    public long l44136;
+    public long l44137;
+    public long l44138;
+    public long l44139;
+    public long l44140;
+    public long l44141;
+    public long l44142;
+    public long l44143;
+    public long l44144;
+    public long l44145;
+    public long l44146;
+    public long l44147;
+    public long l44148;
+    public long l44149;
+    public long l44150;
+    public long l44151;
+    public long l44152;
+    public long l44153;
+    public long l44154;
+    public long l44155;
+    public long l44156;
+    public long l44157;
+    public long l44158;
+    public long l44159;
+    public long l44160;
+    public long l44161;
+    public long l44162;
+    public long l44163;
+    public long l44164;
+    public long l44165;
+    public long l44166;
+    public long l44167;
+    public long l44168;
+    public long l44169;
+    public long l44170;
+    public long l44171;
+    public long l44172;
+    public long l44173;
+    public long l44174;
+    public long l44175;
+    public long l44176;
+    public long l44177;
+    public long l44178;
+    public long l44179;
+    public long l44180;
+    public long l44181;
+    public long l44182;
+    public long l44183;
+    public long l44184;
+    public long l44185;
+    public long l44186;
+    public long l44187;
+    public long l44188;
+    public long l44189;
+    public long l44190;
+    public long l44191;
+    public long l44192;
+    public long l44193;
+    public long l44194;
+    public long l44195;
+    public long l44196;
+    public long l44197;
+    public long l44198;
+    public long l44199;
+    public long l44200;
+    public long l44201;
+    public long l44202;
+    public long l44203;
+    public long l44204;
+    public long l44205;
+    public long l44206;
+    public long l44207;
+    public long l44208;
+    public long l44209;
+    public long l44210;
+    public long l44211;
+    public long l44212;
+    public long l44213;
+    public long l44214;
+    public long l44215;
+    public long l44216;
+    public long l44217;
+    public long l44218;
+    public long l44219;
+    public long l44220;
+    public long l44221;
+    public long l44222;
+    public long l44223;
+    public long l44224;
+    public long l44225;
+    public long l44226;
+    public long l44227;
+    public long l44228;
+    public long l44229;
+    public long l44230;
+    public long l44231;
+    public long l44232;
+    public long l44233;
+    public long l44234;
+    public long l44235;
+    public long l44236;
+    public long l44237;
+    public long l44238;
+    public long l44239;
+    public long l44240;
+    public long l44241;
+    public long l44242;
+    public long l44243;
+    public long l44244;
+    public long l44245;
+    public long l44246;
+    public long l44247;
+    public long l44248;
+    public long l44249;
+    public long l44250;
+    public long l44251;
+    public long l44252;
+    public long l44253;
+    public long l44254;
+    public long l44255;
+    public long l44256;
+    public long l44257;
+    public long l44258;
+    public long l44259;
+    public long l44260;
+    public long l44261;
+    public long l44262;
+    public long l44263;
+    public long l44264;
+    public long l44265;
+    public long l44266;
+    public long l44267;
+    public long l44268;
+    public long l44269;
+    public long l44270;
+    public long l44271;
+    public long l44272;
+    public long l44273;
+    public long l44274;
+    public long l44275;
+    public long l44276;
+    public long l44277;
+    public long l44278;
+    public long l44279;
+    public long l44280;
+    public long l44281;
+    public long l44282;
+    public long l44283;
+    public long l44284;
+    public long l44285;
+    public long l44286;
+    public long l44287;
+    public long l44288;
+    public long l44289;
+    public long l44290;
+    public long l44291;
+    public long l44292;
+    public long l44293;
+    public long l44294;
+    public long l44295;
+    public long l44296;
+    public long l44297;
+    public long l44298;
+    public long l44299;
+    public long l44300;
+    public long l44301;
+    public long l44302;
+    public long l44303;
+    public long l44304;
+    public long l44305;
+    public long l44306;
+    public long l44307;
+    public long l44308;
+    public long l44309;
+    public long l44310;
+    public long l44311;
+    public long l44312;
+    public long l44313;
+    public long l44314;
+    public long l44315;
+    public long l44316;
+    public long l44317;
+    public long l44318;
+    public long l44319;
+    public long l44320;
+    public long l44321;
+    public long l44322;
+    public long l44323;
+    public long l44324;
+    public long l44325;
+    public long l44326;
+    public long l44327;
+    public long l44328;
+    public long l44329;
+    public long l44330;
+    public long l44331;
+    public long l44332;
+    public long l44333;
+    public long l44334;
+    public long l44335;
+    public long l44336;
+    public long l44337;
+    public long l44338;
+    public long l44339;
+    public long l44340;
+    public long l44341;
+    public long l44342;
+    public long l44343;
+    public long l44344;
+    public long l44345;
+    public long l44346;
+    public long l44347;
+    public long l44348;
+    public long l44349;
+    public long l44350;
+    public long l44351;
+    public long l44352;
+    public long l44353;
+    public long l44354;
+    public long l44355;
+    public long l44356;
+    public long l44357;
+    public long l44358;
+    public long l44359;
+    public long l44360;
+    public long l44361;
+    public long l44362;
+    public long l44363;
+    public long l44364;
+    public long l44365;
+    public long l44366;
+    public long l44367;
+    public long l44368;
+    public long l44369;
+    public long l44370;
+    public long l44371;
+    public long l44372;
+    public long l44373;
+    public long l44374;
+    public long l44375;
+    public long l44376;
+    public long l44377;
+    public long l44378;
+    public long l44379;
+    public long l44380;
+    public long l44381;
+    public long l44382;
+    public long l44383;
+    public long l44384;
+    public long l44385;
+    public long l44386;
+    public long l44387;
+    public long l44388;
+    public long l44389;
+    public long l44390;
+    public long l44391;
+    public long l44392;
+    public long l44393;
+    public long l44394;
+    public long l44395;
+    public long l44396;
+    public long l44397;
+    public long l44398;
+    public long l44399;
+    public long l44400;
+    public long l44401;
+    public long l44402;
+    public long l44403;
+    public long l44404;
+    public long l44405;
+    public long l44406;
+    public long l44407;
+    public long l44408;
+    public long l44409;
+    public long l44410;
+    public long l44411;
+    public long l44412;
+    public long l44413;
+    public long l44414;
+    public long l44415;
+    public long l44416;
+    public long l44417;
+    public long l44418;
+    public long l44419;
+    public long l44420;
+    public long l44421;
+    public long l44422;
+    public long l44423;
+    public long l44424;
+    public long l44425;
+    public long l44426;
+    public long l44427;
+    public long l44428;
+    public long l44429;
+    public long l44430;
+    public long l44431;
+    public long l44432;
+    public long l44433;
+    public long l44434;
+    public long l44435;
+    public long l44436;
+    public long l44437;
+    public long l44438;
+    public long l44439;
+    public long l44440;
+    public long l44441;
+    public long l44442;
+    public long l44443;
+    public long l44444;
+    public long l44445;
+    public long l44446;
+    public long l44447;
+    public long l44448;
+    public long l44449;
+    public long l44450;
+    public long l44451;
+    public long l44452;
+    public long l44453;
+    public long l44454;
+    public long l44455;
+    public long l44456;
+    public long l44457;
+    public long l44458;
+    public long l44459;
+    public long l44460;
+    public long l44461;
+    public long l44462;
+    public long l44463;
+    public long l44464;
+    public long l44465;
+    public long l44466;
+    public long l44467;
+    public long l44468;
+    public long l44469;
+    public long l44470;
+    public long l44471;
+    public long l44472;
+    public long l44473;
+    public long l44474;
+    public long l44475;
+    public long l44476;
+    public long l44477;
+    public long l44478;
+    public long l44479;
+    public long l44480;
+    public long l44481;
+    public long l44482;
+    public long l44483;
+    public long l44484;
+    public long l44485;
+    public long l44486;
+    public long l44487;
+    public long l44488;
+    public long l44489;
+    public long l44490;
+    public long l44491;
+    public long l44492;
+    public long l44493;
+    public long l44494;
+    public long l44495;
+    public long l44496;
+    public long l44497;
+    public long l44498;
+    public long l44499;
+    public long l44500;
+    public long l44501;
+    public long l44502;
+    public long l44503;
+    public long l44504;
+    public long l44505;
+    public long l44506;
+    public long l44507;
+    public long l44508;
+    public long l44509;
+    public long l44510;
+    public long l44511;
+    public long l44512;
+    public long l44513;
+    public long l44514;
+    public long l44515;
+    public long l44516;
+    public long l44517;
+    public long l44518;
+    public long l44519;
+    public long l44520;
+    public long l44521;
+    public long l44522;
+    public long l44523;
+    public long l44524;
+    public long l44525;
+    public long l44526;
+    public long l44527;
+    public long l44528;
+    public long l44529;
+    public long l44530;
+    public long l44531;
+    public long l44532;
+    public long l44533;
+    public long l44534;
+    public long l44535;
+    public long l44536;
+    public long l44537;
+    public long l44538;
+    public long l44539;
+    public long l44540;
+    public long l44541;
+    public long l44542;
+    public long l44543;
+    public long l44544;
+    public long l44545;
+    public long l44546;
+    public long l44547;
+    public long l44548;
+    public long l44549;
+    public long l44550;
+    public long l44551;
+    public long l44552;
+    public long l44553;
+    public long l44554;
+    public long l44555;
+    public long l44556;
+    public long l44557;
+    public long l44558;
+    public long l44559;
+    public long l44560;
+    public long l44561;
+    public long l44562;
+    public long l44563;
+    public long l44564;
+    public long l44565;
+    public long l44566;
+    public long l44567;
+    public long l44568;
+    public long l44569;
+    public long l44570;
+    public long l44571;
+    public long l44572;
+    public long l44573;
+    public long l44574;
+    public long l44575;
+    public long l44576;
+    public long l44577;
+    public long l44578;
+    public long l44579;
+    public long l44580;
+    public long l44581;
+    public long l44582;
+    public long l44583;
+    public long l44584;
+    public long l44585;
+    public long l44586;
+    public long l44587;
+    public long l44588;
+    public long l44589;
+    public long l44590;
+    public long l44591;
+    public long l44592;
+    public long l44593;
+    public long l44594;
+    public long l44595;
+    public long l44596;
+    public long l44597;
+    public long l44598;
+    public long l44599;
+    public long l44600;
+    public long l44601;
+    public long l44602;
+    public long l44603;
+    public long l44604;
+    public long l44605;
+    public long l44606;
+    public long l44607;
+    public long l44608;
+    public long l44609;
+    public long l44610;
+    public long l44611;
+    public long l44612;
+    public long l44613;
+    public long l44614;
+    public long l44615;
+    public long l44616;
+    public long l44617;
+    public long l44618;
+    public long l44619;
+    public long l44620;
+    public long l44621;
+    public long l44622;
+    public long l44623;
+    public long l44624;
+    public long l44625;
+    public long l44626;
+    public long l44627;
+    public long l44628;
+    public long l44629;
+    public long l44630;
+    public long l44631;
+    public long l44632;
+    public long l44633;
+    public long l44634;
+    public long l44635;
+    public long l44636;
+    public long l44637;
+    public long l44638;
+    public long l44639;
+    public long l44640;
+    public long l44641;
+    public long l44642;
+    public long l44643;
+    public long l44644;
+    public long l44645;
+    public long l44646;
+    public long l44647;
+    public long l44648;
+    public long l44649;
+    public long l44650;
+    public long l44651;
+    public long l44652;
+    public long l44653;
+    public long l44654;
+    public long l44655;
+    public long l44656;
+    public long l44657;
+    public long l44658;
+    public long l44659;
+    public long l44660;
+    public long l44661;
+    public long l44662;
+    public long l44663;
+    public long l44664;
+    public long l44665;
+    public long l44666;
+    public long l44667;
+    public long l44668;
+    public long l44669;
+    public long l44670;
+    public long l44671;
+    public long l44672;
+    public long l44673;
+    public long l44674;
+    public long l44675;
+    public long l44676;
+    public long l44677;
+    public long l44678;
+    public long l44679;
+    public long l44680;
+    public long l44681;
+    public long l44682;
+    public long l44683;
+    public long l44684;
+    public long l44685;
+    public long l44686;
+    public long l44687;
+    public long l44688;
+    public long l44689;
+    public long l44690;
+    public long l44691;
+    public long l44692;
+    public long l44693;
+    public long l44694;
+    public long l44695;
+    public long l44696;
+    public long l44697;
+    public long l44698;
+    public long l44699;
+    public long l44700;
+    public long l44701;
+    public long l44702;
+    public long l44703;
+    public long l44704;
+    public long l44705;
+    public long l44706;
+    public long l44707;
+    public long l44708;
+    public long l44709;
+    public long l44710;
+    public long l44711;
+    public long l44712;
+    public long l44713;
+    public long l44714;
+    public long l44715;
+    public long l44716;
+    public long l44717;
+    public long l44718;
+    public long l44719;
+    public long l44720;
+    public long l44721;
+    public long l44722;
+    public long l44723;
+    public long l44724;
+    public long l44725;
+    public long l44726;
+    public long l44727;
+    public long l44728;
+    public long l44729;
+    public long l44730;
+    public long l44731;
+    public long l44732;
+    public long l44733;
+    public long l44734;
+    public long l44735;
+    public long l44736;
+    public long l44737;
+    public long l44738;
+    public long l44739;
+    public long l44740;
+    public long l44741;
+    public long l44742;
+    public long l44743;
+    public long l44744;
+    public long l44745;
+    public long l44746;
+    public long l44747;
+    public long l44748;
+    public long l44749;
+    public long l44750;
+    public long l44751;
+    public long l44752;
+    public long l44753;
+    public long l44754;
+    public long l44755;
+    public long l44756;
+    public long l44757;
+    public long l44758;
+    public long l44759;
+    public long l44760;
+    public long l44761;
+    public long l44762;
+    public long l44763;
+    public long l44764;
+    public long l44765;
+    public long l44766;
+    public long l44767;
+    public long l44768;
+    public long l44769;
+    public long l44770;
+    public long l44771;
+    public long l44772;
+    public long l44773;
+    public long l44774;
+    public long l44775;
+    public long l44776;
+    public long l44777;
+    public long l44778;
+    public long l44779;
+    public long l44780;
+    public long l44781;
+    public long l44782;
+    public long l44783;
+    public long l44784;
+    public long l44785;
+    public long l44786;
+    public long l44787;
+    public long l44788;
+    public long l44789;
+    public long l44790;
+    public long l44791;
+    public long l44792;
+    public long l44793;
+    public long l44794;
+    public long l44795;
+    public long l44796;
+    public long l44797;
+    public long l44798;
+    public long l44799;
+    public long l44800;
+    public long l44801;
+    public long l44802;
+    public long l44803;
+    public long l44804;
+    public long l44805;
+    public long l44806;
+    public long l44807;
+    public long l44808;
+    public long l44809;
+    public long l44810;
+    public long l44811;
+    public long l44812;
+    public long l44813;
+    public long l44814;
+    public long l44815;
+    public long l44816;
+    public long l44817;
+    public long l44818;
+    public long l44819;
+    public long l44820;
+    public long l44821;
+    public long l44822;
+    public long l44823;
+    public long l44824;
+    public long l44825;
+    public long l44826;
+    public long l44827;
+    public long l44828;
+    public long l44829;
+    public long l44830;
+    public long l44831;
+    public long l44832;
+    public long l44833;
+    public long l44834;
+    public long l44835;
+    public long l44836;
+    public long l44837;
+    public long l44838;
+    public long l44839;
+    public long l44840;
+    public long l44841;
+    public long l44842;
+    public long l44843;
+    public long l44844;
+    public long l44845;
+    public long l44846;
+    public long l44847;
+    public long l44848;
+    public long l44849;
+    public long l44850;
+    public long l44851;
+    public long l44852;
+    public long l44853;
+    public long l44854;
+    public long l44855;
+    public long l44856;
+    public long l44857;
+    public long l44858;
+    public long l44859;
+    public long l44860;
+    public long l44861;
+    public long l44862;
+    public long l44863;
+    public long l44864;
+    public long l44865;
+    public long l44866;
+    public long l44867;
+    public long l44868;
+    public long l44869;
+    public long l44870;
+    public long l44871;
+    public long l44872;
+    public long l44873;
+    public long l44874;
+    public long l44875;
+    public long l44876;
+    public long l44877;
+    public long l44878;
+    public long l44879;
+    public long l44880;
+    public long l44881;
+    public long l44882;
+    public long l44883;
+    public long l44884;
+    public long l44885;
+    public long l44886;
+    public long l44887;
+    public long l44888;
+    public long l44889;
+    public long l44890;
+    public long l44891;
+    public long l44892;
+    public long l44893;
+    public long l44894;
+    public long l44895;
+    public long l44896;
+    public long l44897;
+    public long l44898;
+    public long l44899;
+    public long l44900;
+    public long l44901;
+    public long l44902;
+    public long l44903;
+    public long l44904;
+    public long l44905;
+    public long l44906;
+    public long l44907;
+    public long l44908;
+    public long l44909;
+    public long l44910;
+    public long l44911;
+    public long l44912;
+    public long l44913;
+    public long l44914;
+    public long l44915;
+    public long l44916;
+    public long l44917;
+    public long l44918;
+    public long l44919;
+    public long l44920;
+    public long l44921;
+    public long l44922;
+    public long l44923;
+    public long l44924;
+    public long l44925;
+    public long l44926;
+    public long l44927;
+    public long l44928;
+    public long l44929;
+    public long l44930;
+    public long l44931;
+    public long l44932;
+    public long l44933;
+    public long l44934;
+    public long l44935;
+    public long l44936;
+    public long l44937;
+    public long l44938;
+    public long l44939;
+    public long l44940;
+    public long l44941;
+    public long l44942;
+    public long l44943;
+    public long l44944;
+    public long l44945;
+    public long l44946;
+    public long l44947;
+    public long l44948;
+    public long l44949;
+    public long l44950;
+    public long l44951;
+    public long l44952;
+    public long l44953;
+    public long l44954;
+    public long l44955;
+    public long l44956;
+    public long l44957;
+    public long l44958;
+    public long l44959;
+    public long l44960;
+    public long l44961;
+    public long l44962;
+    public long l44963;
+    public long l44964;
+    public long l44965;
+    public long l44966;
+    public long l44967;
+    public long l44968;
+    public long l44969;
+    public long l44970;
+    public long l44971;
+    public long l44972;
+    public long l44973;
+    public long l44974;
+    public long l44975;
+    public long l44976;
+    public long l44977;
+    public long l44978;
+    public long l44979;
+    public long l44980;
+    public long l44981;
+    public long l44982;
+    public long l44983;
+    public long l44984;
+    public long l44985;
+    public long l44986;
+    public long l44987;
+    public long l44988;
+    public long l44989;
+    public long l44990;
+    public long l44991;
+    public long l44992;
+    public long l44993;
+    public long l44994;
+    public long l44995;
+    public long l44996;
+    public long l44997;
+    public long l44998;
+    public long l44999;
+    public long l45000;
+    public long l45001;
+    public long l45002;
+    public long l45003;
+    public long l45004;
+    public long l45005;
+    public long l45006;
+    public long l45007;
+    public long l45008;
+    public long l45009;
+    public long l45010;
+    public long l45011;
+    public long l45012;
+    public long l45013;
+    public long l45014;
+    public long l45015;
+    public long l45016;
+    public long l45017;
+    public long l45018;
+    public long l45019;
+    public long l45020;
+    public long l45021;
+    public long l45022;
+    public long l45023;
+    public long l45024;
+    public long l45025;
+    public long l45026;
+    public long l45027;
+    public long l45028;
+    public long l45029;
+    public long l45030;
+    public long l45031;
+    public long l45032;
+    public long l45033;
+    public long l45034;
+    public long l45035;
+    public long l45036;
+    public long l45037;
+    public long l45038;
+    public long l45039;
+    public long l45040;
+    public long l45041;
+    public long l45042;
+    public long l45043;
+    public long l45044;
+    public long l45045;
+    public long l45046;
+    public long l45047;
+    public long l45048;
+    public long l45049;
+    public long l45050;
+    public long l45051;
+    public long l45052;
+    public long l45053;
+    public long l45054;
+    public long l45055;
+    public long l45056;
+    public long l45057;
+    public long l45058;
+    public long l45059;
+    public long l45060;
+    public long l45061;
+    public long l45062;
+    public long l45063;
+    public long l45064;
+    public long l45065;
+    public long l45066;
+    public long l45067;
+    public long l45068;
+    public long l45069;
+    public long l45070;
+    public long l45071;
+    public long l45072;
+    public long l45073;
+    public long l45074;
+    public long l45075;
+    public long l45076;
+    public long l45077;
+    public long l45078;
+    public long l45079;
+    public long l45080;
+    public long l45081;
+    public long l45082;
+    public long l45083;
+    public long l45084;
+    public long l45085;
+    public long l45086;
+    public long l45087;
+    public long l45088;
+    public long l45089;
+    public long l45090;
+    public long l45091;
+    public long l45092;
+    public long l45093;
+    public long l45094;
+    public long l45095;
+    public long l45096;
+    public long l45097;
+    public long l45098;
+    public long l45099;
+    public long l45100;
+    public long l45101;
+    public long l45102;
+    public long l45103;
+    public long l45104;
+    public long l45105;
+    public long l45106;
+    public long l45107;
+    public long l45108;
+    public long l45109;
+    public long l45110;
+    public long l45111;
+    public long l45112;
+    public long l45113;
+    public long l45114;
+    public long l45115;
+    public long l45116;
+    public long l45117;
+    public long l45118;
+    public long l45119;
+    public long l45120;
+    public long l45121;
+    public long l45122;
+    public long l45123;
+    public long l45124;
+    public long l45125;
+    public long l45126;
+    public long l45127;
+    public long l45128;
+    public long l45129;
+    public long l45130;
+    public long l45131;
+    public long l45132;
+    public long l45133;
+    public long l45134;
+    public long l45135;
+    public long l45136;
+    public long l45137;
+    public long l45138;
+    public long l45139;
+    public long l45140;
+    public long l45141;
+    public long l45142;
+    public long l45143;
+    public long l45144;
+    public long l45145;
+    public long l45146;
+    public long l45147;
+    public long l45148;
+    public long l45149;
+    public long l45150;
+    public long l45151;
+    public long l45152;
+    public long l45153;
+    public long l45154;
+    public long l45155;
+    public long l45156;
+    public long l45157;
+    public long l45158;
+    public long l45159;
+    public long l45160;
+    public long l45161;
+    public long l45162;
+    public long l45163;
+    public long l45164;
+    public long l45165;
+    public long l45166;
+    public long l45167;
+    public long l45168;
+    public long l45169;
+    public long l45170;
+    public long l45171;
+    public long l45172;
+    public long l45173;
+    public long l45174;
+    public long l45175;
+    public long l45176;
+    public long l45177;
+    public long l45178;
+    public long l45179;
+    public long l45180;
+    public long l45181;
+    public long l45182;
+    public long l45183;
+    public long l45184;
+    public long l45185;
+    public long l45186;
+    public long l45187;
+    public long l45188;
+    public long l45189;
+    public long l45190;
+    public long l45191;
+    public long l45192;
+    public long l45193;
+    public long l45194;
+    public long l45195;
+    public long l45196;
+    public long l45197;
+    public long l45198;
+    public long l45199;
+    public long l45200;
+    public long l45201;
+    public long l45202;
+    public long l45203;
+    public long l45204;
+    public long l45205;
+    public long l45206;
+    public long l45207;
+    public long l45208;
+    public long l45209;
+    public long l45210;
+    public long l45211;
+    public long l45212;
+    public long l45213;
+    public long l45214;
+    public long l45215;
+    public long l45216;
+    public long l45217;
+    public long l45218;
+    public long l45219;
+    public long l45220;
+    public long l45221;
+    public long l45222;
+    public long l45223;
+    public long l45224;
+    public long l45225;
+    public long l45226;
+    public long l45227;
+    public long l45228;
+    public long l45229;
+    public long l45230;
+    public long l45231;
+    public long l45232;
+    public long l45233;
+    public long l45234;
+    public long l45235;
+    public long l45236;
+    public long l45237;
+    public long l45238;
+    public long l45239;
+    public long l45240;
+    public long l45241;
+    public long l45242;
+    public long l45243;
+    public long l45244;
+    public long l45245;
+    public long l45246;
+    public long l45247;
+    public long l45248;
+    public long l45249;
+    public long l45250;
+    public long l45251;
+    public long l45252;
+    public long l45253;
+    public long l45254;
+    public long l45255;
+    public long l45256;
+    public long l45257;
+    public long l45258;
+    public long l45259;
+    public long l45260;
+    public long l45261;
+    public long l45262;
+    public long l45263;
+    public long l45264;
+    public long l45265;
+    public long l45266;
+    public long l45267;
+    public long l45268;
+    public long l45269;
+    public long l45270;
+    public long l45271;
+    public long l45272;
+    public long l45273;
+    public long l45274;
+    public long l45275;
+    public long l45276;
+    public long l45277;
+    public long l45278;
+    public long l45279;
+    public long l45280;
+    public long l45281;
+    public long l45282;
+    public long l45283;
+    public long l45284;
+    public long l45285;
+    public long l45286;
+    public long l45287;
+    public long l45288;
+    public long l45289;
+    public long l45290;
+    public long l45291;
+    public long l45292;
+    public long l45293;
+    public long l45294;
+    public long l45295;
+    public long l45296;
+    public long l45297;
+    public long l45298;
+    public long l45299;
+    public long l45300;
+    public long l45301;
+    public long l45302;
+    public long l45303;
+    public long l45304;
+    public long l45305;
+    public long l45306;
+    public long l45307;
+    public long l45308;
+    public long l45309;
+    public long l45310;
+    public long l45311;
+    public long l45312;
+    public long l45313;
+    public long l45314;
+    public long l45315;
+    public long l45316;
+    public long l45317;
+    public long l45318;
+    public long l45319;
+    public long l45320;
+    public long l45321;
+    public long l45322;
+    public long l45323;
+    public long l45324;
+    public long l45325;
+    public long l45326;
+    public long l45327;
+    public long l45328;
+    public long l45329;
+    public long l45330;
+    public long l45331;
+    public long l45332;
+    public long l45333;
+    public long l45334;
+    public long l45335;
+    public long l45336;
+    public long l45337;
+    public long l45338;
+    public long l45339;
+    public long l45340;
+    public long l45341;
+    public long l45342;
+    public long l45343;
+    public long l45344;
+    public long l45345;
+    public long l45346;
+    public long l45347;
+    public long l45348;
+    public long l45349;
+    public long l45350;
+    public long l45351;
+    public long l45352;
+    public long l45353;
+    public long l45354;
+    public long l45355;
+    public long l45356;
+    public long l45357;
+    public long l45358;
+    public long l45359;
+    public long l45360;
+    public long l45361;
+    public long l45362;
+    public long l45363;
+    public long l45364;
+    public long l45365;
+    public long l45366;
+    public long l45367;
+    public long l45368;
+    public long l45369;
+    public long l45370;
+    public long l45371;
+    public long l45372;
+    public long l45373;
+    public long l45374;
+    public long l45375;
+    public long l45376;
+    public long l45377;
+    public long l45378;
+    public long l45379;
+    public long l45380;
+    public long l45381;
+    public long l45382;
+    public long l45383;
+    public long l45384;
+    public long l45385;
+    public long l45386;
+    public long l45387;
+    public long l45388;
+    public long l45389;
+    public long l45390;
+    public long l45391;
+    public long l45392;
+    public long l45393;
+    public long l45394;
+    public long l45395;
+    public long l45396;
+    public long l45397;
+    public long l45398;
+    public long l45399;
+    public long l45400;
+    public long l45401;
+    public long l45402;
+    public long l45403;
+    public long l45404;
+    public long l45405;
+    public long l45406;
+    public long l45407;
+    public long l45408;
+    public long l45409;
+    public long l45410;
+    public long l45411;
+    public long l45412;
+    public long l45413;
+    public long l45414;
+    public long l45415;
+    public long l45416;
+    public long l45417;
+    public long l45418;
+    public long l45419;
+    public long l45420;
+    public long l45421;
+    public long l45422;
+    public long l45423;
+    public long l45424;
+    public long l45425;
+    public long l45426;
+    public long l45427;
+    public long l45428;
+    public long l45429;
+    public long l45430;
+    public long l45431;
+    public long l45432;
+    public long l45433;
+    public long l45434;
+    public long l45435;
+    public long l45436;
+    public long l45437;
+    public long l45438;
+    public long l45439;
+    public long l45440;
+    public long l45441;
+    public long l45442;
+    public long l45443;
+    public long l45444;
+    public long l45445;
+    public long l45446;
+    public long l45447;
+    public long l45448;
+    public long l45449;
+    public long l45450;
+    public long l45451;
+    public long l45452;
+    public long l45453;
+    public long l45454;
+    public long l45455;
+    public long l45456;
+    public long l45457;
+    public long l45458;
+    public long l45459;
+    public long l45460;
+    public long l45461;
+    public long l45462;
+    public long l45463;
+    public long l45464;
+    public long l45465;
+    public long l45466;
+    public long l45467;
+    public long l45468;
+    public long l45469;
+    public long l45470;
+    public long l45471;
+    public long l45472;
+    public long l45473;
+    public long l45474;
+    public long l45475;
+    public long l45476;
+    public long l45477;
+    public long l45478;
+    public long l45479;
+    public long l45480;
+    public long l45481;
+    public long l45482;
+    public long l45483;
+    public long l45484;
+    public long l45485;
+    public long l45486;
+    public long l45487;
+    public long l45488;
+    public long l45489;
+    public long l45490;
+    public long l45491;
+    public long l45492;
+    public long l45493;
+    public long l45494;
+    public long l45495;
+    public long l45496;
+    public long l45497;
+    public long l45498;
+    public long l45499;
+    public long l45500;
+    public long l45501;
+    public long l45502;
+    public long l45503;
+    public long l45504;
+    public long l45505;
+    public long l45506;
+    public long l45507;
+    public long l45508;
+    public long l45509;
+    public long l45510;
+    public long l45511;
+    public long l45512;
+    public long l45513;
+    public long l45514;
+    public long l45515;
+    public long l45516;
+    public long l45517;
+    public long l45518;
+    public long l45519;
+    public long l45520;
+    public long l45521;
+    public long l45522;
+    public long l45523;
+    public long l45524;
+    public long l45525;
+    public long l45526;
+    public long l45527;
+    public long l45528;
+    public long l45529;
+    public long l45530;
+    public long l45531;
+    public long l45532;
+    public long l45533;
+    public long l45534;
+    public long l45535;
+    public long l45536;
+    public long l45537;
+    public long l45538;
+    public long l45539;
+    public long l45540;
+    public long l45541;
+    public long l45542;
+    public long l45543;
+    public long l45544;
+    public long l45545;
+    public long l45546;
+    public long l45547;
+    public long l45548;
+    public long l45549;
+    public long l45550;
+    public long l45551;
+    public long l45552;
+    public long l45553;
+    public long l45554;
+    public long l45555;
+    public long l45556;
+    public long l45557;
+    public long l45558;
+    public long l45559;
+    public long l45560;
+    public long l45561;
+    public long l45562;
+    public long l45563;
+    public long l45564;
+    public long l45565;
+    public long l45566;
+    public long l45567;
+    public long l45568;
+    public long l45569;
+    public long l45570;
+    public long l45571;
+    public long l45572;
+    public long l45573;
+    public long l45574;
+    public long l45575;
+    public long l45576;
+    public long l45577;
+    public long l45578;
+    public long l45579;
+    public long l45580;
+    public long l45581;
+    public long l45582;
+    public long l45583;
+    public long l45584;
+    public long l45585;
+    public long l45586;
+    public long l45587;
+    public long l45588;
+    public long l45589;
+    public long l45590;
+    public long l45591;
+    public long l45592;
+    public long l45593;
+    public long l45594;
+    public long l45595;
+    public long l45596;
+    public long l45597;
+    public long l45598;
+    public long l45599;
+    public long l45600;
+    public long l45601;
+    public long l45602;
+    public long l45603;
+    public long l45604;
+    public long l45605;
+    public long l45606;
+    public long l45607;
+    public long l45608;
+    public long l45609;
+    public long l45610;
+    public long l45611;
+    public long l45612;
+    public long l45613;
+    public long l45614;
+    public long l45615;
+    public long l45616;
+    public long l45617;
+    public long l45618;
+    public long l45619;
+    public long l45620;
+    public long l45621;
+    public long l45622;
+    public long l45623;
+    public long l45624;
+    public long l45625;
+    public long l45626;
+    public long l45627;
+    public long l45628;
+    public long l45629;
+    public long l45630;
+    public long l45631;
+    public long l45632;
+    public long l45633;
+    public long l45634;
+    public long l45635;
+    public long l45636;
+    public long l45637;
+    public long l45638;
+    public long l45639;
+    public long l45640;
+    public long l45641;
+    public long l45642;
+    public long l45643;
+    public long l45644;
+    public long l45645;
+    public long l45646;
+    public long l45647;
+    public long l45648;
+    public long l45649;
+    public long l45650;
+    public long l45651;
+    public long l45652;
+    public long l45653;
+    public long l45654;
+    public long l45655;
+    public long l45656;
+    public long l45657;
+    public long l45658;
+    public long l45659;
+    public long l45660;
+    public long l45661;
+    public long l45662;
+    public long l45663;
+    public long l45664;
+    public long l45665;
+    public long l45666;
+    public long l45667;
+    public long l45668;
+    public long l45669;
+    public long l45670;
+    public long l45671;
+    public long l45672;
+    public long l45673;
+    public long l45674;
+    public long l45675;
+    public long l45676;
+    public long l45677;
+    public long l45678;
+    public long l45679;
+    public long l45680;
+    public long l45681;
+    public long l45682;
+    public long l45683;
+    public long l45684;
+    public long l45685;
+    public long l45686;
+    public long l45687;
+    public long l45688;
+    public long l45689;
+    public long l45690;
+    public long l45691;
+    public long l45692;
+    public long l45693;
+    public long l45694;
+    public long l45695;
+    public long l45696;
+    public long l45697;
+    public long l45698;
+    public long l45699;
+    public long l45700;
+    public long l45701;
+    public long l45702;
+    public long l45703;
+    public long l45704;
+    public long l45705;
+    public long l45706;
+    public long l45707;
+    public long l45708;
+    public long l45709;
+    public long l45710;
+    public long l45711;
+    public long l45712;
+    public long l45713;
+    public long l45714;
+    public long l45715;
+    public long l45716;
+    public long l45717;
+    public long l45718;
+    public long l45719;
+    public long l45720;
+    public long l45721;
+    public long l45722;
+    public long l45723;
+    public long l45724;
+    public long l45725;
+    public long l45726;
+    public long l45727;
+    public long l45728;
+    public long l45729;
+    public long l45730;
+    public long l45731;
+    public long l45732;
+    public long l45733;
+    public long l45734;
+    public long l45735;
+    public long l45736;
+    public long l45737;
+    public long l45738;
+    public long l45739;
+    public long l45740;
+    public long l45741;
+    public long l45742;
+    public long l45743;
+    public long l45744;
+    public long l45745;
+    public long l45746;
+    public long l45747;
+    public long l45748;
+    public long l45749;
+    public long l45750;
+    public long l45751;
+    public long l45752;
+    public long l45753;
+    public long l45754;
+    public long l45755;
+    public long l45756;
+    public long l45757;
+    public long l45758;
+    public long l45759;
+    public long l45760;
+    public long l45761;
+    public long l45762;
+    public long l45763;
+    public long l45764;
+    public long l45765;
+    public long l45766;
+    public long l45767;
+    public long l45768;
+    public long l45769;
+    public long l45770;
+    public long l45771;
+    public long l45772;
+    public long l45773;
+    public long l45774;
+    public long l45775;
+    public long l45776;
+    public long l45777;
+    public long l45778;
+    public long l45779;
+    public long l45780;
+    public long l45781;
+    public long l45782;
+    public long l45783;
+    public long l45784;
+    public long l45785;
+    public long l45786;
+    public long l45787;
+    public long l45788;
+    public long l45789;
+    public long l45790;
+    public long l45791;
+    public long l45792;
+    public long l45793;
+    public long l45794;
+    public long l45795;
+    public long l45796;
+    public long l45797;
+    public long l45798;
+    public long l45799;
+    public long l45800;
+    public long l45801;
+    public long l45802;
+    public long l45803;
+    public long l45804;
+    public long l45805;
+    public long l45806;
+    public long l45807;
+    public long l45808;
+    public long l45809;
+    public long l45810;
+    public long l45811;
+    public long l45812;
+    public long l45813;
+    public long l45814;
+    public long l45815;
+    public long l45816;
+    public long l45817;
+    public long l45818;
+    public long l45819;
+    public long l45820;
+    public long l45821;
+    public long l45822;
+    public long l45823;
+    public long l45824;
+    public long l45825;
+    public long l45826;
+    public long l45827;
+    public long l45828;
+    public long l45829;
+    public long l45830;
+    public long l45831;
+    public long l45832;
+    public long l45833;
+    public long l45834;
+    public long l45835;
+    public long l45836;
+    public long l45837;
+    public long l45838;
+    public long l45839;
+    public long l45840;
+    public long l45841;
+    public long l45842;
+    public long l45843;
+    public long l45844;
+    public long l45845;
+    public long l45846;
+    public long l45847;
+    public long l45848;
+    public long l45849;
+    public long l45850;
+    public long l45851;
+    public long l45852;
+    public long l45853;
+    public long l45854;
+    public long l45855;
+    public long l45856;
+    public long l45857;
+    public long l45858;
+    public long l45859;
+    public long l45860;
+    public long l45861;
+    public long l45862;
+    public long l45863;
+    public long l45864;
+    public long l45865;
+    public long l45866;
+    public long l45867;
+    public long l45868;
+    public long l45869;
+    public long l45870;
+    public long l45871;
+    public long l45872;
+    public long l45873;
+    public long l45874;
+    public long l45875;
+    public long l45876;
+    public long l45877;
+    public long l45878;
+    public long l45879;
+    public long l45880;
+    public long l45881;
+    public long l45882;
+    public long l45883;
+    public long l45884;
+    public long l45885;
+    public long l45886;
+    public long l45887;
+    public long l45888;
+    public long l45889;
+    public long l45890;
+    public long l45891;
+    public long l45892;
+    public long l45893;
+    public long l45894;
+    public long l45895;
+    public long l45896;
+    public long l45897;
+    public long l45898;
+    public long l45899;
+    public long l45900;
+    public long l45901;
+    public long l45902;
+    public long l45903;
+    public long l45904;
+    public long l45905;
+    public long l45906;
+    public long l45907;
+    public long l45908;
+    public long l45909;
+    public long l45910;
+    public long l45911;
+    public long l45912;
+    public long l45913;
+    public long l45914;
+    public long l45915;
+    public long l45916;
+    public long l45917;
+    public long l45918;
+    public long l45919;
+    public long l45920;
+    public long l45921;
+    public long l45922;
+    public long l45923;
+    public long l45924;
+    public long l45925;
+    public long l45926;
+    public long l45927;
+    public long l45928;
+    public long l45929;
+    public long l45930;
+    public long l45931;
+    public long l45932;
+    public long l45933;
+    public long l45934;
+    public long l45935;
+    public long l45936;
+    public long l45937;
+    public long l45938;
+    public long l45939;
+    public long l45940;
+    public long l45941;
+    public long l45942;
+    public long l45943;
+    public long l45944;
+    public long l45945;
+    public long l45946;
+    public long l45947;
+    public long l45948;
+    public long l45949;
+    public long l45950;
+    public long l45951;
+    public long l45952;
+    public long l45953;
+    public long l45954;
+    public long l45955;
+    public long l45956;
+    public long l45957;
+    public long l45958;
+    public long l45959;
+    public long l45960;
+    public long l45961;
+    public long l45962;
+    public long l45963;
+    public long l45964;
+    public long l45965;
+    public long l45966;
+    public long l45967;
+    public long l45968;
+    public long l45969;
+    public long l45970;
+    public long l45971;
+    public long l45972;
+    public long l45973;
+    public long l45974;
+    public long l45975;
+    public long l45976;
+    public long l45977;
+    public long l45978;
+    public long l45979;
+    public long l45980;
+    public long l45981;
+    public long l45982;
+    public long l45983;
+    public long l45984;
+    public long l45985;
+    public long l45986;
+    public long l45987;
+    public long l45988;
+    public long l45989;
+    public long l45990;
+    public long l45991;
+    public long l45992;
+    public long l45993;
+    public long l45994;
+    public long l45995;
+    public long l45996;
+    public long l45997;
+    public long l45998;
+    public long l45999;
+    public long l46000;
+    public long l46001;
+    public long l46002;
+    public long l46003;
+    public long l46004;
+    public long l46005;
+    public long l46006;
+    public long l46007;
+    public long l46008;
+    public long l46009;
+    public long l46010;
+    public long l46011;
+    public long l46012;
+    public long l46013;
+    public long l46014;
+    public long l46015;
+    public long l46016;
+    public long l46017;
+    public long l46018;
+    public long l46019;
+    public long l46020;
+    public long l46021;
+    public long l46022;
+    public long l46023;
+    public long l46024;
+    public long l46025;
+    public long l46026;
+    public long l46027;
+    public long l46028;
+    public long l46029;
+    public long l46030;
+    public long l46031;
+    public long l46032;
+    public long l46033;
+    public long l46034;
+    public long l46035;
+    public long l46036;
+    public long l46037;
+    public long l46038;
+    public long l46039;
+    public long l46040;
+    public long l46041;
+    public long l46042;
+    public long l46043;
+    public long l46044;
+    public long l46045;
+    public long l46046;
+    public long l46047;
+    public long l46048;
+    public long l46049;
+    public long l46050;
+    public long l46051;
+    public long l46052;
+    public long l46053;
+    public long l46054;
+    public long l46055;
+    public long l46056;
+    public long l46057;
+    public long l46058;
+    public long l46059;
+    public long l46060;
+    public long l46061;
+    public long l46062;
+    public long l46063;
+    public long l46064;
+    public long l46065;
+    public long l46066;
+    public long l46067;
+    public long l46068;
+    public long l46069;
+    public long l46070;
+    public long l46071;
+    public long l46072;
+    public long l46073;
+    public long l46074;
+    public long l46075;
+    public long l46076;
+    public long l46077;
+    public long l46078;
+    public long l46079;
+    public long l46080;
+    public long l46081;
+    public long l46082;
+    public long l46083;
+    public long l46084;
+    public long l46085;
+    public long l46086;
+    public long l46087;
+    public long l46088;
+    public long l46089;
+    public long l46090;
+    public long l46091;
+    public long l46092;
+    public long l46093;
+    public long l46094;
+    public long l46095;
+    public long l46096;
+    public long l46097;
+    public long l46098;
+    public long l46099;
+    public long l46100;
+    public long l46101;
+    public long l46102;
+    public long l46103;
+    public long l46104;
+    public long l46105;
+    public long l46106;
+    public long l46107;
+    public long l46108;
+    public long l46109;
+    public long l46110;
+    public long l46111;
+    public long l46112;
+    public long l46113;
+    public long l46114;
+    public long l46115;
+    public long l46116;
+    public long l46117;
+    public long l46118;
+    public long l46119;
+    public long l46120;
+    public long l46121;
+    public long l46122;
+    public long l46123;
+    public long l46124;
+    public long l46125;
+    public long l46126;
+    public long l46127;
+    public long l46128;
+    public long l46129;
+    public long l46130;
+    public long l46131;
+    public long l46132;
+    public long l46133;
+    public long l46134;
+    public long l46135;
+    public long l46136;
+    public long l46137;
+    public long l46138;
+    public long l46139;
+    public long l46140;
+    public long l46141;
+    public long l46142;
+    public long l46143;
+    public long l46144;
+    public long l46145;
+    public long l46146;
+    public long l46147;
+    public long l46148;
+    public long l46149;
+    public long l46150;
+    public long l46151;
+    public long l46152;
+    public long l46153;
+    public long l46154;
+    public long l46155;
+    public long l46156;
+    public long l46157;
+    public long l46158;
+    public long l46159;
+    public long l46160;
+    public long l46161;
+    public long l46162;
+    public long l46163;
+    public long l46164;
+    public long l46165;
+    public long l46166;
+    public long l46167;
+    public long l46168;
+    public long l46169;
+    public long l46170;
+    public long l46171;
+    public long l46172;
+    public long l46173;
+    public long l46174;
+    public long l46175;
+    public long l46176;
+    public long l46177;
+    public long l46178;
+    public long l46179;
+    public long l46180;
+    public long l46181;
+    public long l46182;
+    public long l46183;
+    public long l46184;
+    public long l46185;
+    public long l46186;
+    public long l46187;
+    public long l46188;
+    public long l46189;
+    public long l46190;
+    public long l46191;
+    public long l46192;
+    public long l46193;
+    public long l46194;
+    public long l46195;
+    public long l46196;
+    public long l46197;
+    public long l46198;
+    public long l46199;
+    public long l46200;
+    public long l46201;
+    public long l46202;
+    public long l46203;
+    public long l46204;
+    public long l46205;
+    public long l46206;
+    public long l46207;
+    public long l46208;
+    public long l46209;
+    public long l46210;
+    public long l46211;
+    public long l46212;
+    public long l46213;
+    public long l46214;
+    public long l46215;
+    public long l46216;
+    public long l46217;
+    public long l46218;
+    public long l46219;
+    public long l46220;
+    public long l46221;
+    public long l46222;
+    public long l46223;
+    public long l46224;
+    public long l46225;
+    public long l46226;
+    public long l46227;
+    public long l46228;
+    public long l46229;
+    public long l46230;
+    public long l46231;
+    public long l46232;
+    public long l46233;
+    public long l46234;
+    public long l46235;
+    public long l46236;
+    public long l46237;
+    public long l46238;
+    public long l46239;
+    public long l46240;
+    public long l46241;
+    public long l46242;
+    public long l46243;
+    public long l46244;
+    public long l46245;
+    public long l46246;
+    public long l46247;
+    public long l46248;
+    public long l46249;
+    public long l46250;
+    public long l46251;
+    public long l46252;
+    public long l46253;
+    public long l46254;
+    public long l46255;
+    public long l46256;
+    public long l46257;
+    public long l46258;
+    public long l46259;
+    public long l46260;
+    public long l46261;
+    public long l46262;
+    public long l46263;
+    public long l46264;
+    public long l46265;
+    public long l46266;
+    public long l46267;
+    public long l46268;
+    public long l46269;
+    public long l46270;
+    public long l46271;
+    public long l46272;
+    public long l46273;
+    public long l46274;
+    public long l46275;
+    public long l46276;
+    public long l46277;
+    public long l46278;
+    public long l46279;
+    public long l46280;
+    public long l46281;
+    public long l46282;
+    public long l46283;
+    public long l46284;
+    public long l46285;
+    public long l46286;
+    public long l46287;
+    public long l46288;
+    public long l46289;
+    public long l46290;
+    public long l46291;
+    public long l46292;
+    public long l46293;
+    public long l46294;
+    public long l46295;
+    public long l46296;
+    public long l46297;
+    public long l46298;
+    public long l46299;
+    public long l46300;
+    public long l46301;
+    public long l46302;
+    public long l46303;
+    public long l46304;
+    public long l46305;
+    public long l46306;
+    public long l46307;
+    public long l46308;
+    public long l46309;
+    public long l46310;
+    public long l46311;
+    public long l46312;
+    public long l46313;
+    public long l46314;
+    public long l46315;
+    public long l46316;
+    public long l46317;
+    public long l46318;
+    public long l46319;
+    public long l46320;
+    public long l46321;
+    public long l46322;
+    public long l46323;
+    public long l46324;
+    public long l46325;
+    public long l46326;
+    public long l46327;
+    public long l46328;
+    public long l46329;
+    public long l46330;
+    public long l46331;
+    public long l46332;
+    public long l46333;
+    public long l46334;
+    public long l46335;
+    public long l46336;
+    public long l46337;
+    public long l46338;
+    public long l46339;
+    public long l46340;
+    public long l46341;
+    public long l46342;
+    public long l46343;
+    public long l46344;
+    public long l46345;
+    public long l46346;
+    public long l46347;
+    public long l46348;
+    public long l46349;
+    public long l46350;
+    public long l46351;
+    public long l46352;
+    public long l46353;
+    public long l46354;
+    public long l46355;
+    public long l46356;
+    public long l46357;
+    public long l46358;
+    public long l46359;
+    public long l46360;
+    public long l46361;
+    public long l46362;
+    public long l46363;
+    public long l46364;
+    public long l46365;
+    public long l46366;
+    public long l46367;
+    public long l46368;
+    public long l46369;
+    public long l46370;
+    public long l46371;
+    public long l46372;
+    public long l46373;
+    public long l46374;
+    public long l46375;
+    public long l46376;
+    public long l46377;
+    public long l46378;
+    public long l46379;
+    public long l46380;
+    public long l46381;
+    public long l46382;
+    public long l46383;
+    public long l46384;
+    public long l46385;
+    public long l46386;
+    public long l46387;
+    public long l46388;
+    public long l46389;
+    public long l46390;
+    public long l46391;
+    public long l46392;
+    public long l46393;
+    public long l46394;
+    public long l46395;
+    public long l46396;
+    public long l46397;
+    public long l46398;
+    public long l46399;
+    public long l46400;
+    public long l46401;
+    public long l46402;
+    public long l46403;
+    public long l46404;
+    public long l46405;
+    public long l46406;
+    public long l46407;
+    public long l46408;
+    public long l46409;
+    public long l46410;
+    public long l46411;
+    public long l46412;
+    public long l46413;
+    public long l46414;
+    public long l46415;
+    public long l46416;
+    public long l46417;
+    public long l46418;
+    public long l46419;
+    public long l46420;
+    public long l46421;
+    public long l46422;
+    public long l46423;
+    public long l46424;
+    public long l46425;
+    public long l46426;
+    public long l46427;
+    public long l46428;
+    public long l46429;
+    public long l46430;
+    public long l46431;
+    public long l46432;
+    public long l46433;
+    public long l46434;
+    public long l46435;
+    public long l46436;
+    public long l46437;
+    public long l46438;
+    public long l46439;
+    public long l46440;
+    public long l46441;
+    public long l46442;
+    public long l46443;
+    public long l46444;
+    public long l46445;
+    public long l46446;
+    public long l46447;
+    public long l46448;
+    public long l46449;
+    public long l46450;
+    public long l46451;
+    public long l46452;
+    public long l46453;
+    public long l46454;
+    public long l46455;
+    public long l46456;
+    public long l46457;
+    public long l46458;
+    public long l46459;
+    public long l46460;
+    public long l46461;
+    public long l46462;
+    public long l46463;
+    public long l46464;
+    public long l46465;
+    public long l46466;
+    public long l46467;
+    public long l46468;
+    public long l46469;
+    public long l46470;
+    public long l46471;
+    public long l46472;
+    public long l46473;
+    public long l46474;
+    public long l46475;
+    public long l46476;
+    public long l46477;
+    public long l46478;
+    public long l46479;
+    public long l46480;
+    public long l46481;
+    public long l46482;
+    public long l46483;
+    public long l46484;
+    public long l46485;
+    public long l46486;
+    public long l46487;
+    public long l46488;
+    public long l46489;
+    public long l46490;
+    public long l46491;
+    public long l46492;
+    public long l46493;
+    public long l46494;
+    public long l46495;
+    public long l46496;
+    public long l46497;
+    public long l46498;
+    public long l46499;
+    public long l46500;
+    public long l46501;
+    public long l46502;
+    public long l46503;
+    public long l46504;
+    public long l46505;
+    public long l46506;
+    public long l46507;
+    public long l46508;
+    public long l46509;
+    public long l46510;
+    public long l46511;
+    public long l46512;
+    public long l46513;
+    public long l46514;
+    public long l46515;
+    public long l46516;
+    public long l46517;
+    public long l46518;
+    public long l46519;
+    public long l46520;
+    public long l46521;
+    public long l46522;
+    public long l46523;
+    public long l46524;
+    public long l46525;
+    public long l46526;
+    public long l46527;
+    public long l46528;
+    public long l46529;
+    public long l46530;
+    public long l46531;
+    public long l46532;
+    public long l46533;
+    public long l46534;
+    public long l46535;
+    public long l46536;
+    public long l46537;
+    public long l46538;
+    public long l46539;
+    public long l46540;
+    public long l46541;
+    public long l46542;
+    public long l46543;
+    public long l46544;
+    public long l46545;
+    public long l46546;
+    public long l46547;
+    public long l46548;
+    public long l46549;
+    public long l46550;
+    public long l46551;
+    public long l46552;
+    public long l46553;
+    public long l46554;
+    public long l46555;
+    public long l46556;
+    public long l46557;
+    public long l46558;
+    public long l46559;
+    public long l46560;
+    public long l46561;
+    public long l46562;
+    public long l46563;
+    public long l46564;
+    public long l46565;
+    public long l46566;
+    public long l46567;
+    public long l46568;
+    public long l46569;
+    public long l46570;
+    public long l46571;
+    public long l46572;
+    public long l46573;
+    public long l46574;
+    public long l46575;
+    public long l46576;
+    public long l46577;
+    public long l46578;
+    public long l46579;
+    public long l46580;
+    public long l46581;
+    public long l46582;
+    public long l46583;
+    public long l46584;
+    public long l46585;
+    public long l46586;
+    public long l46587;
+    public long l46588;
+    public long l46589;
+    public long l46590;
+    public long l46591;
+    public long l46592;
+    public long l46593;
+    public long l46594;
+    public long l46595;
+    public long l46596;
+    public long l46597;
+    public long l46598;
+    public long l46599;
+    public long l46600;
+    public long l46601;
+    public long l46602;
+    public long l46603;
+    public long l46604;
+    public long l46605;
+    public long l46606;
+    public long l46607;
+    public long l46608;
+    public long l46609;
+    public long l46610;
+    public long l46611;
+    public long l46612;
+    public long l46613;
+    public long l46614;
+    public long l46615;
+    public long l46616;
+    public long l46617;
+    public long l46618;
+    public long l46619;
+    public long l46620;
+    public long l46621;
+    public long l46622;
+    public long l46623;
+    public long l46624;
+    public long l46625;
+    public long l46626;
+    public long l46627;
+    public long l46628;
+    public long l46629;
+    public long l46630;
+    public long l46631;
+    public long l46632;
+    public long l46633;
+    public long l46634;
+    public long l46635;
+    public long l46636;
+    public long l46637;
+    public long l46638;
+    public long l46639;
+    public long l46640;
+    public long l46641;
+    public long l46642;
+    public long l46643;
+    public long l46644;
+    public long l46645;
+    public long l46646;
+    public long l46647;
+    public long l46648;
+    public long l46649;
+    public long l46650;
+    public long l46651;
+    public long l46652;
+    public long l46653;
+    public long l46654;
+    public long l46655;
+    public long l46656;
+    public long l46657;
+    public long l46658;
+    public long l46659;
+    public long l46660;
+    public long l46661;
+    public long l46662;
+    public long l46663;
+    public long l46664;
+    public long l46665;
+    public long l46666;
+    public long l46667;
+    public long l46668;
+    public long l46669;
+    public long l46670;
+    public long l46671;
+    public long l46672;
+    public long l46673;
+    public long l46674;
+    public long l46675;
+    public long l46676;
+    public long l46677;
+    public long l46678;
+    public long l46679;
+    public long l46680;
+    public long l46681;
+    public long l46682;
+    public long l46683;
+    public long l46684;
+    public long l46685;
+    public long l46686;
+    public long l46687;
+    public long l46688;
+    public long l46689;
+    public long l46690;
+    public long l46691;
+    public long l46692;
+    public long l46693;
+    public long l46694;
+    public long l46695;
+    public long l46696;
+    public long l46697;
+    public long l46698;
+    public long l46699;
+    public long l46700;
+    public long l46701;
+    public long l46702;
+    public long l46703;
+    public long l46704;
+    public long l46705;
+    public long l46706;
+    public long l46707;
+    public long l46708;
+    public long l46709;
+    public long l46710;
+    public long l46711;
+    public long l46712;
+    public long l46713;
+    public long l46714;
+    public long l46715;
+    public long l46716;
+    public long l46717;
+    public long l46718;
+    public long l46719;
+    public long l46720;
+    public long l46721;
+    public long l46722;
+    public long l46723;
+    public long l46724;
+    public long l46725;
+    public long l46726;
+    public long l46727;
+    public long l46728;
+    public long l46729;
+    public long l46730;
+    public long l46731;
+    public long l46732;
+    public long l46733;
+    public long l46734;
+    public long l46735;
+    public long l46736;
+    public long l46737;
+    public long l46738;
+    public long l46739;
+    public long l46740;
+    public long l46741;
+    public long l46742;
+    public long l46743;
+    public long l46744;
+    public long l46745;
+    public long l46746;
+    public long l46747;
+    public long l46748;
+    public long l46749;
+    public long l46750;
+    public long l46751;
+    public long l46752;
+    public long l46753;
+    public long l46754;
+    public long l46755;
+    public long l46756;
+    public long l46757;
+    public long l46758;
+    public long l46759;
+    public long l46760;
+    public long l46761;
+    public long l46762;
+    public long l46763;
+    public long l46764;
+    public long l46765;
+    public long l46766;
+    public long l46767;
+    public long l46768;
+    public long l46769;
+    public long l46770;
+    public long l46771;
+    public long l46772;
+    public long l46773;
+    public long l46774;
+    public long l46775;
+    public long l46776;
+    public long l46777;
+    public long l46778;
+    public long l46779;
+    public long l46780;
+    public long l46781;
+    public long l46782;
+    public long l46783;
+    public long l46784;
+    public long l46785;
+    public long l46786;
+    public long l46787;
+    public long l46788;
+    public long l46789;
+    public long l46790;
+    public long l46791;
+    public long l46792;
+    public long l46793;
+    public long l46794;
+    public long l46795;
+    public long l46796;
+    public long l46797;
+    public long l46798;
+    public long l46799;
+    public long l46800;
+    public long l46801;
+    public long l46802;
+    public long l46803;
+    public long l46804;
+    public long l46805;
+    public long l46806;
+    public long l46807;
+    public long l46808;
+    public long l46809;
+    public long l46810;
+    public long l46811;
+    public long l46812;
+    public long l46813;
+    public long l46814;
+    public long l46815;
+    public long l46816;
+    public long l46817;
+    public long l46818;
+    public long l46819;
+    public long l46820;
+    public long l46821;
+    public long l46822;
+    public long l46823;
+    public long l46824;
+    public long l46825;
+    public long l46826;
+    public long l46827;
+    public long l46828;
+    public long l46829;
+    public long l46830;
+    public long l46831;
+    public long l46832;
+    public long l46833;
+    public long l46834;
+    public long l46835;
+    public long l46836;
+    public long l46837;
+    public long l46838;
+    public long l46839;
+    public long l46840;
+    public long l46841;
+    public long l46842;
+    public long l46843;
+    public long l46844;
+    public long l46845;
+    public long l46846;
+    public long l46847;
+    public long l46848;
+    public long l46849;
+    public long l46850;
+    public long l46851;
+    public long l46852;
+    public long l46853;
+    public long l46854;
+    public long l46855;
+    public long l46856;
+    public long l46857;
+    public long l46858;
+    public long l46859;
+    public long l46860;
+    public long l46861;
+    public long l46862;
+    public long l46863;
+    public long l46864;
+    public long l46865;
+    public long l46866;
+    public long l46867;
+    public long l46868;
+    public long l46869;
+    public long l46870;
+    public long l46871;
+    public long l46872;
+    public long l46873;
+    public long l46874;
+    public long l46875;
+    public long l46876;
+    public long l46877;
+    public long l46878;
+    public long l46879;
+    public long l46880;
+    public long l46881;
+    public long l46882;
+    public long l46883;
+    public long l46884;
+    public long l46885;
+    public long l46886;
+    public long l46887;
+    public long l46888;
+    public long l46889;
+    public long l46890;
+    public long l46891;
+    public long l46892;
+    public long l46893;
+    public long l46894;
+    public long l46895;
+    public long l46896;
+    public long l46897;
+    public long l46898;
+    public long l46899;
+    public long l46900;
+    public long l46901;
+    public long l46902;
+    public long l46903;
+    public long l46904;
+    public long l46905;
+    public long l46906;
+    public long l46907;
+    public long l46908;
+    public long l46909;
+    public long l46910;
+    public long l46911;
+    public long l46912;
+    public long l46913;
+    public long l46914;
+    public long l46915;
+    public long l46916;
+    public long l46917;
+    public long l46918;
+    public long l46919;
+    public long l46920;
+    public long l46921;
+    public long l46922;
+    public long l46923;
+    public long l46924;
+    public long l46925;
+    public long l46926;
+    public long l46927;
+    public long l46928;
+    public long l46929;
+    public long l46930;
+    public long l46931;
+    public long l46932;
+    public long l46933;
+    public long l46934;
+    public long l46935;
+    public long l46936;
+    public long l46937;
+    public long l46938;
+    public long l46939;
+    public long l46940;
+    public long l46941;
+    public long l46942;
+    public long l46943;
+    public long l46944;
+    public long l46945;
+    public long l46946;
+    public long l46947;
+    public long l46948;
+    public long l46949;
+    public long l46950;
+    public long l46951;
+    public long l46952;
+    public long l46953;
+    public long l46954;
+    public long l46955;
+    public long l46956;
+    public long l46957;
+    public long l46958;
+    public long l46959;
+    public long l46960;
+    public long l46961;
+    public long l46962;
+    public long l46963;
+    public long l46964;
+    public long l46965;
+    public long l46966;
+    public long l46967;
+    public long l46968;
+    public long l46969;
+    public long l46970;
+    public long l46971;
+    public long l46972;
+    public long l46973;
+    public long l46974;
+    public long l46975;
+    public long l46976;
+    public long l46977;
+    public long l46978;
+    public long l46979;
+    public long l46980;
+    public long l46981;
+    public long l46982;
+    public long l46983;
+    public long l46984;
+    public long l46985;
+    public long l46986;
+    public long l46987;
+    public long l46988;
+    public long l46989;
+    public long l46990;
+    public long l46991;
+    public long l46992;
+    public long l46993;
+    public long l46994;
+    public long l46995;
+    public long l46996;
+    public long l46997;
+    public long l46998;
+    public long l46999;
+    public long l47000;
+    public long l47001;
+    public long l47002;
+    public long l47003;
+    public long l47004;
+    public long l47005;
+    public long l47006;
+    public long l47007;
+    public long l47008;
+    public long l47009;
+    public long l47010;
+    public long l47011;
+    public long l47012;
+    public long l47013;
+    public long l47014;
+    public long l47015;
+    public long l47016;
+    public long l47017;
+    public long l47018;
+    public long l47019;
+    public long l47020;
+    public long l47021;
+    public long l47022;
+    public long l47023;
+    public long l47024;
+    public long l47025;
+    public long l47026;
+    public long l47027;
+    public long l47028;
+    public long l47029;
+    public long l47030;
+    public long l47031;
+    public long l47032;
+    public long l47033;
+    public long l47034;
+    public long l47035;
+    public long l47036;
+    public long l47037;
+    public long l47038;
+    public long l47039;
+    public long l47040;
+    public long l47041;
+    public long l47042;
+    public long l47043;
+    public long l47044;
+    public long l47045;
+    public long l47046;
+    public long l47047;
+    public long l47048;
+    public long l47049;
+    public long l47050;
+    public long l47051;
+    public long l47052;
+    public long l47053;
+    public long l47054;
+    public long l47055;
+    public long l47056;
+    public long l47057;
+    public long l47058;
+    public long l47059;
+    public long l47060;
+    public long l47061;
+    public long l47062;
+    public long l47063;
+    public long l47064;
+    public long l47065;
+    public long l47066;
+    public long l47067;
+    public long l47068;
+    public long l47069;
+    public long l47070;
+    public long l47071;
+    public long l47072;
+    public long l47073;
+    public long l47074;
+    public long l47075;
+    public long l47076;
+    public long l47077;
+    public long l47078;
+    public long l47079;
+    public long l47080;
+    public long l47081;
+    public long l47082;
+    public long l47083;
+    public long l47084;
+    public long l47085;
+    public long l47086;
+    public long l47087;
+    public long l47088;
+    public long l47089;
+    public long l47090;
+    public long l47091;
+    public long l47092;
+    public long l47093;
+    public long l47094;
+    public long l47095;
+    public long l47096;
+    public long l47097;
+    public long l47098;
+    public long l47099;
+    public long l47100;
+    public long l47101;
+    public long l47102;
+    public long l47103;
+    public long l47104;
+    public long l47105;
+    public long l47106;
+    public long l47107;
+    public long l47108;
+    public long l47109;
+    public long l47110;
+    public long l47111;
+    public long l47112;
+    public long l47113;
+    public long l47114;
+    public long l47115;
+    public long l47116;
+    public long l47117;
+    public long l47118;
+    public long l47119;
+    public long l47120;
+    public long l47121;
+    public long l47122;
+    public long l47123;
+    public long l47124;
+    public long l47125;
+    public long l47126;
+    public long l47127;
+    public long l47128;
+    public long l47129;
+    public long l47130;
+    public long l47131;
+    public long l47132;
+    public long l47133;
+    public long l47134;
+    public long l47135;
+    public long l47136;
+    public long l47137;
+    public long l47138;
+    public long l47139;
+    public long l47140;
+    public long l47141;
+    public long l47142;
+    public long l47143;
+    public long l47144;
+    public long l47145;
+    public long l47146;
+    public long l47147;
+    public long l47148;
+    public long l47149;
+    public long l47150;
+    public long l47151;
+    public long l47152;
+    public long l47153;
+    public long l47154;
+    public long l47155;
+    public long l47156;
+    public long l47157;
+    public long l47158;
+    public long l47159;
+    public long l47160;
+    public long l47161;
+    public long l47162;
+    public long l47163;
+    public long l47164;
+    public long l47165;
+    public long l47166;
+    public long l47167;
+    public long l47168;
+    public long l47169;
+    public long l47170;
+    public long l47171;
+    public long l47172;
+    public long l47173;
+    public long l47174;
+    public long l47175;
+    public long l47176;
+    public long l47177;
+    public long l47178;
+    public long l47179;
+    public long l47180;
+    public long l47181;
+    public long l47182;
+    public long l47183;
+    public long l47184;
+    public long l47185;
+    public long l47186;
+    public long l47187;
+    public long l47188;
+    public long l47189;
+    public long l47190;
+    public long l47191;
+    public long l47192;
+    public long l47193;
+    public long l47194;
+    public long l47195;
+    public long l47196;
+    public long l47197;
+    public long l47198;
+    public long l47199;
+    public long l47200;
+    public long l47201;
+    public long l47202;
+    public long l47203;
+    public long l47204;
+    public long l47205;
+    public long l47206;
+    public long l47207;
+    public long l47208;
+    public long l47209;
+    public long l47210;
+    public long l47211;
+    public long l47212;
+    public long l47213;
+    public long l47214;
+    public long l47215;
+    public long l47216;
+    public long l47217;
+    public long l47218;
+    public long l47219;
+    public long l47220;
+    public long l47221;
+    public long l47222;
+    public long l47223;
+    public long l47224;
+    public long l47225;
+    public long l47226;
+    public long l47227;
+    public long l47228;
+    public long l47229;
+    public long l47230;
+    public long l47231;
+    public long l47232;
+    public long l47233;
+    public long l47234;
+    public long l47235;
+    public long l47236;
+    public long l47237;
+    public long l47238;
+    public long l47239;
+    public long l47240;
+    public long l47241;
+    public long l47242;
+    public long l47243;
+    public long l47244;
+    public long l47245;
+    public long l47246;
+    public long l47247;
+    public long l47248;
+    public long l47249;
+    public long l47250;
+    public long l47251;
+    public long l47252;
+    public long l47253;
+    public long l47254;
+    public long l47255;
+    public long l47256;
+    public long l47257;
+    public long l47258;
+    public long l47259;
+    public long l47260;
+    public long l47261;
+    public long l47262;
+    public long l47263;
+    public long l47264;
+    public long l47265;
+    public long l47266;
+    public long l47267;
+    public long l47268;
+    public long l47269;
+    public long l47270;
+    public long l47271;
+    public long l47272;
+    public long l47273;
+    public long l47274;
+    public long l47275;
+    public long l47276;
+    public long l47277;
+    public long l47278;
+    public long l47279;
+    public long l47280;
+    public long l47281;
+    public long l47282;
+    public long l47283;
+    public long l47284;
+    public long l47285;
+    public long l47286;
+    public long l47287;
+    public long l47288;
+    public long l47289;
+    public long l47290;
+    public long l47291;
+    public long l47292;
+    public long l47293;
+    public long l47294;
+    public long l47295;
+    public long l47296;
+    public long l47297;
+    public long l47298;
+    public long l47299;
+    public long l47300;
+    public long l47301;
+    public long l47302;
+    public long l47303;
+    public long l47304;
+    public long l47305;
+    public long l47306;
+    public long l47307;
+    public long l47308;
+    public long l47309;
+    public long l47310;
+    public long l47311;
+    public long l47312;
+    public long l47313;
+    public long l47314;
+    public long l47315;
+    public long l47316;
+    public long l47317;
+    public long l47318;
+    public long l47319;
+    public long l47320;
+    public long l47321;
+    public long l47322;
+    public long l47323;
+    public long l47324;
+    public long l47325;
+    public long l47326;
+    public long l47327;
+    public long l47328;
+    public long l47329;
+    public long l47330;
+    public long l47331;
+    public long l47332;
+    public long l47333;
+    public long l47334;
+    public long l47335;
+    public long l47336;
+    public long l47337;
+    public long l47338;
+    public long l47339;
+    public long l47340;
+    public long l47341;
+    public long l47342;
+    public long l47343;
+    public long l47344;
+    public long l47345;
+    public long l47346;
+    public long l47347;
+    public long l47348;
+    public long l47349;
+    public long l47350;
+    public long l47351;
+    public long l47352;
+    public long l47353;
+    public long l47354;
+    public long l47355;
+    public long l47356;
+    public long l47357;
+    public long l47358;
+    public long l47359;
+    public long l47360;
+    public long l47361;
+    public long l47362;
+    public long l47363;
+    public long l47364;
+    public long l47365;
+    public long l47366;
+    public long l47367;
+    public long l47368;
+    public long l47369;
+    public long l47370;
+    public long l47371;
+    public long l47372;
+    public long l47373;
+    public long l47374;
+    public long l47375;
+    public long l47376;
+    public long l47377;
+    public long l47378;
+    public long l47379;
+    public long l47380;
+    public long l47381;
+    public long l47382;
+    public long l47383;
+    public long l47384;
+    public long l47385;
+    public long l47386;
+    public long l47387;
+    public long l47388;
+    public long l47389;
+    public long l47390;
+    public long l47391;
+    public long l47392;
+    public long l47393;
+    public long l47394;
+    public long l47395;
+    public long l47396;
+    public long l47397;
+    public long l47398;
+    public long l47399;
+    public long l47400;
+    public long l47401;
+    public long l47402;
+    public long l47403;
+    public long l47404;
+    public long l47405;
+    public long l47406;
+    public long l47407;
+    public long l47408;
+    public long l47409;
+    public long l47410;
+    public long l47411;
+    public long l47412;
+    public long l47413;
+    public long l47414;
+    public long l47415;
+    public long l47416;
+    public long l47417;
+    public long l47418;
+    public long l47419;
+    public long l47420;
+    public long l47421;
+    public long l47422;
+    public long l47423;
+    public long l47424;
+    public long l47425;
+    public long l47426;
+    public long l47427;
+    public long l47428;
+    public long l47429;
+    public long l47430;
+    public long l47431;
+    public long l47432;
+    public long l47433;
+    public long l47434;
+    public long l47435;
+    public long l47436;
+    public long l47437;
+    public long l47438;
+    public long l47439;
+    public long l47440;
+    public long l47441;
+    public long l47442;
+    public long l47443;
+    public long l47444;
+    public long l47445;
+    public long l47446;
+    public long l47447;
+    public long l47448;
+    public long l47449;
+    public long l47450;
+    public long l47451;
+    public long l47452;
+    public long l47453;
+    public long l47454;
+    public long l47455;
+    public long l47456;
+    public long l47457;
+    public long l47458;
+    public long l47459;
+    public long l47460;
+    public long l47461;
+    public long l47462;
+    public long l47463;
+    public long l47464;
+    public long l47465;
+    public long l47466;
+    public long l47467;
+    public long l47468;
+    public long l47469;
+    public long l47470;
+    public long l47471;
+    public long l47472;
+    public long l47473;
+    public long l47474;
+    public long l47475;
+    public long l47476;
+    public long l47477;
+    public long l47478;
+    public long l47479;
+    public long l47480;
+    public long l47481;
+    public long l47482;
+    public long l47483;
+    public long l47484;
+    public long l47485;
+    public long l47486;
+    public long l47487;
+    public long l47488;
+    public long l47489;
+    public long l47490;
+    public long l47491;
+    public long l47492;
+    public long l47493;
+    public long l47494;
+    public long l47495;
+    public long l47496;
+    public long l47497;
+    public long l47498;
+    public long l47499;
+    public long l47500;
+    public long l47501;
+    public long l47502;
+    public long l47503;
+    public long l47504;
+    public long l47505;
+    public long l47506;
+    public long l47507;
+    public long l47508;
+    public long l47509;
+    public long l47510;
+    public long l47511;
+    public long l47512;
+    public long l47513;
+    public long l47514;
+    public long l47515;
+    public long l47516;
+    public long l47517;
+    public long l47518;
+    public long l47519;
+    public long l47520;
+    public long l47521;
+    public long l47522;
+    public long l47523;
+    public long l47524;
+    public long l47525;
+    public long l47526;
+    public long l47527;
+    public long l47528;
+    public long l47529;
+    public long l47530;
+    public long l47531;
+    public long l47532;
+    public long l47533;
+    public long l47534;
+    public long l47535;
+    public long l47536;
+    public long l47537;
+    public long l47538;
+    public long l47539;
+    public long l47540;
+    public long l47541;
+    public long l47542;
+    public long l47543;
+    public long l47544;
+    public long l47545;
+    public long l47546;
+    public long l47547;
+    public long l47548;
+    public long l47549;
+    public long l47550;
+    public long l47551;
+    public long l47552;
+    public long l47553;
+    public long l47554;
+    public long l47555;
+    public long l47556;
+    public long l47557;
+    public long l47558;
+    public long l47559;
+    public long l47560;
+    public long l47561;
+    public long l47562;
+    public long l47563;
+    public long l47564;
+    public long l47565;
+    public long l47566;
+    public long l47567;
+    public long l47568;
+    public long l47569;
+    public long l47570;
+    public long l47571;
+    public long l47572;
+    public long l47573;
+    public long l47574;
+    public long l47575;
+    public long l47576;
+    public long l47577;
+    public long l47578;
+    public long l47579;
+    public long l47580;
+    public long l47581;
+    public long l47582;
+    public long l47583;
+    public long l47584;
+    public long l47585;
+    public long l47586;
+    public long l47587;
+    public long l47588;
+    public long l47589;
+    public long l47590;
+    public long l47591;
+    public long l47592;
+    public long l47593;
+    public long l47594;
+    public long l47595;
+    public long l47596;
+    public long l47597;
+    public long l47598;
+    public long l47599;
+    public long l47600;
+    public long l47601;
+    public long l47602;
+    public long l47603;
+    public long l47604;
+    public long l47605;
+    public long l47606;
+    public long l47607;
+    public long l47608;
+    public long l47609;
+    public long l47610;
+    public long l47611;
+    public long l47612;
+    public long l47613;
+    public long l47614;
+    public long l47615;
+    public long l47616;
+    public long l47617;
+    public long l47618;
+    public long l47619;
+    public long l47620;
+    public long l47621;
+    public long l47622;
+    public long l47623;
+    public long l47624;
+    public long l47625;
+    public long l47626;
+    public long l47627;
+    public long l47628;
+    public long l47629;
+    public long l47630;
+    public long l47631;
+    public long l47632;
+    public long l47633;
+    public long l47634;
+    public long l47635;
+    public long l47636;
+    public long l47637;
+    public long l47638;
+    public long l47639;
+    public long l47640;
+    public long l47641;
+    public long l47642;
+    public long l47643;
+    public long l47644;
+    public long l47645;
+    public long l47646;
+    public long l47647;
+    public long l47648;
+    public long l47649;
+    public long l47650;
+    public long l47651;
+    public long l47652;
+    public long l47653;
+    public long l47654;
+    public long l47655;
+    public long l47656;
+    public long l47657;
+    public long l47658;
+    public long l47659;
+    public long l47660;
+    public long l47661;
+    public long l47662;
+    public long l47663;
+    public long l47664;
+    public long l47665;
+    public long l47666;
+    public long l47667;
+    public long l47668;
+    public long l47669;
+    public long l47670;
+    public long l47671;
+    public long l47672;
+    public long l47673;
+    public long l47674;
+    public long l47675;
+    public long l47676;
+    public long l47677;
+    public long l47678;
+    public long l47679;
+    public long l47680;
+    public long l47681;
+    public long l47682;
+    public long l47683;
+    public long l47684;
+    public long l47685;
+    public long l47686;
+    public long l47687;
+    public long l47688;
+    public long l47689;
+    public long l47690;
+    public long l47691;
+    public long l47692;
+    public long l47693;
+    public long l47694;
+    public long l47695;
+    public long l47696;
+    public long l47697;
+    public long l47698;
+    public long l47699;
+    public long l47700;
+    public long l47701;
+    public long l47702;
+    public long l47703;
+    public long l47704;
+    public long l47705;
+    public long l47706;
+    public long l47707;
+    public long l47708;
+    public long l47709;
+    public long l47710;
+    public long l47711;
+    public long l47712;
+    public long l47713;
+    public long l47714;
+    public long l47715;
+    public long l47716;
+    public long l47717;
+    public long l47718;
+    public long l47719;
+    public long l47720;
+    public long l47721;
+    public long l47722;
+    public long l47723;
+    public long l47724;
+    public long l47725;
+    public long l47726;
+    public long l47727;
+    public long l47728;
+    public long l47729;
+    public long l47730;
+    public long l47731;
+    public long l47732;
+    public long l47733;
+    public long l47734;
+    public long l47735;
+    public long l47736;
+    public long l47737;
+    public long l47738;
+    public long l47739;
+    public long l47740;
+    public long l47741;
+    public long l47742;
+    public long l47743;
+    public long l47744;
+    public long l47745;
+    public long l47746;
+    public long l47747;
+    public long l47748;
+    public long l47749;
+    public long l47750;
+    public long l47751;
+    public long l47752;
+    public long l47753;
+    public long l47754;
+    public long l47755;
+    public long l47756;
+    public long l47757;
+    public long l47758;
+    public long l47759;
+    public long l47760;
+    public long l47761;
+    public long l47762;
+    public long l47763;
+    public long l47764;
+    public long l47765;
+    public long l47766;
+    public long l47767;
+    public long l47768;
+    public long l47769;
+    public long l47770;
+    public long l47771;
+    public long l47772;
+    public long l47773;
+    public long l47774;
+    public long l47775;
+    public long l47776;
+    public long l47777;
+    public long l47778;
+    public long l47779;
+    public long l47780;
+    public long l47781;
+    public long l47782;
+    public long l47783;
+    public long l47784;
+    public long l47785;
+    public long l47786;
+    public long l47787;
+    public long l47788;
+    public long l47789;
+    public long l47790;
+    public long l47791;
+    public long l47792;
+    public long l47793;
+    public long l47794;
+    public long l47795;
+    public long l47796;
+    public long l47797;
+    public long l47798;
+    public long l47799;
+    public long l47800;
+    public long l47801;
+    public long l47802;
+    public long l47803;
+    public long l47804;
+    public long l47805;
+    public long l47806;
+    public long l47807;
+    public long l47808;
+    public long l47809;
+    public long l47810;
+    public long l47811;
+    public long l47812;
+    public long l47813;
+    public long l47814;
+    public long l47815;
+    public long l47816;
+    public long l47817;
+    public long l47818;
+    public long l47819;
+    public long l47820;
+    public long l47821;
+    public long l47822;
+    public long l47823;
+    public long l47824;
+    public long l47825;
+    public long l47826;
+    public long l47827;
+    public long l47828;
+    public long l47829;
+    public long l47830;
+    public long l47831;
+    public long l47832;
+    public long l47833;
+    public long l47834;
+    public long l47835;
+    public long l47836;
+    public long l47837;
+    public long l47838;
+    public long l47839;
+    public long l47840;
+    public long l47841;
+    public long l47842;
+    public long l47843;
+    public long l47844;
+    public long l47845;
+    public long l47846;
+    public long l47847;
+    public long l47848;
+    public long l47849;
+    public long l47850;
+    public long l47851;
+    public long l47852;
+    public long l47853;
+    public long l47854;
+    public long l47855;
+    public long l47856;
+    public long l47857;
+    public long l47858;
+    public long l47859;
+    public long l47860;
+    public long l47861;
+    public long l47862;
+    public long l47863;
+    public long l47864;
+    public long l47865;
+    public long l47866;
+    public long l47867;
+    public long l47868;
+    public long l47869;
+    public long l47870;
+    public long l47871;
+    public long l47872;
+    public long l47873;
+    public long l47874;
+    public long l47875;
+    public long l47876;
+    public long l47877;
+    public long l47878;
+    public long l47879;
+    public long l47880;
+    public long l47881;
+    public long l47882;
+    public long l47883;
+    public long l47884;
+    public long l47885;
+    public long l47886;
+    public long l47887;
+    public long l47888;
+    public long l47889;
+    public long l47890;
+    public long l47891;
+    public long l47892;
+    public long l47893;
+    public long l47894;
+    public long l47895;
+    public long l47896;
+    public long l47897;
+    public long l47898;
+    public long l47899;
+    public long l47900;
+    public long l47901;
+    public long l47902;
+    public long l47903;
+    public long l47904;
+    public long l47905;
+    public long l47906;
+    public long l47907;
+    public long l47908;
+    public long l47909;
+    public long l47910;
+    public long l47911;
+    public long l47912;
+    public long l47913;
+    public long l47914;
+    public long l47915;
+    public long l47916;
+    public long l47917;
+    public long l47918;
+    public long l47919;
+    public long l47920;
+    public long l47921;
+    public long l47922;
+    public long l47923;
+    public long l47924;
+    public long l47925;
+    public long l47926;
+    public long l47927;
+    public long l47928;
+    public long l47929;
+    public long l47930;
+    public long l47931;
+    public long l47932;
+    public long l47933;
+    public long l47934;
+    public long l47935;
+    public long l47936;
+    public long l47937;
+    public long l47938;
+    public long l47939;
+    public long l47940;
+    public long l47941;
+    public long l47942;
+    public long l47943;
+    public long l47944;
+    public long l47945;
+    public long l47946;
+    public long l47947;
+    public long l47948;
+    public long l47949;
+    public long l47950;
+    public long l47951;
+    public long l47952;
+    public long l47953;
+    public long l47954;
+    public long l47955;
+    public long l47956;
+    public long l47957;
+    public long l47958;
+    public long l47959;
+    public long l47960;
+    public long l47961;
+    public long l47962;
+    public long l47963;
+    public long l47964;
+    public long l47965;
+    public long l47966;
+    public long l47967;
+    public long l47968;
+    public long l47969;
+    public long l47970;
+    public long l47971;
+    public long l47972;
+    public long l47973;
+    public long l47974;
+    public long l47975;
+    public long l47976;
+    public long l47977;
+    public long l47978;
+    public long l47979;
+    public long l47980;
+    public long l47981;
+    public long l47982;
+    public long l47983;
+    public long l47984;
+    public long l47985;
+    public long l47986;
+    public long l47987;
+    public long l47988;
+    public long l47989;
+    public long l47990;
+    public long l47991;
+    public long l47992;
+    public long l47993;
+    public long l47994;
+    public long l47995;
+    public long l47996;
+    public long l47997;
+    public long l47998;
+    public long l47999;
+    public long l48000;
+    public long l48001;
+    public long l48002;
+    public long l48003;
+    public long l48004;
+    public long l48005;
+    public long l48006;
+    public long l48007;
+    public long l48008;
+    public long l48009;
+    public long l48010;
+    public long l48011;
+    public long l48012;
+    public long l48013;
+    public long l48014;
+    public long l48015;
+    public long l48016;
+    public long l48017;
+    public long l48018;
+    public long l48019;
+    public long l48020;
+    public long l48021;
+    public long l48022;
+    public long l48023;
+    public long l48024;
+    public long l48025;
+    public long l48026;
+    public long l48027;
+    public long l48028;
+    public long l48029;
+    public long l48030;
+    public long l48031;
+    public long l48032;
+    public long l48033;
+    public long l48034;
+    public long l48035;
+    public long l48036;
+    public long l48037;
+    public long l48038;
+    public long l48039;
+    public long l48040;
+    public long l48041;
+    public long l48042;
+    public long l48043;
+    public long l48044;
+    public long l48045;
+    public long l48046;
+    public long l48047;
+    public long l48048;
+    public long l48049;
+    public long l48050;
+    public long l48051;
+    public long l48052;
+    public long l48053;
+    public long l48054;
+    public long l48055;
+    public long l48056;
+    public long l48057;
+    public long l48058;
+    public long l48059;
+    public long l48060;
+    public long l48061;
+    public long l48062;
+    public long l48063;
+    public long l48064;
+    public long l48065;
+    public long l48066;
+    public long l48067;
+    public long l48068;
+    public long l48069;
+    public long l48070;
+    public long l48071;
+    public long l48072;
+    public long l48073;
+    public long l48074;
+    public long l48075;
+    public long l48076;
+    public long l48077;
+    public long l48078;
+    public long l48079;
+    public long l48080;
+    public long l48081;
+    public long l48082;
+    public long l48083;
+    public long l48084;
+    public long l48085;
+    public long l48086;
+    public long l48087;
+    public long l48088;
+    public long l48089;
+    public long l48090;
+    public long l48091;
+    public long l48092;
+    public long l48093;
+    public long l48094;
+    public long l48095;
+    public long l48096;
+    public long l48097;
+    public long l48098;
+    public long l48099;
+    public long l48100;
+    public long l48101;
+    public long l48102;
+    public long l48103;
+    public long l48104;
+    public long l48105;
+    public long l48106;
+    public long l48107;
+    public long l48108;
+    public long l48109;
+    public long l48110;
+    public long l48111;
+    public long l48112;
+    public long l48113;
+    public long l48114;
+    public long l48115;
+    public long l48116;
+    public long l48117;
+    public long l48118;
+    public long l48119;
+    public long l48120;
+    public long l48121;
+    public long l48122;
+    public long l48123;
+    public long l48124;
+    public long l48125;
+    public long l48126;
+    public long l48127;
+    public long l48128;
+    public long l48129;
+    public long l48130;
+    public long l48131;
+    public long l48132;
+    public long l48133;
+    public long l48134;
+    public long l48135;
+    public long l48136;
+    public long l48137;
+    public long l48138;
+    public long l48139;
+    public long l48140;
+    public long l48141;
+    public long l48142;
+    public long l48143;
+    public long l48144;
+    public long l48145;
+    public long l48146;
+    public long l48147;
+    public long l48148;
+    public long l48149;
+    public long l48150;
+    public long l48151;
+    public long l48152;
+    public long l48153;
+    public long l48154;
+    public long l48155;
+    public long l48156;
+    public long l48157;
+    public long l48158;
+    public long l48159;
+    public long l48160;
+    public long l48161;
+    public long l48162;
+    public long l48163;
+    public long l48164;
+    public long l48165;
+    public long l48166;
+    public long l48167;
+    public long l48168;
+    public long l48169;
+    public long l48170;
+    public long l48171;
+    public long l48172;
+    public long l48173;
+    public long l48174;
+    public long l48175;
+    public long l48176;
+    public long l48177;
+    public long l48178;
+    public long l48179;
+    public long l48180;
+    public long l48181;
+    public long l48182;
+    public long l48183;
+    public long l48184;
+    public long l48185;
+    public long l48186;
+    public long l48187;
+    public long l48188;
+    public long l48189;
+    public long l48190;
+    public long l48191;
+    public long l48192;
+    public long l48193;
+    public long l48194;
+    public long l48195;
+    public long l48196;
+    public long l48197;
+    public long l48198;
+    public long l48199;
+    public long l48200;
+    public long l48201;
+    public long l48202;
+    public long l48203;
+    public long l48204;
+    public long l48205;
+    public long l48206;
+    public long l48207;
+    public long l48208;
+    public long l48209;
+    public long l48210;
+    public long l48211;
+    public long l48212;
+    public long l48213;
+    public long l48214;
+    public long l48215;
+    public long l48216;
+    public long l48217;
+    public long l48218;
+    public long l48219;
+    public long l48220;
+    public long l48221;
+    public long l48222;
+    public long l48223;
+    public long l48224;
+    public long l48225;
+    public long l48226;
+    public long l48227;
+    public long l48228;
+    public long l48229;
+    public long l48230;
+    public long l48231;
+    public long l48232;
+    public long l48233;
+    public long l48234;
+    public long l48235;
+    public long l48236;
+    public long l48237;
+    public long l48238;
+    public long l48239;
+    public long l48240;
+    public long l48241;
+    public long l48242;
+    public long l48243;
+    public long l48244;
+    public long l48245;
+    public long l48246;
+    public long l48247;
+    public long l48248;
+    public long l48249;
+    public long l48250;
+    public long l48251;
+    public long l48252;
+    public long l48253;
+    public long l48254;
+    public long l48255;
+    public long l48256;
+    public long l48257;
+    public long l48258;
+    public long l48259;
+    public long l48260;
+    public long l48261;
+    public long l48262;
+    public long l48263;
+    public long l48264;
+    public long l48265;
+    public long l48266;
+    public long l48267;
+    public long l48268;
+    public long l48269;
+    public long l48270;
+    public long l48271;
+    public long l48272;
+    public long l48273;
+    public long l48274;
+    public long l48275;
+    public long l48276;
+    public long l48277;
+    public long l48278;
+    public long l48279;
+    public long l48280;
+    public long l48281;
+    public long l48282;
+    public long l48283;
+    public long l48284;
+    public long l48285;
+    public long l48286;
+    public long l48287;
+    public long l48288;
+    public long l48289;
+    public long l48290;
+    public long l48291;
+    public long l48292;
+    public long l48293;
+    public long l48294;
+    public long l48295;
+    public long l48296;
+    public long l48297;
+    public long l48298;
+    public long l48299;
+    public long l48300;
+    public long l48301;
+    public long l48302;
+    public long l48303;
+    public long l48304;
+    public long l48305;
+    public long l48306;
+    public long l48307;
+    public long l48308;
+    public long l48309;
+    public long l48310;
+    public long l48311;
+    public long l48312;
+    public long l48313;
+    public long l48314;
+    public long l48315;
+    public long l48316;
+    public long l48317;
+    public long l48318;
+    public long l48319;
+    public long l48320;
+    public long l48321;
+    public long l48322;
+    public long l48323;
+    public long l48324;
+    public long l48325;
+    public long l48326;
+    public long l48327;
+    public long l48328;
+    public long l48329;
+    public long l48330;
+    public long l48331;
+    public long l48332;
+    public long l48333;
+    public long l48334;
+    public long l48335;
+    public long l48336;
+    public long l48337;
+    public long l48338;
+    public long l48339;
+    public long l48340;
+    public long l48341;
+    public long l48342;
+    public long l48343;
+    public long l48344;
+    public long l48345;
+    public long l48346;
+    public long l48347;
+    public long l48348;
+    public long l48349;
+    public long l48350;
+    public long l48351;
+    public long l48352;
+    public long l48353;
+    public long l48354;
+    public long l48355;
+    public long l48356;
+    public long l48357;
+    public long l48358;
+    public long l48359;
+    public long l48360;
+    public long l48361;
+    public long l48362;
+    public long l48363;
+    public long l48364;
+    public long l48365;
+    public long l48366;
+    public long l48367;
+    public long l48368;
+    public long l48369;
+    public long l48370;
+    public long l48371;
+    public long l48372;
+    public long l48373;
+    public long l48374;
+    public long l48375;
+    public long l48376;
+    public long l48377;
+    public long l48378;
+    public long l48379;
+    public long l48380;
+    public long l48381;
+    public long l48382;
+    public long l48383;
+    public long l48384;
+    public long l48385;
+    public long l48386;
+    public long l48387;
+    public long l48388;
+    public long l48389;
+    public long l48390;
+    public long l48391;
+    public long l48392;
+    public long l48393;
+    public long l48394;
+    public long l48395;
+    public long l48396;
+    public long l48397;
+    public long l48398;
+    public long l48399;
+    public long l48400;
+    public long l48401;
+    public long l48402;
+    public long l48403;
+    public long l48404;
+    public long l48405;
+    public long l48406;
+    public long l48407;
+    public long l48408;
+    public long l48409;
+    public long l48410;
+    public long l48411;
+    public long l48412;
+    public long l48413;
+    public long l48414;
+    public long l48415;
+    public long l48416;
+    public long l48417;
+    public long l48418;
+    public long l48419;
+    public long l48420;
+    public long l48421;
+    public long l48422;
+    public long l48423;
+    public long l48424;
+    public long l48425;
+    public long l48426;
+    public long l48427;
+    public long l48428;
+    public long l48429;
+    public long l48430;
+    public long l48431;
+    public long l48432;
+    public long l48433;
+    public long l48434;
+    public long l48435;
+    public long l48436;
+    public long l48437;
+    public long l48438;
+    public long l48439;
+    public long l48440;
+    public long l48441;
+    public long l48442;
+    public long l48443;
+    public long l48444;
+    public long l48445;
+    public long l48446;
+    public long l48447;
+    public long l48448;
+    public long l48449;
+    public long l48450;
+    public long l48451;
+    public long l48452;
+    public long l48453;
+    public long l48454;
+    public long l48455;
+    public long l48456;
+    public long l48457;
+    public long l48458;
+    public long l48459;
+    public long l48460;
+    public long l48461;
+    public long l48462;
+    public long l48463;
+    public long l48464;
+    public long l48465;
+    public long l48466;
+    public long l48467;
+    public long l48468;
+    public long l48469;
+    public long l48470;
+    public long l48471;
+    public long l48472;
+    public long l48473;
+    public long l48474;
+    public long l48475;
+    public long l48476;
+    public long l48477;
+    public long l48478;
+    public long l48479;
+    public long l48480;
+    public long l48481;
+    public long l48482;
+    public long l48483;
+    public long l48484;
+    public long l48485;
+    public long l48486;
+    public long l48487;
+    public long l48488;
+    public long l48489;
+    public long l48490;
+    public long l48491;
+    public long l48492;
+    public long l48493;
+    public long l48494;
+    public long l48495;
+    public long l48496;
+    public long l48497;
+    public long l48498;
+    public long l48499;
+    public long l48500;
+    public long l48501;
+    public long l48502;
+    public long l48503;
+    public long l48504;
+    public long l48505;
+    public long l48506;
+    public long l48507;
+    public long l48508;
+    public long l48509;
+    public long l48510;
+    public long l48511;
+    public long l48512;
+    public long l48513;
+    public long l48514;
+    public long l48515;
+    public long l48516;
+    public long l48517;
+    public long l48518;
+    public long l48519;
+    public long l48520;
+    public long l48521;
+    public long l48522;
+    public long l48523;
+    public long l48524;
+    public long l48525;
+    public long l48526;
+    public long l48527;
+    public long l48528;
+    public long l48529;
+    public long l48530;
+    public long l48531;
+    public long l48532;
+    public long l48533;
+    public long l48534;
+    public long l48535;
+    public long l48536;
+    public long l48537;
+    public long l48538;
+    public long l48539;
+    public long l48540;
+    public long l48541;
+    public long l48542;
+    public long l48543;
+    public long l48544;
+    public long l48545;
+    public long l48546;
+    public long l48547;
+    public long l48548;
+    public long l48549;
+    public long l48550;
+    public long l48551;
+    public long l48552;
+    public long l48553;
+    public long l48554;
+    public long l48555;
+    public long l48556;
+    public long l48557;
+    public long l48558;
+    public long l48559;
+    public long l48560;
+    public long l48561;
+    public long l48562;
+    public long l48563;
+    public long l48564;
+    public long l48565;
+    public long l48566;
+    public long l48567;
+    public long l48568;
+    public long l48569;
+    public long l48570;
+    public long l48571;
+    public long l48572;
+    public long l48573;
+    public long l48574;
+    public long l48575;
+    public long l48576;
+    public long l48577;
+    public long l48578;
+    public long l48579;
+    public long l48580;
+    public long l48581;
+    public long l48582;
+    public long l48583;
+    public long l48584;
+    public long l48585;
+    public long l48586;
+    public long l48587;
+    public long l48588;
+    public long l48589;
+    public long l48590;
+    public long l48591;
+    public long l48592;
+    public long l48593;
+    public long l48594;
+    public long l48595;
+    public long l48596;
+    public long l48597;
+    public long l48598;
+    public long l48599;
+    public long l48600;
+    public long l48601;
+    public long l48602;
+    public long l48603;
+    public long l48604;
+    public long l48605;
+    public long l48606;
+    public long l48607;
+    public long l48608;
+    public long l48609;
+    public long l48610;
+    public long l48611;
+    public long l48612;
+    public long l48613;
+    public long l48614;
+    public long l48615;
+    public long l48616;
+    public long l48617;
+    public long l48618;
+    public long l48619;
+    public long l48620;
+    public long l48621;
+    public long l48622;
+    public long l48623;
+    public long l48624;
+    public long l48625;
+    public long l48626;
+    public long l48627;
+    public long l48628;
+    public long l48629;
+    public long l48630;
+    public long l48631;
+    public long l48632;
+    public long l48633;
+    public long l48634;
+    public long l48635;
+    public long l48636;
+    public long l48637;
+    public long l48638;
+    public long l48639;
+    public long l48640;
+    public long l48641;
+    public long l48642;
+    public long l48643;
+    public long l48644;
+    public long l48645;
+    public long l48646;
+    public long l48647;
+    public long l48648;
+    public long l48649;
+    public long l48650;
+    public long l48651;
+    public long l48652;
+    public long l48653;
+    public long l48654;
+    public long l48655;
+    public long l48656;
+    public long l48657;
+    public long l48658;
+    public long l48659;
+    public long l48660;
+    public long l48661;
+    public long l48662;
+    public long l48663;
+    public long l48664;
+    public long l48665;
+    public long l48666;
+    public long l48667;
+    public long l48668;
+    public long l48669;
+    public long l48670;
+    public long l48671;
+    public long l48672;
+    public long l48673;
+    public long l48674;
+    public long l48675;
+    public long l48676;
+    public long l48677;
+    public long l48678;
+    public long l48679;
+    public long l48680;
+    public long l48681;
+    public long l48682;
+    public long l48683;
+    public long l48684;
+    public long l48685;
+    public long l48686;
+    public long l48687;
+    public long l48688;
+    public long l48689;
+    public long l48690;
+    public long l48691;
+    public long l48692;
+    public long l48693;
+    public long l48694;
+    public long l48695;
+    public long l48696;
+    public long l48697;
+    public long l48698;
+    public long l48699;
+    public long l48700;
+    public long l48701;
+    public long l48702;
+    public long l48703;
+    public long l48704;
+    public long l48705;
+    public long l48706;
+    public long l48707;
+    public long l48708;
+    public long l48709;
+    public long l48710;
+    public long l48711;
+    public long l48712;
+    public long l48713;
+    public long l48714;
+    public long l48715;
+    public long l48716;
+    public long l48717;
+    public long l48718;
+    public long l48719;
+    public long l48720;
+    public long l48721;
+    public long l48722;
+    public long l48723;
+    public long l48724;
+    public long l48725;
+    public long l48726;
+    public long l48727;
+    public long l48728;
+    public long l48729;
+    public long l48730;
+    public long l48731;
+    public long l48732;
+    public long l48733;
+    public long l48734;
+    public long l48735;
+    public long l48736;
+    public long l48737;
+    public long l48738;
+    public long l48739;
+    public long l48740;
+    public long l48741;
+    public long l48742;
+    public long l48743;
+    public long l48744;
+    public long l48745;
+    public long l48746;
+    public long l48747;
+    public long l48748;
+    public long l48749;
+    public long l48750;
+    public long l48751;
+    public long l48752;
+    public long l48753;
+    public long l48754;
+    public long l48755;
+    public long l48756;
+    public long l48757;
+    public long l48758;
+    public long l48759;
+    public long l48760;
+    public long l48761;
+    public long l48762;
+    public long l48763;
+    public long l48764;
+    public long l48765;
+    public long l48766;
+    public long l48767;
+    public long l48768;
+    public long l48769;
+    public long l48770;
+    public long l48771;
+    public long l48772;
+    public long l48773;
+    public long l48774;
+    public long l48775;
+    public long l48776;
+    public long l48777;
+    public long l48778;
+    public long l48779;
+    public long l48780;
+    public long l48781;
+    public long l48782;
+    public long l48783;
+    public long l48784;
+    public long l48785;
+    public long l48786;
+    public long l48787;
+    public long l48788;
+    public long l48789;
+    public long l48790;
+    public long l48791;
+    public long l48792;
+    public long l48793;
+    public long l48794;
+    public long l48795;
+    public long l48796;
+    public long l48797;
+    public long l48798;
+    public long l48799;
+    public long l48800;
+    public long l48801;
+    public long l48802;
+    public long l48803;
+    public long l48804;
+    public long l48805;
+    public long l48806;
+    public long l48807;
+    public long l48808;
+    public long l48809;
+    public long l48810;
+    public long l48811;
+    public long l48812;
+    public long l48813;
+    public long l48814;
+    public long l48815;
+    public long l48816;
+    public long l48817;
+    public long l48818;
+    public long l48819;
+    public long l48820;
+    public long l48821;
+    public long l48822;
+    public long l48823;
+    public long l48824;
+    public long l48825;
+    public long l48826;
+    public long l48827;
+    public long l48828;
+    public long l48829;
+    public long l48830;
+    public long l48831;
+    public long l48832;
+    public long l48833;
+    public long l48834;
+    public long l48835;
+    public long l48836;
+    public long l48837;
+    public long l48838;
+    public long l48839;
+    public long l48840;
+    public long l48841;
+    public long l48842;
+    public long l48843;
+    public long l48844;
+    public long l48845;
+    public long l48846;
+    public long l48847;
+    public long l48848;
+    public long l48849;
+    public long l48850;
+    public long l48851;
+    public long l48852;
+    public long l48853;
+    public long l48854;
+    public long l48855;
+    public long l48856;
+    public long l48857;
+    public long l48858;
+    public long l48859;
+    public long l48860;
+    public long l48861;
+    public long l48862;
+    public long l48863;
+    public long l48864;
+    public long l48865;
+    public long l48866;
+    public long l48867;
+    public long l48868;
+    public long l48869;
+    public long l48870;
+    public long l48871;
+    public long l48872;
+    public long l48873;
+    public long l48874;
+    public long l48875;
+    public long l48876;
+    public long l48877;
+    public long l48878;
+    public long l48879;
+    public long l48880;
+    public long l48881;
+    public long l48882;
+    public long l48883;
+    public long l48884;
+    public long l48885;
+    public long l48886;
+    public long l48887;
+    public long l48888;
+    public long l48889;
+    public long l48890;
+    public long l48891;
+    public long l48892;
+    public long l48893;
+    public long l48894;
+    public long l48895;
+    public long l48896;
+    public long l48897;
+    public long l48898;
+    public long l48899;
+    public long l48900;
+    public long l48901;
+    public long l48902;
+    public long l48903;
+    public long l48904;
+    public long l48905;
+    public long l48906;
+    public long l48907;
+    public long l48908;
+    public long l48909;
+    public long l48910;
+    public long l48911;
+    public long l48912;
+    public long l48913;
+    public long l48914;
+    public long l48915;
+    public long l48916;
+    public long l48917;
+    public long l48918;
+    public long l48919;
+    public long l48920;
+    public long l48921;
+    public long l48922;
+    public long l48923;
+    public long l48924;
+    public long l48925;
+    public long l48926;
+    public long l48927;
+    public long l48928;
+    public long l48929;
+    public long l48930;
+    public long l48931;
+    public long l48932;
+    public long l48933;
+    public long l48934;
+    public long l48935;
+    public long l48936;
+    public long l48937;
+    public long l48938;
+    public long l48939;
+    public long l48940;
+    public long l48941;
+    public long l48942;
+    public long l48943;
+    public long l48944;
+    public long l48945;
+    public long l48946;
+    public long l48947;
+    public long l48948;
+    public long l48949;
+    public long l48950;
+    public long l48951;
+    public long l48952;
+    public long l48953;
+    public long l48954;
+    public long l48955;
+    public long l48956;
+    public long l48957;
+    public long l48958;
+    public long l48959;
+    public long l48960;
+    public long l48961;
+    public long l48962;
+    public long l48963;
+    public long l48964;
+    public long l48965;
+    public long l48966;
+    public long l48967;
+    public long l48968;
+    public long l48969;
+    public long l48970;
+    public long l48971;
+    public long l48972;
+    public long l48973;
+    public long l48974;
+    public long l48975;
+    public long l48976;
+    public long l48977;
+    public long l48978;
+    public long l48979;
+    public long l48980;
+    public long l48981;
+    public long l48982;
+    public long l48983;
+    public long l48984;
+    public long l48985;
+    public long l48986;
+    public long l48987;
+    public long l48988;
+    public long l48989;
+    public long l48990;
+    public long l48991;
+    public long l48992;
+    public long l48993;
+    public long l48994;
+    public long l48995;
+    public long l48996;
+    public long l48997;
+    public long l48998;
+    public long l48999;
+    public long l49000;
+    public long l49001;
+    public long l49002;
+    public long l49003;
+    public long l49004;
+    public long l49005;
+    public long l49006;
+    public long l49007;
+    public long l49008;
+    public long l49009;
+    public long l49010;
+    public long l49011;
+    public long l49012;
+    public long l49013;
+    public long l49014;
+    public long l49015;
+    public long l49016;
+    public long l49017;
+    public long l49018;
+    public long l49019;
+    public long l49020;
+    public long l49021;
+    public long l49022;
+    public long l49023;
+    public long l49024;
+    public long l49025;
+    public long l49026;
+    public long l49027;
+    public long l49028;
+    public long l49029;
+    public long l49030;
+    public long l49031;
+    public long l49032;
+    public long l49033;
+    public long l49034;
+    public long l49035;
+    public long l49036;
+    public long l49037;
+    public long l49038;
+    public long l49039;
+    public long l49040;
+    public long l49041;
+    public long l49042;
+    public long l49043;
+    public long l49044;
+    public long l49045;
+    public long l49046;
+    public long l49047;
+    public long l49048;
+    public long l49049;
+    public long l49050;
+    public long l49051;
+    public long l49052;
+    public long l49053;
+    public long l49054;
+    public long l49055;
+    public long l49056;
+    public long l49057;
+    public long l49058;
+    public long l49059;
+    public long l49060;
+    public long l49061;
+    public long l49062;
+    public long l49063;
+    public long l49064;
+    public long l49065;
+    public long l49066;
+    public long l49067;
+    public long l49068;
+    public long l49069;
+    public long l49070;
+    public long l49071;
+    public long l49072;
+    public long l49073;
+    public long l49074;
+    public long l49075;
+    public long l49076;
+    public long l49077;
+    public long l49078;
+    public long l49079;
+    public long l49080;
+    public long l49081;
+    public long l49082;
+    public long l49083;
+    public long l49084;
+    public long l49085;
+    public long l49086;
+    public long l49087;
+    public long l49088;
+    public long l49089;
+    public long l49090;
+    public long l49091;
+    public long l49092;
+    public long l49093;
+    public long l49094;
+    public long l49095;
+    public long l49096;
+    public long l49097;
+    public long l49098;
+    public long l49099;
+    public long l49100;
+    public long l49101;
+    public long l49102;
+    public long l49103;
+    public long l49104;
+    public long l49105;
+    public long l49106;
+    public long l49107;
+    public long l49108;
+    public long l49109;
+    public long l49110;
+    public long l49111;
+    public long l49112;
+    public long l49113;
+    public long l49114;
+    public long l49115;
+    public long l49116;
+    public long l49117;
+    public long l49118;
+    public long l49119;
+    public long l49120;
+    public long l49121;
+    public long l49122;
+    public long l49123;
+    public long l49124;
+    public long l49125;
+    public long l49126;
+    public long l49127;
+    public long l49128;
+    public long l49129;
+    public long l49130;
+    public long l49131;
+    public long l49132;
+    public long l49133;
+    public long l49134;
+    public long l49135;
+    public long l49136;
+    public long l49137;
+    public long l49138;
+    public long l49139;
+    public long l49140;
+    public long l49141;
+    public long l49142;
+    public long l49143;
+    public long l49144;
+    public long l49145;
+    public long l49146;
+    public long l49147;
+    public long l49148;
+    public long l49149;
+    public long l49150;
+    public long l49151;
+    public long l49152;
+    public long l49153;
+    public long l49154;
+    public long l49155;
+    public long l49156;
+    public long l49157;
+    public long l49158;
+    public long l49159;
+    public long l49160;
+    public long l49161;
+    public long l49162;
+    public long l49163;
+    public long l49164;
+    public long l49165;
+    public long l49166;
+    public long l49167;
+    public long l49168;
+    public long l49169;
+    public long l49170;
+    public long l49171;
+    public long l49172;
+    public long l49173;
+    public long l49174;
+    public long l49175;
+    public long l49176;
+    public long l49177;
+    public long l49178;
+    public long l49179;
+    public long l49180;
+    public long l49181;
+    public long l49182;
+    public long l49183;
+    public long l49184;
+    public long l49185;
+    public long l49186;
+    public long l49187;
+    public long l49188;
+    public long l49189;
+    public long l49190;
+    public long l49191;
+    public long l49192;
+    public long l49193;
+    public long l49194;
+    public long l49195;
+    public long l49196;
+    public long l49197;
+    public long l49198;
+    public long l49199;
+    public long l49200;
+    public long l49201;
+    public long l49202;
+    public long l49203;
+    public long l49204;
+    public long l49205;
+    public long l49206;
+    public long l49207;
+    public long l49208;
+    public long l49209;
+    public long l49210;
+    public long l49211;
+    public long l49212;
+    public long l49213;
+    public long l49214;
+    public long l49215;
+    public long l49216;
+    public long l49217;
+    public long l49218;
+    public long l49219;
+    public long l49220;
+    public long l49221;
+    public long l49222;
+    public long l49223;
+    public long l49224;
+    public long l49225;
+    public long l49226;
+    public long l49227;
+    public long l49228;
+    public long l49229;
+    public long l49230;
+    public long l49231;
+    public long l49232;
+    public long l49233;
+    public long l49234;
+    public long l49235;
+    public long l49236;
+    public long l49237;
+    public long l49238;
+    public long l49239;
+    public long l49240;
+    public long l49241;
+    public long l49242;
+    public long l49243;
+    public long l49244;
+    public long l49245;
+    public long l49246;
+    public long l49247;
+    public long l49248;
+    public long l49249;
+    public long l49250;
+    public long l49251;
+    public long l49252;
+    public long l49253;
+    public long l49254;
+    public long l49255;
+    public long l49256;
+    public long l49257;
+    public long l49258;
+    public long l49259;
+    public long l49260;
+    public long l49261;
+    public long l49262;
+    public long l49263;
+    public long l49264;
+    public long l49265;
+    public long l49266;
+    public long l49267;
+    public long l49268;
+    public long l49269;
+    public long l49270;
+    public long l49271;
+    public long l49272;
+    public long l49273;
+    public long l49274;
+    public long l49275;
+    public long l49276;
+    public long l49277;
+    public long l49278;
+    public long l49279;
+    public long l49280;
+    public long l49281;
+    public long l49282;
+    public long l49283;
+    public long l49284;
+    public long l49285;
+    public long l49286;
+    public long l49287;
+    public long l49288;
+    public long l49289;
+    public long l49290;
+    public long l49291;
+    public long l49292;
+    public long l49293;
+    public long l49294;
+    public long l49295;
+    public long l49296;
+    public long l49297;
+    public long l49298;
+    public long l49299;
+    public long l49300;
+    public long l49301;
+    public long l49302;
+    public long l49303;
+    public long l49304;
+    public long l49305;
+    public long l49306;
+    public long l49307;
+    public long l49308;
+    public long l49309;
+    public long l49310;
+    public long l49311;
+    public long l49312;
+    public long l49313;
+    public long l49314;
+    public long l49315;
+    public long l49316;
+    public long l49317;
+    public long l49318;
+    public long l49319;
+    public long l49320;
+    public long l49321;
+    public long l49322;
+    public long l49323;
+    public long l49324;
+    public long l49325;
+    public long l49326;
+    public long l49327;
+    public long l49328;
+    public long l49329;
+    public long l49330;
+    public long l49331;
+    public long l49332;
+    public long l49333;
+    public long l49334;
+    public long l49335;
+    public long l49336;
+    public long l49337;
+    public long l49338;
+    public long l49339;
+    public long l49340;
+    public long l49341;
+    public long l49342;
+    public long l49343;
+    public long l49344;
+    public long l49345;
+    public long l49346;
+    public long l49347;
+    public long l49348;
+    public long l49349;
+    public long l49350;
+    public long l49351;
+    public long l49352;
+    public long l49353;
+    public long l49354;
+    public long l49355;
+    public long l49356;
+    public long l49357;
+    public long l49358;
+    public long l49359;
+    public long l49360;
+    public long l49361;
+    public long l49362;
+    public long l49363;
+    public long l49364;
+    public long l49365;
+    public long l49366;
+    public long l49367;
+    public long l49368;
+    public long l49369;
+    public long l49370;
+    public long l49371;
+    public long l49372;
+    public long l49373;
+    public long l49374;
+    public long l49375;
+    public long l49376;
+    public long l49377;
+    public long l49378;
+    public long l49379;
+    public long l49380;
+    public long l49381;
+    public long l49382;
+    public long l49383;
+    public long l49384;
+    public long l49385;
+    public long l49386;
+    public long l49387;
+    public long l49388;
+    public long l49389;
+    public long l49390;
+    public long l49391;
+    public long l49392;
+    public long l49393;
+    public long l49394;
+    public long l49395;
+    public long l49396;
+    public long l49397;
+    public long l49398;
+    public long l49399;
+    public long l49400;
+    public long l49401;
+    public long l49402;
+    public long l49403;
+    public long l49404;
+    public long l49405;
+    public long l49406;
+    public long l49407;
+    public long l49408;
+    public long l49409;
+    public long l49410;
+    public long l49411;
+    public long l49412;
+    public long l49413;
+    public long l49414;
+    public long l49415;
+    public long l49416;
+    public long l49417;
+    public long l49418;
+    public long l49419;
+    public long l49420;
+    public long l49421;
+    public long l49422;
+    public long l49423;
+    public long l49424;
+    public long l49425;
+    public long l49426;
+    public long l49427;
+    public long l49428;
+    public long l49429;
+    public long l49430;
+    public long l49431;
+    public long l49432;
+    public long l49433;
+    public long l49434;
+    public long l49435;
+    public long l49436;
+    public long l49437;
+    public long l49438;
+    public long l49439;
+    public long l49440;
+    public long l49441;
+    public long l49442;
+    public long l49443;
+    public long l49444;
+    public long l49445;
+    public long l49446;
+    public long l49447;
+    public long l49448;
+    public long l49449;
+    public long l49450;
+    public long l49451;
+    public long l49452;
+    public long l49453;
+    public long l49454;
+    public long l49455;
+    public long l49456;
+    public long l49457;
+    public long l49458;
+    public long l49459;
+    public long l49460;
+    public long l49461;
+    public long l49462;
+    public long l49463;
+    public long l49464;
+    public long l49465;
+    public long l49466;
+    public long l49467;
+    public long l49468;
+    public long l49469;
+    public long l49470;
+    public long l49471;
+    public long l49472;
+    public long l49473;
+    public long l49474;
+    public long l49475;
+    public long l49476;
+    public long l49477;
+    public long l49478;
+    public long l49479;
+    public long l49480;
+    public long l49481;
+    public long l49482;
+    public long l49483;
+    public long l49484;
+    public long l49485;
+    public long l49486;
+    public long l49487;
+    public long l49488;
+    public long l49489;
+    public long l49490;
+    public long l49491;
+    public long l49492;
+    public long l49493;
+    public long l49494;
+    public long l49495;
+    public long l49496;
+    public long l49497;
+    public long l49498;
+    public long l49499;
+    public long l49500;
+    public long l49501;
+    public long l49502;
+    public long l49503;
+    public long l49504;
+    public long l49505;
+    public long l49506;
+    public long l49507;
+    public long l49508;
+    public long l49509;
+    public long l49510;
+    public long l49511;
+    public long l49512;
+    public long l49513;
+    public long l49514;
+    public long l49515;
+    public long l49516;
+    public long l49517;
+    public long l49518;
+    public long l49519;
+    public long l49520;
+    public long l49521;
+    public long l49522;
+    public long l49523;
+    public long l49524;
+    public long l49525;
+    public long l49526;
+    public long l49527;
+    public long l49528;
+    public long l49529;
+    public long l49530;
+    public long l49531;
+    public long l49532;
+    public long l49533;
+    public long l49534;
+    public long l49535;
+    public long l49536;
+    public long l49537;
+    public long l49538;
+    public long l49539;
+    public long l49540;
+    public long l49541;
+    public long l49542;
+    public long l49543;
+    public long l49544;
+    public long l49545;
+    public long l49546;
+    public long l49547;
+    public long l49548;
+    public long l49549;
+    public long l49550;
+    public long l49551;
+    public long l49552;
+    public long l49553;
+    public long l49554;
+    public long l49555;
+    public long l49556;
+    public long l49557;
+    public long l49558;
+    public long l49559;
+    public long l49560;
+    public long l49561;
+    public long l49562;
+    public long l49563;
+    public long l49564;
+    public long l49565;
+    public long l49566;
+    public long l49567;
+    public long l49568;
+    public long l49569;
+    public long l49570;
+    public long l49571;
+    public long l49572;
+    public long l49573;
+    public long l49574;
+    public long l49575;
+    public long l49576;
+    public long l49577;
+    public long l49578;
+    public long l49579;
+    public long l49580;
+    public long l49581;
+    public long l49582;
+    public long l49583;
+    public long l49584;
+    public long l49585;
+    public long l49586;
+    public long l49587;
+    public long l49588;
+    public long l49589;
+    public long l49590;
+    public long l49591;
+    public long l49592;
+    public long l49593;
+    public long l49594;
+    public long l49595;
+    public long l49596;
+    public long l49597;
+    public long l49598;
+    public long l49599;
+    public long l49600;
+    public long l49601;
+    public long l49602;
+    public long l49603;
+    public long l49604;
+    public long l49605;
+    public long l49606;
+    public long l49607;
+    public long l49608;
+    public long l49609;
+    public long l49610;
+    public long l49611;
+    public long l49612;
+    public long l49613;
+    public long l49614;
+    public long l49615;
+    public long l49616;
+    public long l49617;
+    public long l49618;
+    public long l49619;
+    public long l49620;
+    public long l49621;
+    public long l49622;
+    public long l49623;
+    public long l49624;
+    public long l49625;
+    public long l49626;
+    public long l49627;
+    public long l49628;
+    public long l49629;
+    public long l49630;
+    public long l49631;
+    public long l49632;
+    public long l49633;
+    public long l49634;
+    public long l49635;
+    public long l49636;
+    public long l49637;
+    public long l49638;
+    public long l49639;
+    public long l49640;
+    public long l49641;
+    public long l49642;
+    public long l49643;
+    public long l49644;
+    public long l49645;
+    public long l49646;
+    public long l49647;
+    public long l49648;
+    public long l49649;
+    public long l49650;
+    public long l49651;
+    public long l49652;
+    public long l49653;
+    public long l49654;
+    public long l49655;
+    public long l49656;
+    public long l49657;
+    public long l49658;
+    public long l49659;
+    public long l49660;
+    public long l49661;
+    public long l49662;
+    public long l49663;
+    public long l49664;
+    public long l49665;
+    public long l49666;
+    public long l49667;
+    public long l49668;
+    public long l49669;
+    public long l49670;
+    public long l49671;
+    public long l49672;
+    public long l49673;
+    public long l49674;
+    public long l49675;
+    public long l49676;
+    public long l49677;
+    public long l49678;
+    public long l49679;
+    public long l49680;
+    public long l49681;
+    public long l49682;
+    public long l49683;
+    public long l49684;
+    public long l49685;
+    public long l49686;
+    public long l49687;
+    public long l49688;
+    public long l49689;
+    public long l49690;
+    public long l49691;
+    public long l49692;
+    public long l49693;
+    public long l49694;
+    public long l49695;
+    public long l49696;
+    public long l49697;
+    public long l49698;
+    public long l49699;
+    public long l49700;
+    public long l49701;
+    public long l49702;
+    public long l49703;
+    public long l49704;
+    public long l49705;
+    public long l49706;
+    public long l49707;
+    public long l49708;
+    public long l49709;
+    public long l49710;
+    public long l49711;
+    public long l49712;
+    public long l49713;
+    public long l49714;
+    public long l49715;
+    public long l49716;
+    public long l49717;
+    public long l49718;
+    public long l49719;
+    public long l49720;
+    public long l49721;
+    public long l49722;
+    public long l49723;
+    public long l49724;
+    public long l49725;
+    public long l49726;
+    public long l49727;
+    public long l49728;
+    public long l49729;
+    public long l49730;
+    public long l49731;
+    public long l49732;
+    public long l49733;
+    public long l49734;
+    public long l49735;
+    public long l49736;
+    public long l49737;
+    public long l49738;
+    public long l49739;
+    public long l49740;
+    public long l49741;
+    public long l49742;
+    public long l49743;
+    public long l49744;
+    public long l49745;
+    public long l49746;
+    public long l49747;
+    public long l49748;
+    public long l49749;
+    public long l49750;
+    public long l49751;
+    public long l49752;
+    public long l49753;
+    public long l49754;
+    public long l49755;
+    public long l49756;
+    public long l49757;
+    public long l49758;
+    public long l49759;
+    public long l49760;
+    public long l49761;
+    public long l49762;
+    public long l49763;
+    public long l49764;
+    public long l49765;
+    public long l49766;
+    public long l49767;
+    public long l49768;
+    public long l49769;
+    public long l49770;
+    public long l49771;
+    public long l49772;
+    public long l49773;
+    public long l49774;
+    public long l49775;
+    public long l49776;
+    public long l49777;
+    public long l49778;
+    public long l49779;
+    public long l49780;
+    public long l49781;
+    public long l49782;
+    public long l49783;
+    public long l49784;
+    public long l49785;
+    public long l49786;
+    public long l49787;
+    public long l49788;
+    public long l49789;
+    public long l49790;
+    public long l49791;
+    public long l49792;
+    public long l49793;
+    public long l49794;
+    public long l49795;
+    public long l49796;
+    public long l49797;
+    public long l49798;
+    public long l49799;
+    public long l49800;
+    public long l49801;
+    public long l49802;
+    public long l49803;
+    public long l49804;
+    public long l49805;
+    public long l49806;
+    public long l49807;
+    public long l49808;
+    public long l49809;
+    public long l49810;
+    public long l49811;
+    public long l49812;
+    public long l49813;
+    public long l49814;
+    public long l49815;
+    public long l49816;
+    public long l49817;
+    public long l49818;
+    public long l49819;
+    public long l49820;
+    public long l49821;
+    public long l49822;
+    public long l49823;
+    public long l49824;
+    public long l49825;
+    public long l49826;
+    public long l49827;
+    public long l49828;
+    public long l49829;
+    public long l49830;
+    public long l49831;
+    public long l49832;
+    public long l49833;
+    public long l49834;
+    public long l49835;
+    public long l49836;
+    public long l49837;
+    public long l49838;
+    public long l49839;
+    public long l49840;
+    public long l49841;
+    public long l49842;
+    public long l49843;
+    public long l49844;
+    public long l49845;
+    public long l49846;
+    public long l49847;
+    public long l49848;
+    public long l49849;
+    public long l49850;
+    public long l49851;
+    public long l49852;
+    public long l49853;
+    public long l49854;
+    public long l49855;
+    public long l49856;
+    public long l49857;
+    public long l49858;
+    public long l49859;
+    public long l49860;
+    public long l49861;
+    public long l49862;
+    public long l49863;
+    public long l49864;
+    public long l49865;
+    public long l49866;
+    public long l49867;
+    public long l49868;
+    public long l49869;
+    public long l49870;
+    public long l49871;
+    public long l49872;
+    public long l49873;
+    public long l49874;
+    public long l49875;
+    public long l49876;
+    public long l49877;
+    public long l49878;
+    public long l49879;
+    public long l49880;
+    public long l49881;
+    public long l49882;
+    public long l49883;
+    public long l49884;
+    public long l49885;
+    public long l49886;
+    public long l49887;
+    public long l49888;
+    public long l49889;
+    public long l49890;
+    public long l49891;
+    public long l49892;
+    public long l49893;
+    public long l49894;
+    public long l49895;
+    public long l49896;
+    public long l49897;
+    public long l49898;
+    public long l49899;
+    public long l49900;
+    public long l49901;
+    public long l49902;
+    public long l49903;
+    public long l49904;
+    public long l49905;
+    public long l49906;
+    public long l49907;
+    public long l49908;
+    public long l49909;
+    public long l49910;
+    public long l49911;
+    public long l49912;
+    public long l49913;
+    public long l49914;
+    public long l49915;
+    public long l49916;
+    public long l49917;
+    public long l49918;
+    public long l49919;
+    public long l49920;
+    public long l49921;
+    public long l49922;
+    public long l49923;
+    public long l49924;
+    public long l49925;
+    public long l49926;
+    public long l49927;
+    public long l49928;
+    public long l49929;
+    public long l49930;
+    public long l49931;
+    public long l49932;
+    public long l49933;
+    public long l49934;
+    public long l49935;
+    public long l49936;
+    public long l49937;
+    public long l49938;
+    public long l49939;
+    public long l49940;
+    public long l49941;
+    public long l49942;
+    public long l49943;
+    public long l49944;
+    public long l49945;
+    public long l49946;
+    public long l49947;
+    public long l49948;
+    public long l49949;
+    public long l49950;
+    public long l49951;
+    public long l49952;
+    public long l49953;
+    public long l49954;
+    public long l49955;
+    public long l49956;
+    public long l49957;
+    public long l49958;
+    public long l49959;
+    public long l49960;
+    public long l49961;
+    public long l49962;
+    public long l49963;
+    public long l49964;
+    public long l49965;
+    public long l49966;
+    public long l49967;
+    public long l49968;
+    public long l49969;
+    public long l49970;
+    public long l49971;
+    public long l49972;
+    public long l49973;
+    public long l49974;
+    public long l49975;
+    public long l49976;
+    public long l49977;
+    public long l49978;
+    public long l49979;
+    public long l49980;
+    public long l49981;
+    public long l49982;
+    public long l49983;
+    public long l49984;
+    public long l49985;
+    public long l49986;
+    public long l49987;
+    public long l49988;
+    public long l49989;
+    public long l49990;
+    public long l49991;
+    public long l49992;
+    public long l49993;
+    public long l49994;
+    public long l49995;
+    public long l49996;
+    public long l49997;
+    public long l49998;
+    public long l49999;
+    public long l50000;
+    public long l50001;
+    public long l50002;
+    public long l50003;
+    public long l50004;
+    public long l50005;
+    public long l50006;
+    public long l50007;
+    public long l50008;
+    public long l50009;
+    public long l50010;
+    public long l50011;
+    public long l50012;
+    public long l50013;
+    public long l50014;
+    public long l50015;
+    public long l50016;
+    public long l50017;
+    public long l50018;
+    public long l50019;
+    public long l50020;
+    public long l50021;
+    public long l50022;
+    public long l50023;
+    public long l50024;
+    public long l50025;
+    public long l50026;
+    public long l50027;
+    public long l50028;
+    public long l50029;
+    public long l50030;
+    public long l50031;
+    public long l50032;
+    public long l50033;
+    public long l50034;
+    public long l50035;
+    public long l50036;
+    public long l50037;
+    public long l50038;
+    public long l50039;
+    public long l50040;
+    public long l50041;
+    public long l50042;
+    public long l50043;
+    public long l50044;
+    public long l50045;
+    public long l50046;
+    public long l50047;
+    public long l50048;
+    public long l50049;
+    public long l50050;
+    public long l50051;
+    public long l50052;
+    public long l50053;
+    public long l50054;
+    public long l50055;
+    public long l50056;
+    public long l50057;
+    public long l50058;
+    public long l50059;
+    public long l50060;
+    public long l50061;
+    public long l50062;
+    public long l50063;
+    public long l50064;
+    public long l50065;
+    public long l50066;
+    public long l50067;
+    public long l50068;
+    public long l50069;
+    public long l50070;
+    public long l50071;
+    public long l50072;
+    public long l50073;
+    public long l50074;
+    public long l50075;
+    public long l50076;
+    public long l50077;
+    public long l50078;
+    public long l50079;
+    public long l50080;
+    public long l50081;
+    public long l50082;
+    public long l50083;
+    public long l50084;
+    public long l50085;
+    public long l50086;
+    public long l50087;
+    public long l50088;
+    public long l50089;
+    public long l50090;
+    public long l50091;
+    public long l50092;
+    public long l50093;
+    public long l50094;
+    public long l50095;
+    public long l50096;
+    public long l50097;
+    public long l50098;
+    public long l50099;
+    public long l50100;
+    public long l50101;
+    public long l50102;
+    public long l50103;
+    public long l50104;
+    public long l50105;
+    public long l50106;
+    public long l50107;
+    public long l50108;
+    public long l50109;
+    public long l50110;
+    public long l50111;
+    public long l50112;
+    public long l50113;
+    public long l50114;
+    public long l50115;
+    public long l50116;
+    public long l50117;
+    public long l50118;
+    public long l50119;
+    public long l50120;
+    public long l50121;
+    public long l50122;
+    public long l50123;
+    public long l50124;
+    public long l50125;
+    public long l50126;
+    public long l50127;
+    public long l50128;
+    public long l50129;
+    public long l50130;
+    public long l50131;
+    public long l50132;
+    public long l50133;
+    public long l50134;
+    public long l50135;
+    public long l50136;
+    public long l50137;
+    public long l50138;
+    public long l50139;
+    public long l50140;
+    public long l50141;
+    public long l50142;
+    public long l50143;
+    public long l50144;
+    public long l50145;
+    public long l50146;
+    public long l50147;
+    public long l50148;
+    public long l50149;
+    public long l50150;
+    public long l50151;
+    public long l50152;
+    public long l50153;
+    public long l50154;
+    public long l50155;
+    public long l50156;
+    public long l50157;
+    public long l50158;
+    public long l50159;
+    public long l50160;
+    public long l50161;
+    public long l50162;
+    public long l50163;
+    public long l50164;
+    public long l50165;
+    public long l50166;
+    public long l50167;
+    public long l50168;
+    public long l50169;
+    public long l50170;
+    public long l50171;
+    public long l50172;
+    public long l50173;
+    public long l50174;
+    public long l50175;
+    public long l50176;
+    public long l50177;
+    public long l50178;
+    public long l50179;
+    public long l50180;
+    public long l50181;
+    public long l50182;
+    public long l50183;
+    public long l50184;
+    public long l50185;
+    public long l50186;
+    public long l50187;
+    public long l50188;
+    public long l50189;
+    public long l50190;
+    public long l50191;
+    public long l50192;
+    public long l50193;
+    public long l50194;
+    public long l50195;
+    public long l50196;
+    public long l50197;
+    public long l50198;
+    public long l50199;
+    public long l50200;
+    public long l50201;
+    public long l50202;
+    public long l50203;
+    public long l50204;
+    public long l50205;
+    public long l50206;
+    public long l50207;
+    public long l50208;
+    public long l50209;
+    public long l50210;
+    public long l50211;
+    public long l50212;
+    public long l50213;
+    public long l50214;
+    public long l50215;
+    public long l50216;
+    public long l50217;
+    public long l50218;
+    public long l50219;
+    public long l50220;
+    public long l50221;
+    public long l50222;
+    public long l50223;
+    public long l50224;
+    public long l50225;
+    public long l50226;
+    public long l50227;
+    public long l50228;
+    public long l50229;
+    public long l50230;
+    public long l50231;
+    public long l50232;
+    public long l50233;
+    public long l50234;
+    public long l50235;
+    public long l50236;
+    public long l50237;
+    public long l50238;
+    public long l50239;
+    public long l50240;
+    public long l50241;
+    public long l50242;
+    public long l50243;
+    public long l50244;
+    public long l50245;
+    public long l50246;
+    public long l50247;
+    public long l50248;
+    public long l50249;
+    public long l50250;
+    public long l50251;
+    public long l50252;
+    public long l50253;
+    public long l50254;
+    public long l50255;
+    public long l50256;
+    public long l50257;
+    public long l50258;
+    public long l50259;
+    public long l50260;
+    public long l50261;
+    public long l50262;
+    public long l50263;
+    public long l50264;
+    public long l50265;
+    public long l50266;
+    public long l50267;
+    public long l50268;
+    public long l50269;
+    public long l50270;
+    public long l50271;
+    public long l50272;
+    public long l50273;
+    public long l50274;
+    public long l50275;
+    public long l50276;
+    public long l50277;
+    public long l50278;
+    public long l50279;
+    public long l50280;
+    public long l50281;
+    public long l50282;
+    public long l50283;
+    public long l50284;
+    public long l50285;
+    public long l50286;
+    public long l50287;
+    public long l50288;
+    public long l50289;
+    public long l50290;
+    public long l50291;
+    public long l50292;
+    public long l50293;
+    public long l50294;
+    public long l50295;
+    public long l50296;
+    public long l50297;
+    public long l50298;
+    public long l50299;
+    public long l50300;
+    public long l50301;
+    public long l50302;
+    public long l50303;
+    public long l50304;
+    public long l50305;
+    public long l50306;
+    public long l50307;
+    public long l50308;
+    public long l50309;
+    public long l50310;
+    public long l50311;
+    public long l50312;
+    public long l50313;
+    public long l50314;
+    public long l50315;
+    public long l50316;
+    public long l50317;
+    public long l50318;
+    public long l50319;
+    public long l50320;
+    public long l50321;
+    public long l50322;
+    public long l50323;
+    public long l50324;
+    public long l50325;
+    public long l50326;
+    public long l50327;
+    public long l50328;
+    public long l50329;
+    public long l50330;
+    public long l50331;
+    public long l50332;
+    public long l50333;
+    public long l50334;
+    public long l50335;
+    public long l50336;
+    public long l50337;
+    public long l50338;
+    public long l50339;
+    public long l50340;
+    public long l50341;
+    public long l50342;
+    public long l50343;
+    public long l50344;
+    public long l50345;
+    public long l50346;
+    public long l50347;
+    public long l50348;
+    public long l50349;
+    public long l50350;
+    public long l50351;
+    public long l50352;
+    public long l50353;
+    public long l50354;
+    public long l50355;
+    public long l50356;
+    public long l50357;
+    public long l50358;
+    public long l50359;
+    public long l50360;
+    public long l50361;
+    public long l50362;
+    public long l50363;
+    public long l50364;
+    public long l50365;
+    public long l50366;
+    public long l50367;
+    public long l50368;
+    public long l50369;
+    public long l50370;
+    public long l50371;
+    public long l50372;
+    public long l50373;
+    public long l50374;
+    public long l50375;
+    public long l50376;
+    public long l50377;
+    public long l50378;
+    public long l50379;
+    public long l50380;
+    public long l50381;
+    public long l50382;
+    public long l50383;
+    public long l50384;
+    public long l50385;
+    public long l50386;
+    public long l50387;
+    public long l50388;
+    public long l50389;
+    public long l50390;
+    public long l50391;
+    public long l50392;
+    public long l50393;
+    public long l50394;
+    public long l50395;
+    public long l50396;
+    public long l50397;
+    public long l50398;
+    public long l50399;
+    public long l50400;
+    public long l50401;
+    public long l50402;
+    public long l50403;
+    public long l50404;
+    public long l50405;
+    public long l50406;
+    public long l50407;
+    public long l50408;
+    public long l50409;
+    public long l50410;
+    public long l50411;
+    public long l50412;
+    public long l50413;
+    public long l50414;
+    public long l50415;
+    public long l50416;
+    public long l50417;
+    public long l50418;
+    public long l50419;
+    public long l50420;
+    public long l50421;
+    public long l50422;
+    public long l50423;
+    public long l50424;
+    public long l50425;
+    public long l50426;
+    public long l50427;
+    public long l50428;
+    public long l50429;
+    public long l50430;
+    public long l50431;
+    public long l50432;
+    public long l50433;
+    public long l50434;
+    public long l50435;
+    public long l50436;
+    public long l50437;
+    public long l50438;
+    public long l50439;
+    public long l50440;
+    public long l50441;
+    public long l50442;
+    public long l50443;
+    public long l50444;
+    public long l50445;
+    public long l50446;
+    public long l50447;
+    public long l50448;
+    public long l50449;
+    public long l50450;
+    public long l50451;
+    public long l50452;
+    public long l50453;
+    public long l50454;
+    public long l50455;
+    public long l50456;
+    public long l50457;
+    public long l50458;
+    public long l50459;
+    public long l50460;
+    public long l50461;
+    public long l50462;
+    public long l50463;
+    public long l50464;
+    public long l50465;
+    public long l50466;
+    public long l50467;
+    public long l50468;
+    public long l50469;
+    public long l50470;
+    public long l50471;
+    public long l50472;
+    public long l50473;
+    public long l50474;
+    public long l50475;
+    public long l50476;
+    public long l50477;
+    public long l50478;
+    public long l50479;
+    public long l50480;
+    public long l50481;
+    public long l50482;
+    public long l50483;
+    public long l50484;
+    public long l50485;
+    public long l50486;
+    public long l50487;
+    public long l50488;
+    public long l50489;
+    public long l50490;
+    public long l50491;
+    public long l50492;
+    public long l50493;
+    public long l50494;
+    public long l50495;
+    public long l50496;
+    public long l50497;
+    public long l50498;
+    public long l50499;
+    public long l50500;
+    public long l50501;
+    public long l50502;
+    public long l50503;
+    public long l50504;
+    public long l50505;
+    public long l50506;
+    public long l50507;
+    public long l50508;
+    public long l50509;
+    public long l50510;
+    public long l50511;
+    public long l50512;
+    public long l50513;
+    public long l50514;
+    public long l50515;
+    public long l50516;
+    public long l50517;
+    public long l50518;
+    public long l50519;
+    public long l50520;
+    public long l50521;
+    public long l50522;
+    public long l50523;
+    public long l50524;
+    public long l50525;
+    public long l50526;
+    public long l50527;
+    public long l50528;
+    public long l50529;
+    public long l50530;
+    public long l50531;
+    public long l50532;
+    public long l50533;
+    public long l50534;
+    public long l50535;
+    public long l50536;
+    public long l50537;
+    public long l50538;
+    public long l50539;
+    public long l50540;
+    public long l50541;
+    public long l50542;
+    public long l50543;
+    public long l50544;
+    public long l50545;
+    public long l50546;
+    public long l50547;
+    public long l50548;
+    public long l50549;
+    public long l50550;
+    public long l50551;
+    public long l50552;
+    public long l50553;
+    public long l50554;
+    public long l50555;
+    public long l50556;
+    public long l50557;
+    public long l50558;
+    public long l50559;
+    public long l50560;
+    public long l50561;
+    public long l50562;
+    public long l50563;
+    public long l50564;
+    public long l50565;
+    public long l50566;
+    public long l50567;
+    public long l50568;
+    public long l50569;
+    public long l50570;
+    public long l50571;
+    public long l50572;
+    public long l50573;
+    public long l50574;
+    public long l50575;
+    public long l50576;
+    public long l50577;
+    public long l50578;
+    public long l50579;
+    public long l50580;
+    public long l50581;
+    public long l50582;
+    public long l50583;
+    public long l50584;
+    public long l50585;
+    public long l50586;
+    public long l50587;
+    public long l50588;
+    public long l50589;
+    public long l50590;
+    public long l50591;
+    public long l50592;
+    public long l50593;
+    public long l50594;
+    public long l50595;
+    public long l50596;
+    public long l50597;
+    public long l50598;
+    public long l50599;
+    public long l50600;
+    public long l50601;
+    public long l50602;
+    public long l50603;
+    public long l50604;
+    public long l50605;
+    public long l50606;
+    public long l50607;
+    public long l50608;
+    public long l50609;
+    public long l50610;
+    public long l50611;
+    public long l50612;
+    public long l50613;
+    public long l50614;
+    public long l50615;
+    public long l50616;
+    public long l50617;
+    public long l50618;
+    public long l50619;
+    public long l50620;
+    public long l50621;
+    public long l50622;
+    public long l50623;
+    public long l50624;
+    public long l50625;
+    public long l50626;
+    public long l50627;
+    public long l50628;
+    public long l50629;
+    public long l50630;
+    public long l50631;
+    public long l50632;
+    public long l50633;
+    public long l50634;
+    public long l50635;
+    public long l50636;
+    public long l50637;
+    public long l50638;
+    public long l50639;
+    public long l50640;
+    public long l50641;
+    public long l50642;
+    public long l50643;
+    public long l50644;
+    public long l50645;
+    public long l50646;
+    public long l50647;
+    public long l50648;
+    public long l50649;
+    public long l50650;
+    public long l50651;
+    public long l50652;
+    public long l50653;
+    public long l50654;
+    public long l50655;
+    public long l50656;
+    public long l50657;
+    public long l50658;
+    public long l50659;
+    public long l50660;
+    public long l50661;
+    public long l50662;
+    public long l50663;
+    public long l50664;
+    public long l50665;
+    public long l50666;
+    public long l50667;
+    public long l50668;
+    public long l50669;
+    public long l50670;
+    public long l50671;
+    public long l50672;
+    public long l50673;
+    public long l50674;
+    public long l50675;
+    public long l50676;
+    public long l50677;
+    public long l50678;
+    public long l50679;
+    public long l50680;
+    public long l50681;
+    public long l50682;
+    public long l50683;
+    public long l50684;
+    public long l50685;
+    public long l50686;
+    public long l50687;
+    public long l50688;
+    public long l50689;
+    public long l50690;
+    public long l50691;
+    public long l50692;
+    public long l50693;
+    public long l50694;
+    public long l50695;
+    public long l50696;
+    public long l50697;
+    public long l50698;
+    public long l50699;
+    public long l50700;
+    public long l50701;
+    public long l50702;
+    public long l50703;
+    public long l50704;
+    public long l50705;
+    public long l50706;
+    public long l50707;
+    public long l50708;
+    public long l50709;
+    public long l50710;
+    public long l50711;
+    public long l50712;
+    public long l50713;
+    public long l50714;
+    public long l50715;
+    public long l50716;
+    public long l50717;
+    public long l50718;
+    public long l50719;
+    public long l50720;
+    public long l50721;
+    public long l50722;
+    public long l50723;
+    public long l50724;
+    public long l50725;
+    public long l50726;
+    public long l50727;
+    public long l50728;
+    public long l50729;
+    public long l50730;
+    public long l50731;
+    public long l50732;
+    public long l50733;
+    public long l50734;
+    public long l50735;
+    public long l50736;
+    public long l50737;
+    public long l50738;
+    public long l50739;
+    public long l50740;
+    public long l50741;
+    public long l50742;
+    public long l50743;
+    public long l50744;
+    public long l50745;
+    public long l50746;
+    public long l50747;
+    public long l50748;
+    public long l50749;
+    public long l50750;
+    public long l50751;
+    public long l50752;
+    public long l50753;
+    public long l50754;
+    public long l50755;
+    public long l50756;
+    public long l50757;
+    public long l50758;
+    public long l50759;
+    public long l50760;
+    public long l50761;
+    public long l50762;
+    public long l50763;
+    public long l50764;
+    public long l50765;
+    public long l50766;
+    public long l50767;
+    public long l50768;
+    public long l50769;
+    public long l50770;
+    public long l50771;
+    public long l50772;
+    public long l50773;
+    public long l50774;
+    public long l50775;
+    public long l50776;
+    public long l50777;
+    public long l50778;
+    public long l50779;
+    public long l50780;
+    public long l50781;
+    public long l50782;
+    public long l50783;
+    public long l50784;
+    public long l50785;
+    public long l50786;
+    public long l50787;
+    public long l50788;
+    public long l50789;
+    public long l50790;
+    public long l50791;
+    public long l50792;
+    public long l50793;
+    public long l50794;
+    public long l50795;
+    public long l50796;
+    public long l50797;
+    public long l50798;
+    public long l50799;
+    public long l50800;
+    public long l50801;
+    public long l50802;
+    public long l50803;
+    public long l50804;
+    public long l50805;
+    public long l50806;
+    public long l50807;
+    public long l50808;
+    public long l50809;
+    public long l50810;
+    public long l50811;
+    public long l50812;
+    public long l50813;
+    public long l50814;
+    public long l50815;
+    public long l50816;
+    public long l50817;
+    public long l50818;
+    public long l50819;
+    public long l50820;
+    public long l50821;
+    public long l50822;
+    public long l50823;
+    public long l50824;
+    public long l50825;
+    public long l50826;
+    public long l50827;
+    public long l50828;
+    public long l50829;
+    public long l50830;
+    public long l50831;
+    public long l50832;
+    public long l50833;
+    public long l50834;
+    public long l50835;
+    public long l50836;
+    public long l50837;
+    public long l50838;
+    public long l50839;
+    public long l50840;
+    public long l50841;
+    public long l50842;
+    public long l50843;
+    public long l50844;
+    public long l50845;
+    public long l50846;
+    public long l50847;
+    public long l50848;
+    public long l50849;
+    public long l50850;
+    public long l50851;
+    public long l50852;
+    public long l50853;
+    public long l50854;
+    public long l50855;
+    public long l50856;
+    public long l50857;
+    public long l50858;
+    public long l50859;
+    public long l50860;
+    public long l50861;
+    public long l50862;
+    public long l50863;
+    public long l50864;
+    public long l50865;
+    public long l50866;
+    public long l50867;
+    public long l50868;
+    public long l50869;
+    public long l50870;
+    public long l50871;
+    public long l50872;
+    public long l50873;
+    public long l50874;
+    public long l50875;
+    public long l50876;
+    public long l50877;
+    public long l50878;
+    public long l50879;
+    public long l50880;
+    public long l50881;
+    public long l50882;
+    public long l50883;
+    public long l50884;
+    public long l50885;
+    public long l50886;
+    public long l50887;
+    public long l50888;
+    public long l50889;
+    public long l50890;
+    public long l50891;
+    public long l50892;
+    public long l50893;
+    public long l50894;
+    public long l50895;
+    public long l50896;
+    public long l50897;
+    public long l50898;
+    public long l50899;
+    public long l50900;
+    public long l50901;
+    public long l50902;
+    public long l50903;
+    public long l50904;
+    public long l50905;
+    public long l50906;
+    public long l50907;
+    public long l50908;
+    public long l50909;
+    public long l50910;
+    public long l50911;
+    public long l50912;
+    public long l50913;
+    public long l50914;
+    public long l50915;
+    public long l50916;
+    public long l50917;
+    public long l50918;
+    public long l50919;
+    public long l50920;
+    public long l50921;
+    public long l50922;
+    public long l50923;
+    public long l50924;
+    public long l50925;
+    public long l50926;
+    public long l50927;
+    public long l50928;
+    public long l50929;
+    public long l50930;
+    public long l50931;
+    public long l50932;
+    public long l50933;
+    public long l50934;
+    public long l50935;
+    public long l50936;
+    public long l50937;
+    public long l50938;
+    public long l50939;
+    public long l50940;
+    public long l50941;
+    public long l50942;
+    public long l50943;
+    public long l50944;
+    public long l50945;
+    public long l50946;
+    public long l50947;
+    public long l50948;
+    public long l50949;
+    public long l50950;
+    public long l50951;
+    public long l50952;
+    public long l50953;
+    public long l50954;
+    public long l50955;
+    public long l50956;
+    public long l50957;
+    public long l50958;
+    public long l50959;
+    public long l50960;
+    public long l50961;
+    public long l50962;
+    public long l50963;
+    public long l50964;
+    public long l50965;
+    public long l50966;
+    public long l50967;
+    public long l50968;
+    public long l50969;
+    public long l50970;
+    public long l50971;
+    public long l50972;
+    public long l50973;
+    public long l50974;
+    public long l50975;
+    public long l50976;
+    public long l50977;
+    public long l50978;
+    public long l50979;
+    public long l50980;
+    public long l50981;
+    public long l50982;
+    public long l50983;
+    public long l50984;
+    public long l50985;
+    public long l50986;
+    public long l50987;
+    public long l50988;
+    public long l50989;
+    public long l50990;
+    public long l50991;
+    public long l50992;
+    public long l50993;
+    public long l50994;
+    public long l50995;
+    public long l50996;
+    public long l50997;
+    public long l50998;
+    public long l50999;
+    public long l51000;
+    public long l51001;
+    public long l51002;
+    public long l51003;
+    public long l51004;
+    public long l51005;
+    public long l51006;
+    public long l51007;
+    public long l51008;
+    public long l51009;
+    public long l51010;
+    public long l51011;
+    public long l51012;
+    public long l51013;
+    public long l51014;
+    public long l51015;
+    public long l51016;
+    public long l51017;
+    public long l51018;
+    public long l51019;
+    public long l51020;
+    public long l51021;
+    public long l51022;
+    public long l51023;
+    public long l51024;
+    public long l51025;
+    public long l51026;
+    public long l51027;
+    public long l51028;
+    public long l51029;
+    public long l51030;
+    public long l51031;
+    public long l51032;
+    public long l51033;
+    public long l51034;
+    public long l51035;
+    public long l51036;
+    public long l51037;
+    public long l51038;
+    public long l51039;
+    public long l51040;
+    public long l51041;
+    public long l51042;
+    public long l51043;
+    public long l51044;
+    public long l51045;
+    public long l51046;
+    public long l51047;
+    public long l51048;
+    public long l51049;
+    public long l51050;
+    public long l51051;
+    public long l51052;
+    public long l51053;
+    public long l51054;
+    public long l51055;
+    public long l51056;
+    public long l51057;
+    public long l51058;
+    public long l51059;
+    public long l51060;
+    public long l51061;
+    public long l51062;
+    public long l51063;
+    public long l51064;
+    public long l51065;
+    public long l51066;
+    public long l51067;
+    public long l51068;
+    public long l51069;
+    public long l51070;
+    public long l51071;
+    public long l51072;
+    public long l51073;
+    public long l51074;
+    public long l51075;
+    public long l51076;
+    public long l51077;
+    public long l51078;
+    public long l51079;
+    public long l51080;
+    public long l51081;
+    public long l51082;
+    public long l51083;
+    public long l51084;
+    public long l51085;
+    public long l51086;
+    public long l51087;
+    public long l51088;
+    public long l51089;
+    public long l51090;
+    public long l51091;
+    public long l51092;
+    public long l51093;
+    public long l51094;
+    public long l51095;
+    public long l51096;
+    public long l51097;
+    public long l51098;
+    public long l51099;
+    public long l51100;
+    public long l51101;
+    public long l51102;
+    public long l51103;
+    public long l51104;
+    public long l51105;
+    public long l51106;
+    public long l51107;
+    public long l51108;
+    public long l51109;
+    public long l51110;
+    public long l51111;
+    public long l51112;
+    public long l51113;
+    public long l51114;
+    public long l51115;
+    public long l51116;
+    public long l51117;
+    public long l51118;
+    public long l51119;
+    public long l51120;
+    public long l51121;
+    public long l51122;
+    public long l51123;
+    public long l51124;
+    public long l51125;
+    public long l51126;
+    public long l51127;
+    public long l51128;
+    public long l51129;
+    public long l51130;
+    public long l51131;
+    public long l51132;
+    public long l51133;
+    public long l51134;
+    public long l51135;
+    public long l51136;
+    public long l51137;
+    public long l51138;
+    public long l51139;
+    public long l51140;
+    public long l51141;
+    public long l51142;
+    public long l51143;
+    public long l51144;
+    public long l51145;
+    public long l51146;
+    public long l51147;
+    public long l51148;
+    public long l51149;
+    public long l51150;
+    public long l51151;
+    public long l51152;
+    public long l51153;
+    public long l51154;
+    public long l51155;
+    public long l51156;
+    public long l51157;
+    public long l51158;
+    public long l51159;
+    public long l51160;
+    public long l51161;
+    public long l51162;
+    public long l51163;
+    public long l51164;
+    public long l51165;
+    public long l51166;
+    public long l51167;
+    public long l51168;
+    public long l51169;
+    public long l51170;
+    public long l51171;
+    public long l51172;
+    public long l51173;
+    public long l51174;
+    public long l51175;
+    public long l51176;
+    public long l51177;
+    public long l51178;
+    public long l51179;
+    public long l51180;
+    public long l51181;
+    public long l51182;
+    public long l51183;
+    public long l51184;
+    public long l51185;
+    public long l51186;
+    public long l51187;
+    public long l51188;
+    public long l51189;
+    public long l51190;
+    public long l51191;
+    public long l51192;
+    public long l51193;
+    public long l51194;
+    public long l51195;
+    public long l51196;
+    public long l51197;
+    public long l51198;
+    public long l51199;
+    public long l51200;
+    public long l51201;
+    public long l51202;
+    public long l51203;
+    public long l51204;
+    public long l51205;
+    public long l51206;
+    public long l51207;
+    public long l51208;
+    public long l51209;
+    public long l51210;
+    public long l51211;
+    public long l51212;
+    public long l51213;
+    public long l51214;
+    public long l51215;
+    public long l51216;
+    public long l51217;
+    public long l51218;
+    public long l51219;
+    public long l51220;
+    public long l51221;
+    public long l51222;
+    public long l51223;
+    public long l51224;
+    public long l51225;
+    public long l51226;
+    public long l51227;
+    public long l51228;
+    public long l51229;
+    public long l51230;
+    public long l51231;
+    public long l51232;
+    public long l51233;
+    public long l51234;
+    public long l51235;
+    public long l51236;
+    public long l51237;
+    public long l51238;
+    public long l51239;
+    public long l51240;
+    public long l51241;
+    public long l51242;
+    public long l51243;
+    public long l51244;
+    public long l51245;
+    public long l51246;
+    public long l51247;
+    public long l51248;
+    public long l51249;
+    public long l51250;
+    public long l51251;
+    public long l51252;
+    public long l51253;
+    public long l51254;
+    public long l51255;
+    public long l51256;
+    public long l51257;
+    public long l51258;
+    public long l51259;
+    public long l51260;
+    public long l51261;
+    public long l51262;
+    public long l51263;
+    public long l51264;
+    public long l51265;
+    public long l51266;
+    public long l51267;
+    public long l51268;
+    public long l51269;
+    public long l51270;
+    public long l51271;
+    public long l51272;
+    public long l51273;
+    public long l51274;
+    public long l51275;
+    public long l51276;
+    public long l51277;
+    public long l51278;
+    public long l51279;
+    public long l51280;
+    public long l51281;
+    public long l51282;
+    public long l51283;
+    public long l51284;
+    public long l51285;
+    public long l51286;
+    public long l51287;
+    public long l51288;
+    public long l51289;
+    public long l51290;
+    public long l51291;
+    public long l51292;
+    public long l51293;
+    public long l51294;
+    public long l51295;
+    public long l51296;
+    public long l51297;
+    public long l51298;
+    public long l51299;
+    public long l51300;
+    public long l51301;
+    public long l51302;
+    public long l51303;
+    public long l51304;
+    public long l51305;
+    public long l51306;
+    public long l51307;
+    public long l51308;
+    public long l51309;
+    public long l51310;
+    public long l51311;
+    public long l51312;
+    public long l51313;
+    public long l51314;
+    public long l51315;
+    public long l51316;
+    public long l51317;
+    public long l51318;
+    public long l51319;
+    public long l51320;
+    public long l51321;
+    public long l51322;
+    public long l51323;
+    public long l51324;
+    public long l51325;
+    public long l51326;
+    public long l51327;
+    public long l51328;
+    public long l51329;
+    public long l51330;
+    public long l51331;
+    public long l51332;
+    public long l51333;
+    public long l51334;
+    public long l51335;
+    public long l51336;
+    public long l51337;
+    public long l51338;
+    public long l51339;
+    public long l51340;
+    public long l51341;
+    public long l51342;
+    public long l51343;
+    public long l51344;
+    public long l51345;
+    public long l51346;
+    public long l51347;
+    public long l51348;
+    public long l51349;
+    public long l51350;
+    public long l51351;
+    public long l51352;
+    public long l51353;
+    public long l51354;
+    public long l51355;
+    public long l51356;
+    public long l51357;
+    public long l51358;
+    public long l51359;
+    public long l51360;
+    public long l51361;
+    public long l51362;
+    public long l51363;
+    public long l51364;
+    public long l51365;
+    public long l51366;
+    public long l51367;
+    public long l51368;
+    public long l51369;
+    public long l51370;
+    public long l51371;
+    public long l51372;
+    public long l51373;
+    public long l51374;
+    public long l51375;
+    public long l51376;
+    public long l51377;
+    public long l51378;
+    public long l51379;
+    public long l51380;
+    public long l51381;
+    public long l51382;
+    public long l51383;
+    public long l51384;
+    public long l51385;
+    public long l51386;
+    public long l51387;
+    public long l51388;
+    public long l51389;
+    public long l51390;
+    public long l51391;
+    public long l51392;
+    public long l51393;
+    public long l51394;
+    public long l51395;
+    public long l51396;
+    public long l51397;
+    public long l51398;
+    public long l51399;
+    public long l51400;
+    public long l51401;
+    public long l51402;
+    public long l51403;
+    public long l51404;
+    public long l51405;
+    public long l51406;
+    public long l51407;
+    public long l51408;
+    public long l51409;
+    public long l51410;
+    public long l51411;
+    public long l51412;
+    public long l51413;
+    public long l51414;
+    public long l51415;
+    public long l51416;
+    public long l51417;
+    public long l51418;
+    public long l51419;
+    public long l51420;
+    public long l51421;
+    public long l51422;
+    public long l51423;
+    public long l51424;
+    public long l51425;
+    public long l51426;
+    public long l51427;
+    public long l51428;
+    public long l51429;
+    public long l51430;
+    public long l51431;
+    public long l51432;
+    public long l51433;
+    public long l51434;
+    public long l51435;
+    public long l51436;
+    public long l51437;
+    public long l51438;
+    public long l51439;
+    public long l51440;
+    public long l51441;
+    public long l51442;
+    public long l51443;
+    public long l51444;
+    public long l51445;
+    public long l51446;
+    public long l51447;
+    public long l51448;
+    public long l51449;
+    public long l51450;
+    public long l51451;
+    public long l51452;
+    public long l51453;
+    public long l51454;
+    public long l51455;
+    public long l51456;
+    public long l51457;
+    public long l51458;
+    public long l51459;
+    public long l51460;
+    public long l51461;
+    public long l51462;
+    public long l51463;
+    public long l51464;
+    public long l51465;
+    public long l51466;
+    public long l51467;
+    public long l51468;
+    public long l51469;
+    public long l51470;
+    public long l51471;
+    public long l51472;
+    public long l51473;
+    public long l51474;
+    public long l51475;
+    public long l51476;
+    public long l51477;
+    public long l51478;
+    public long l51479;
+    public long l51480;
+    public long l51481;
+    public long l51482;
+    public long l51483;
+    public long l51484;
+    public long l51485;
+    public long l51486;
+    public long l51487;
+    public long l51488;
+    public long l51489;
+    public long l51490;
+    public long l51491;
+    public long l51492;
+    public long l51493;
+    public long l51494;
+    public long l51495;
+    public long l51496;
+    public long l51497;
+    public long l51498;
+    public long l51499;
+    public long l51500;
+    public long l51501;
+    public long l51502;
+    public long l51503;
+    public long l51504;
+    public long l51505;
+    public long l51506;
+    public long l51507;
+    public long l51508;
+    public long l51509;
+    public long l51510;
+    public long l51511;
+    public long l51512;
+    public long l51513;
+    public long l51514;
+    public long l51515;
+    public long l51516;
+    public long l51517;
+    public long l51518;
+    public long l51519;
+    public long l51520;
+    public long l51521;
+    public long l51522;
+    public long l51523;
+    public long l51524;
+    public long l51525;
+    public long l51526;
+    public long l51527;
+    public long l51528;
+    public long l51529;
+    public long l51530;
+    public long l51531;
+    public long l51532;
+    public long l51533;
+    public long l51534;
+    public long l51535;
+    public long l51536;
+    public long l51537;
+    public long l51538;
+    public long l51539;
+    public long l51540;
+    public long l51541;
+    public long l51542;
+    public long l51543;
+    public long l51544;
+    public long l51545;
+    public long l51546;
+    public long l51547;
+    public long l51548;
+    public long l51549;
+    public long l51550;
+    public long l51551;
+    public long l51552;
+    public long l51553;
+    public long l51554;
+    public long l51555;
+    public long l51556;
+    public long l51557;
+    public long l51558;
+    public long l51559;
+    public long l51560;
+    public long l51561;
+    public long l51562;
+    public long l51563;
+    public long l51564;
+    public long l51565;
+    public long l51566;
+    public long l51567;
+    public long l51568;
+    public long l51569;
+    public long l51570;
+    public long l51571;
+    public long l51572;
+    public long l51573;
+    public long l51574;
+    public long l51575;
+    public long l51576;
+    public long l51577;
+    public long l51578;
+    public long l51579;
+    public long l51580;
+    public long l51581;
+    public long l51582;
+    public long l51583;
+    public long l51584;
+    public long l51585;
+    public long l51586;
+    public long l51587;
+    public long l51588;
+    public long l51589;
+    public long l51590;
+    public long l51591;
+    public long l51592;
+    public long l51593;
+    public long l51594;
+    public long l51595;
+    public long l51596;
+    public long l51597;
+    public long l51598;
+    public long l51599;
+    public long l51600;
+    public long l51601;
+    public long l51602;
+    public long l51603;
+    public long l51604;
+    public long l51605;
+    public long l51606;
+    public long l51607;
+    public long l51608;
+    public long l51609;
+    public long l51610;
+    public long l51611;
+    public long l51612;
+    public long l51613;
+    public long l51614;
+    public long l51615;
+    public long l51616;
+    public long l51617;
+    public long l51618;
+    public long l51619;
+    public long l51620;
+    public long l51621;
+    public long l51622;
+    public long l51623;
+    public long l51624;
+    public long l51625;
+    public long l51626;
+    public long l51627;
+    public long l51628;
+    public long l51629;
+    public long l51630;
+    public long l51631;
+    public long l51632;
+    public long l51633;
+    public long l51634;
+    public long l51635;
+    public long l51636;
+    public long l51637;
+    public long l51638;
+    public long l51639;
+    public long l51640;
+    public long l51641;
+    public long l51642;
+    public long l51643;
+    public long l51644;
+    public long l51645;
+    public long l51646;
+    public long l51647;
+    public long l51648;
+    public long l51649;
+    public long l51650;
+    public long l51651;
+    public long l51652;
+    public long l51653;
+    public long l51654;
+    public long l51655;
+    public long l51656;
+    public long l51657;
+    public long l51658;
+    public long l51659;
+    public long l51660;
+    public long l51661;
+    public long l51662;
+    public long l51663;
+    public long l51664;
+    public long l51665;
+    public long l51666;
+    public long l51667;
+    public long l51668;
+    public long l51669;
+    public long l51670;
+    public long l51671;
+    public long l51672;
+    public long l51673;
+    public long l51674;
+    public long l51675;
+    public long l51676;
+    public long l51677;
+    public long l51678;
+    public long l51679;
+    public long l51680;
+    public long l51681;
+    public long l51682;
+    public long l51683;
+    public long l51684;
+    public long l51685;
+    public long l51686;
+    public long l51687;
+    public long l51688;
+    public long l51689;
+    public long l51690;
+    public long l51691;
+    public long l51692;
+    public long l51693;
+    public long l51694;
+    public long l51695;
+    public long l51696;
+    public long l51697;
+    public long l51698;
+    public long l51699;
+    public long l51700;
+    public long l51701;
+    public long l51702;
+    public long l51703;
+    public long l51704;
+    public long l51705;
+    public long l51706;
+    public long l51707;
+    public long l51708;
+    public long l51709;
+    public long l51710;
+    public long l51711;
+    public long l51712;
+    public long l51713;
+    public long l51714;
+    public long l51715;
+    public long l51716;
+    public long l51717;
+    public long l51718;
+    public long l51719;
+    public long l51720;
+    public long l51721;
+    public long l51722;
+    public long l51723;
+    public long l51724;
+    public long l51725;
+    public long l51726;
+    public long l51727;
+    public long l51728;
+    public long l51729;
+    public long l51730;
+    public long l51731;
+    public long l51732;
+    public long l51733;
+    public long l51734;
+    public long l51735;
+    public long l51736;
+    public long l51737;
+    public long l51738;
+    public long l51739;
+    public long l51740;
+    public long l51741;
+    public long l51742;
+    public long l51743;
+    public long l51744;
+    public long l51745;
+    public long l51746;
+    public long l51747;
+    public long l51748;
+    public long l51749;
+    public long l51750;
+    public long l51751;
+    public long l51752;
+    public long l51753;
+    public long l51754;
+    public long l51755;
+    public long l51756;
+    public long l51757;
+    public long l51758;
+    public long l51759;
+    public long l51760;
+    public long l51761;
+    public long l51762;
+    public long l51763;
+    public long l51764;
+    public long l51765;
+    public long l51766;
+    public long l51767;
+    public long l51768;
+    public long l51769;
+    public long l51770;
+    public long l51771;
+    public long l51772;
+    public long l51773;
+    public long l51774;
+    public long l51775;
+    public long l51776;
+    public long l51777;
+    public long l51778;
+    public long l51779;
+    public long l51780;
+    public long l51781;
+    public long l51782;
+    public long l51783;
+    public long l51784;
+    public long l51785;
+    public long l51786;
+    public long l51787;
+    public long l51788;
+    public long l51789;
+    public long l51790;
+    public long l51791;
+    public long l51792;
+    public long l51793;
+    public long l51794;
+    public long l51795;
+    public long l51796;
+    public long l51797;
+    public long l51798;
+    public long l51799;
+    public long l51800;
+    public long l51801;
+    public long l51802;
+    public long l51803;
+    public long l51804;
+    public long l51805;
+    public long l51806;
+    public long l51807;
+    public long l51808;
+    public long l51809;
+    public long l51810;
+    public long l51811;
+    public long l51812;
+    public long l51813;
+    public long l51814;
+    public long l51815;
+    public long l51816;
+    public long l51817;
+    public long l51818;
+    public long l51819;
+    public long l51820;
+    public long l51821;
+    public long l51822;
+    public long l51823;
+    public long l51824;
+    public long l51825;
+    public long l51826;
+    public long l51827;
+    public long l51828;
+    public long l51829;
+    public long l51830;
+    public long l51831;
+    public long l51832;
+    public long l51833;
+    public long l51834;
+    public long l51835;
+    public long l51836;
+    public long l51837;
+    public long l51838;
+    public long l51839;
+    public long l51840;
+    public long l51841;
+    public long l51842;
+    public long l51843;
+    public long l51844;
+    public long l51845;
+    public long l51846;
+    public long l51847;
+    public long l51848;
+    public long l51849;
+    public long l51850;
+    public long l51851;
+    public long l51852;
+    public long l51853;
+    public long l51854;
+    public long l51855;
+    public long l51856;
+    public long l51857;
+    public long l51858;
+    public long l51859;
+    public long l51860;
+    public long l51861;
+    public long l51862;
+    public long l51863;
+    public long l51864;
+    public long l51865;
+    public long l51866;
+    public long l51867;
+    public long l51868;
+    public long l51869;
+    public long l51870;
+    public long l51871;
+    public long l51872;
+    public long l51873;
+    public long l51874;
+    public long l51875;
+    public long l51876;
+    public long l51877;
+    public long l51878;
+    public long l51879;
+    public long l51880;
+    public long l51881;
+    public long l51882;
+    public long l51883;
+    public long l51884;
+    public long l51885;
+    public long l51886;
+    public long l51887;
+    public long l51888;
+    public long l51889;
+    public long l51890;
+    public long l51891;
+    public long l51892;
+    public long l51893;
+    public long l51894;
+    public long l51895;
+    public long l51896;
+    public long l51897;
+    public long l51898;
+    public long l51899;
+    public long l51900;
+    public long l51901;
+    public long l51902;
+    public long l51903;
+    public long l51904;
+    public long l51905;
+    public long l51906;
+    public long l51907;
+    public long l51908;
+    public long l51909;
+    public long l51910;
+    public long l51911;
+    public long l51912;
+    public long l51913;
+    public long l51914;
+    public long l51915;
+    public long l51916;
+    public long l51917;
+    public long l51918;
+    public long l51919;
+    public long l51920;
+    public long l51921;
+    public long l51922;
+    public long l51923;
+    public long l51924;
+    public long l51925;
+    public long l51926;
+    public long l51927;
+    public long l51928;
+    public long l51929;
+    public long l51930;
+    public long l51931;
+    public long l51932;
+    public long l51933;
+    public long l51934;
+    public long l51935;
+    public long l51936;
+    public long l51937;
+    public long l51938;
+    public long l51939;
+    public long l51940;
+    public long l51941;
+    public long l51942;
+    public long l51943;
+    public long l51944;
+    public long l51945;
+    public long l51946;
+    public long l51947;
+    public long l51948;
+    public long l51949;
+    public long l51950;
+    public long l51951;
+    public long l51952;
+    public long l51953;
+    public long l51954;
+    public long l51955;
+    public long l51956;
+    public long l51957;
+    public long l51958;
+    public long l51959;
+    public long l51960;
+    public long l51961;
+    public long l51962;
+    public long l51963;
+    public long l51964;
+    public long l51965;
+    public long l51966;
+    public long l51967;
+    public long l51968;
+    public long l51969;
+    public long l51970;
+    public long l51971;
+    public long l51972;
+    public long l51973;
+    public long l51974;
+    public long l51975;
+    public long l51976;
+    public long l51977;
+    public long l51978;
+    public long l51979;
+    public long l51980;
+    public long l51981;
+    public long l51982;
+    public long l51983;
+    public long l51984;
+    public long l51985;
+    public long l51986;
+    public long l51987;
+    public long l51988;
+    public long l51989;
+    public long l51990;
+    public long l51991;
+    public long l51992;
+    public long l51993;
+    public long l51994;
+    public long l51995;
+    public long l51996;
+    public long l51997;
+    public long l51998;
+    public long l51999;
+    public long l52000;
+    public long l52001;
+    public long l52002;
+    public long l52003;
+    public long l52004;
+    public long l52005;
+    public long l52006;
+    public long l52007;
+    public long l52008;
+    public long l52009;
+    public long l52010;
+    public long l52011;
+    public long l52012;
+    public long l52013;
+    public long l52014;
+    public long l52015;
+    public long l52016;
+    public long l52017;
+    public long l52018;
+    public long l52019;
+    public long l52020;
+    public long l52021;
+    public long l52022;
+    public long l52023;
+    public long l52024;
+    public long l52025;
+    public long l52026;
+    public long l52027;
+    public long l52028;
+    public long l52029;
+    public long l52030;
+    public long l52031;
+    public long l52032;
+    public long l52033;
+    public long l52034;
+    public long l52035;
+    public long l52036;
+    public long l52037;
+    public long l52038;
+    public long l52039;
+    public long l52040;
+    public long l52041;
+    public long l52042;
+    public long l52043;
+    public long l52044;
+    public long l52045;
+    public long l52046;
+    public long l52047;
+    public long l52048;
+    public long l52049;
+    public long l52050;
+    public long l52051;
+    public long l52052;
+    public long l52053;
+    public long l52054;
+    public long l52055;
+    public long l52056;
+    public long l52057;
+    public long l52058;
+    public long l52059;
+    public long l52060;
+    public long l52061;
+    public long l52062;
+    public long l52063;
+    public long l52064;
+    public long l52065;
+    public long l52066;
+    public long l52067;
+    public long l52068;
+    public long l52069;
+    public long l52070;
+    public long l52071;
+    public long l52072;
+    public long l52073;
+    public long l52074;
+    public long l52075;
+    public long l52076;
+    public long l52077;
+    public long l52078;
+    public long l52079;
+    public long l52080;
+    public long l52081;
+    public long l52082;
+    public long l52083;
+    public long l52084;
+    public long l52085;
+    public long l52086;
+    public long l52087;
+    public long l52088;
+    public long l52089;
+    public long l52090;
+    public long l52091;
+    public long l52092;
+    public long l52093;
+    public long l52094;
+    public long l52095;
+    public long l52096;
+    public long l52097;
+    public long l52098;
+    public long l52099;
+    public long l52100;
+    public long l52101;
+    public long l52102;
+    public long l52103;
+    public long l52104;
+    public long l52105;
+    public long l52106;
+    public long l52107;
+    public long l52108;
+    public long l52109;
+    public long l52110;
+    public long l52111;
+    public long l52112;
+    public long l52113;
+    public long l52114;
+    public long l52115;
+    public long l52116;
+    public long l52117;
+    public long l52118;
+    public long l52119;
+    public long l52120;
+    public long l52121;
+    public long l52122;
+    public long l52123;
+    public long l52124;
+    public long l52125;
+    public long l52126;
+    public long l52127;
+    public long l52128;
+    public long l52129;
+    public long l52130;
+    public long l52131;
+    public long l52132;
+    public long l52133;
+    public long l52134;
+    public long l52135;
+    public long l52136;
+    public long l52137;
+    public long l52138;
+    public long l52139;
+    public long l52140;
+    public long l52141;
+    public long l52142;
+    public long l52143;
+    public long l52144;
+    public long l52145;
+    public long l52146;
+    public long l52147;
+    public long l52148;
+    public long l52149;
+    public long l52150;
+    public long l52151;
+    public long l52152;
+    public long l52153;
+    public long l52154;
+    public long l52155;
+    public long l52156;
+    public long l52157;
+    public long l52158;
+    public long l52159;
+    public long l52160;
+    public long l52161;
+    public long l52162;
+    public long l52163;
+    public long l52164;
+    public long l52165;
+    public long l52166;
+    public long l52167;
+    public long l52168;
+    public long l52169;
+    public long l52170;
+    public long l52171;
+    public long l52172;
+    public long l52173;
+    public long l52174;
+    public long l52175;
+    public long l52176;
+    public long l52177;
+    public long l52178;
+    public long l52179;
+    public long l52180;
+    public long l52181;
+    public long l52182;
+    public long l52183;
+    public long l52184;
+    public long l52185;
+    public long l52186;
+    public long l52187;
+    public long l52188;
+    public long l52189;
+    public long l52190;
+    public long l52191;
+    public long l52192;
+    public long l52193;
+    public long l52194;
+    public long l52195;
+    public long l52196;
+    public long l52197;
+    public long l52198;
+    public long l52199;
+    public long l52200;
+    public long l52201;
+    public long l52202;
+    public long l52203;
+    public long l52204;
+    public long l52205;
+    public long l52206;
+    public long l52207;
+    public long l52208;
+    public long l52209;
+    public long l52210;
+    public long l52211;
+    public long l52212;
+    public long l52213;
+    public long l52214;
+    public long l52215;
+    public long l52216;
+    public long l52217;
+    public long l52218;
+    public long l52219;
+    public long l52220;
+    public long l52221;
+    public long l52222;
+    public long l52223;
+    public long l52224;
+    public long l52225;
+    public long l52226;
+    public long l52227;
+    public long l52228;
+    public long l52229;
+    public long l52230;
+    public long l52231;
+    public long l52232;
+    public long l52233;
+    public long l52234;
+    public long l52235;
+    public long l52236;
+    public long l52237;
+    public long l52238;
+    public long l52239;
+    public long l52240;
+    public long l52241;
+    public long l52242;
+    public long l52243;
+    public long l52244;
+    public long l52245;
+    public long l52246;
+    public long l52247;
+    public long l52248;
+    public long l52249;
+    public long l52250;
+    public long l52251;
+    public long l52252;
+    public long l52253;
+    public long l52254;
+    public long l52255;
+    public long l52256;
+    public long l52257;
+    public long l52258;
+    public long l52259;
+    public long l52260;
+    public long l52261;
+    public long l52262;
+    public long l52263;
+    public long l52264;
+    public long l52265;
+    public long l52266;
+    public long l52267;
+    public long l52268;
+    public long l52269;
+    public long l52270;
+    public long l52271;
+    public long l52272;
+    public long l52273;
+    public long l52274;
+    public long l52275;
+    public long l52276;
+    public long l52277;
+    public long l52278;
+    public long l52279;
+    public long l52280;
+    public long l52281;
+    public long l52282;
+    public long l52283;
+    public long l52284;
+    public long l52285;
+    public long l52286;
+    public long l52287;
+    public long l52288;
+    public long l52289;
+    public long l52290;
+    public long l52291;
+    public long l52292;
+    public long l52293;
+    public long l52294;
+    public long l52295;
+    public long l52296;
+    public long l52297;
+    public long l52298;
+    public long l52299;
+    public long l52300;
+    public long l52301;
+    public long l52302;
+    public long l52303;
+    public long l52304;
+    public long l52305;
+    public long l52306;
+    public long l52307;
+    public long l52308;
+    public long l52309;
+    public long l52310;
+    public long l52311;
+    public long l52312;
+    public long l52313;
+    public long l52314;
+    public long l52315;
+    public long l52316;
+    public long l52317;
+    public long l52318;
+    public long l52319;
+    public long l52320;
+    public long l52321;
+    public long l52322;
+    public long l52323;
+    public long l52324;
+    public long l52325;
+    public long l52326;
+    public long l52327;
+    public long l52328;
+    public long l52329;
+    public long l52330;
+    public long l52331;
+    public long l52332;
+    public long l52333;
+    public long l52334;
+    public long l52335;
+    public long l52336;
+    public long l52337;
+    public long l52338;
+    public long l52339;
+    public long l52340;
+    public long l52341;
+    public long l52342;
+    public long l52343;
+    public long l52344;
+    public long l52345;
+    public long l52346;
+    public long l52347;
+    public long l52348;
+    public long l52349;
+    public long l52350;
+    public long l52351;
+    public long l52352;
+    public long l52353;
+    public long l52354;
+    public long l52355;
+    public long l52356;
+    public long l52357;
+    public long l52358;
+    public long l52359;
+    public long l52360;
+    public long l52361;
+    public long l52362;
+    public long l52363;
+    public long l52364;
+    public long l52365;
+    public long l52366;
+    public long l52367;
+    public long l52368;
+    public long l52369;
+    public long l52370;
+    public long l52371;
+    public long l52372;
+    public long l52373;
+    public long l52374;
+    public long l52375;
+    public long l52376;
+    public long l52377;
+    public long l52378;
+    public long l52379;
+    public long l52380;
+    public long l52381;
+    public long l52382;
+    public long l52383;
+    public long l52384;
+    public long l52385;
+    public long l52386;
+    public long l52387;
+    public long l52388;
+    public long l52389;
+    public long l52390;
+    public long l52391;
+    public long l52392;
+    public long l52393;
+    public long l52394;
+    public long l52395;
+    public long l52396;
+    public long l52397;
+    public long l52398;
+    public long l52399;
+    public long l52400;
+    public long l52401;
+    public long l52402;
+    public long l52403;
+    public long l52404;
+    public long l52405;
+    public long l52406;
+    public long l52407;
+    public long l52408;
+    public long l52409;
+    public long l52410;
+    public long l52411;
+    public long l52412;
+    public long l52413;
+    public long l52414;
+    public long l52415;
+    public long l52416;
+    public long l52417;
+    public long l52418;
+    public long l52419;
+    public long l52420;
+    public long l52421;
+    public long l52422;
+    public long l52423;
+    public long l52424;
+    public long l52425;
+    public long l52426;
+    public long l52427;
+    public long l52428;
+    public long l52429;
+    public long l52430;
+    public long l52431;
+    public long l52432;
+    public long l52433;
+    public long l52434;
+    public long l52435;
+    public long l52436;
+    public long l52437;
+    public long l52438;
+    public long l52439;
+    public long l52440;
+    public long l52441;
+    public long l52442;
+    public long l52443;
+    public long l52444;
+    public long l52445;
+    public long l52446;
+    public long l52447;
+    public long l52448;
+    public long l52449;
+    public long l52450;
+    public long l52451;
+    public long l52452;
+    public long l52453;
+    public long l52454;
+    public long l52455;
+    public long l52456;
+    public long l52457;
+    public long l52458;
+    public long l52459;
+    public long l52460;
+    public long l52461;
+    public long l52462;
+    public long l52463;
+    public long l52464;
+    public long l52465;
+    public long l52466;
+    public long l52467;
+    public long l52468;
+    public long l52469;
+    public long l52470;
+    public long l52471;
+    public long l52472;
+    public long l52473;
+    public long l52474;
+    public long l52475;
+    public long l52476;
+    public long l52477;
+    public long l52478;
+    public long l52479;
+    public long l52480;
+    public long l52481;
+    public long l52482;
+    public long l52483;
+    public long l52484;
+    public long l52485;
+    public long l52486;
+    public long l52487;
+    public long l52488;
+    public long l52489;
+    public long l52490;
+    public long l52491;
+    public long l52492;
+    public long l52493;
+    public long l52494;
+    public long l52495;
+    public long l52496;
+    public long l52497;
+    public long l52498;
+    public long l52499;
+    public long l52500;
+    public long l52501;
+    public long l52502;
+    public long l52503;
+    public long l52504;
+    public long l52505;
+    public long l52506;
+    public long l52507;
+    public long l52508;
+    public long l52509;
+    public long l52510;
+    public long l52511;
+    public long l52512;
+    public long l52513;
+    public long l52514;
+    public long l52515;
+    public long l52516;
+    public long l52517;
+    public long l52518;
+    public long l52519;
+    public long l52520;
+    public long l52521;
+    public long l52522;
+    public long l52523;
+    public long l52524;
+    public long l52525;
+    public long l52526;
+    public long l52527;
+    public long l52528;
+    public long l52529;
+    public long l52530;
+    public long l52531;
+    public long l52532;
+    public long l52533;
+    public long l52534;
+    public long l52535;
+    public long l52536;
+    public long l52537;
+    public long l52538;
+    public long l52539;
+    public long l52540;
+    public long l52541;
+    public long l52542;
+    public long l52543;
+    public long l52544;
+    public long l52545;
+    public long l52546;
+    public long l52547;
+    public long l52548;
+    public long l52549;
+    public long l52550;
+    public long l52551;
+    public long l52552;
+    public long l52553;
+    public long l52554;
+    public long l52555;
+    public long l52556;
+    public long l52557;
+    public long l52558;
+    public long l52559;
+    public long l52560;
+    public long l52561;
+    public long l52562;
+    public long l52563;
+    public long l52564;
+    public long l52565;
+    public long l52566;
+    public long l52567;
+    public long l52568;
+    public long l52569;
+    public long l52570;
+    public long l52571;
+    public long l52572;
+    public long l52573;
+    public long l52574;
+    public long l52575;
+    public long l52576;
+    public long l52577;
+    public long l52578;
+    public long l52579;
+    public long l52580;
+    public long l52581;
+    public long l52582;
+    public long l52583;
+    public long l52584;
+    public long l52585;
+    public long l52586;
+    public long l52587;
+    public long l52588;
+    public long l52589;
+    public long l52590;
+    public long l52591;
+    public long l52592;
+    public long l52593;
+    public long l52594;
+    public long l52595;
+    public long l52596;
+    public long l52597;
+    public long l52598;
+    public long l52599;
+    public long l52600;
+    public long l52601;
+    public long l52602;
+    public long l52603;
+    public long l52604;
+    public long l52605;
+    public long l52606;
+    public long l52607;
+    public long l52608;
+    public long l52609;
+    public long l52610;
+    public long l52611;
+    public long l52612;
+    public long l52613;
+    public long l52614;
+    public long l52615;
+    public long l52616;
+    public long l52617;
+    public long l52618;
+    public long l52619;
+    public long l52620;
+    public long l52621;
+    public long l52622;
+    public long l52623;
+    public long l52624;
+    public long l52625;
+    public long l52626;
+    public long l52627;
+    public long l52628;
+    public long l52629;
+    public long l52630;
+    public long l52631;
+    public long l52632;
+    public long l52633;
+    public long l52634;
+    public long l52635;
+    public long l52636;
+    public long l52637;
+    public long l52638;
+    public long l52639;
+    public long l52640;
+    public long l52641;
+    public long l52642;
+    public long l52643;
+    public long l52644;
+    public long l52645;
+    public long l52646;
+    public long l52647;
+    public long l52648;
+    public long l52649;
+    public long l52650;
+    public long l52651;
+    public long l52652;
+    public long l52653;
+    public long l52654;
+    public long l52655;
+    public long l52656;
+    public long l52657;
+    public long l52658;
+    public long l52659;
+    public long l52660;
+    public long l52661;
+    public long l52662;
+    public long l52663;
+    public long l52664;
+    public long l52665;
+    public long l52666;
+    public long l52667;
+    public long l52668;
+    public long l52669;
+    public long l52670;
+    public long l52671;
+    public long l52672;
+    public long l52673;
+    public long l52674;
+    public long l52675;
+    public long l52676;
+    public long l52677;
+    public long l52678;
+    public long l52679;
+    public long l52680;
+    public long l52681;
+    public long l52682;
+    public long l52683;
+    public long l52684;
+    public long l52685;
+    public long l52686;
+    public long l52687;
+    public long l52688;
+    public long l52689;
+    public long l52690;
+    public long l52691;
+    public long l52692;
+    public long l52693;
+    public long l52694;
+    public long l52695;
+    public long l52696;
+    public long l52697;
+    public long l52698;
+    public long l52699;
+    public long l52700;
+    public long l52701;
+    public long l52702;
+    public long l52703;
+    public long l52704;
+    public long l52705;
+    public long l52706;
+    public long l52707;
+    public long l52708;
+    public long l52709;
+    public long l52710;
+    public long l52711;
+    public long l52712;
+    public long l52713;
+    public long l52714;
+    public long l52715;
+    public long l52716;
+    public long l52717;
+    public long l52718;
+    public long l52719;
+    public long l52720;
+    public long l52721;
+    public long l52722;
+    public long l52723;
+    public long l52724;
+    public long l52725;
+    public long l52726;
+    public long l52727;
+    public long l52728;
+    public long l52729;
+    public long l52730;
+    public long l52731;
+    public long l52732;
+    public long l52733;
+    public long l52734;
+    public long l52735;
+    public long l52736;
+    public long l52737;
+    public long l52738;
+    public long l52739;
+    public long l52740;
+    public long l52741;
+    public long l52742;
+    public long l52743;
+    public long l52744;
+    public long l52745;
+    public long l52746;
+    public long l52747;
+    public long l52748;
+    public long l52749;
+    public long l52750;
+    public long l52751;
+    public long l52752;
+    public long l52753;
+    public long l52754;
+    public long l52755;
+    public long l52756;
+    public long l52757;
+    public long l52758;
+    public long l52759;
+    public long l52760;
+    public long l52761;
+    public long l52762;
+    public long l52763;
+    public long l52764;
+    public long l52765;
+    public long l52766;
+    public long l52767;
+    public long l52768;
+    public long l52769;
+    public long l52770;
+    public long l52771;
+    public long l52772;
+    public long l52773;
+    public long l52774;
+    public long l52775;
+    public long l52776;
+    public long l52777;
+    public long l52778;
+    public long l52779;
+    public long l52780;
+    public long l52781;
+    public long l52782;
+    public long l52783;
+    public long l52784;
+    public long l52785;
+    public long l52786;
+    public long l52787;
+    public long l52788;
+    public long l52789;
+    public long l52790;
+    public long l52791;
+    public long l52792;
+    public long l52793;
+    public long l52794;
+    public long l52795;
+    public long l52796;
+    public long l52797;
+    public long l52798;
+    public long l52799;
+    public long l52800;
+    public long l52801;
+    public long l52802;
+    public long l52803;
+    public long l52804;
+    public long l52805;
+    public long l52806;
+    public long l52807;
+    public long l52808;
+    public long l52809;
+    public long l52810;
+    public long l52811;
+    public long l52812;
+    public long l52813;
+    public long l52814;
+    public long l52815;
+    public long l52816;
+    public long l52817;
+    public long l52818;
+    public long l52819;
+    public long l52820;
+    public long l52821;
+    public long l52822;
+    public long l52823;
+    public long l52824;
+    public long l52825;
+    public long l52826;
+    public long l52827;
+    public long l52828;
+    public long l52829;
+    public long l52830;
+    public long l52831;
+    public long l52832;
+    public long l52833;
+    public long l52834;
+    public long l52835;
+    public long l52836;
+    public long l52837;
+    public long l52838;
+    public long l52839;
+    public long l52840;
+    public long l52841;
+    public long l52842;
+    public long l52843;
+    public long l52844;
+    public long l52845;
+    public long l52846;
+    public long l52847;
+    public long l52848;
+    public long l52849;
+    public long l52850;
+    public long l52851;
+    public long l52852;
+    public long l52853;
+    public long l52854;
+    public long l52855;
+    public long l52856;
+    public long l52857;
+    public long l52858;
+    public long l52859;
+    public long l52860;
+    public long l52861;
+    public long l52862;
+    public long l52863;
+    public long l52864;
+    public long l52865;
+    public long l52866;
+    public long l52867;
+    public long l52868;
+    public long l52869;
+    public long l52870;
+    public long l52871;
+    public long l52872;
+    public long l52873;
+    public long l52874;
+    public long l52875;
+    public long l52876;
+    public long l52877;
+    public long l52878;
+    public long l52879;
+    public long l52880;
+    public long l52881;
+    public long l52882;
+    public long l52883;
+    public long l52884;
+    public long l52885;
+    public long l52886;
+    public long l52887;
+    public long l52888;
+    public long l52889;
+    public long l52890;
+    public long l52891;
+    public long l52892;
+    public long l52893;
+    public long l52894;
+    public long l52895;
+    public long l52896;
+    public long l52897;
+    public long l52898;
+    public long l52899;
+    public long l52900;
+    public long l52901;
+    public long l52902;
+    public long l52903;
+    public long l52904;
+    public long l52905;
+    public long l52906;
+    public long l52907;
+    public long l52908;
+    public long l52909;
+    public long l52910;
+    public long l52911;
+    public long l52912;
+    public long l52913;
+    public long l52914;
+    public long l52915;
+    public long l52916;
+    public long l52917;
+    public long l52918;
+    public long l52919;
+    public long l52920;
+    public long l52921;
+    public long l52922;
+    public long l52923;
+    public long l52924;
+    public long l52925;
+    public long l52926;
+    public long l52927;
+    public long l52928;
+    public long l52929;
+    public long l52930;
+    public long l52931;
+    public long l52932;
+    public long l52933;
+    public long l52934;
+    public long l52935;
+    public long l52936;
+    public long l52937;
+    public long l52938;
+    public long l52939;
+    public long l52940;
+    public long l52941;
+    public long l52942;
+    public long l52943;
+    public long l52944;
+    public long l52945;
+    public long l52946;
+    public long l52947;
+    public long l52948;
+    public long l52949;
+    public long l52950;
+    public long l52951;
+    public long l52952;
+    public long l52953;
+    public long l52954;
+    public long l52955;
+    public long l52956;
+    public long l52957;
+    public long l52958;
+    public long l52959;
+    public long l52960;
+    public long l52961;
+    public long l52962;
+    public long l52963;
+    public long l52964;
+    public long l52965;
+    public long l52966;
+    public long l52967;
+    public long l52968;
+    public long l52969;
+    public long l52970;
+    public long l52971;
+    public long l52972;
+    public long l52973;
+    public long l52974;
+    public long l52975;
+    public long l52976;
+    public long l52977;
+    public long l52978;
+    public long l52979;
+    public long l52980;
+    public long l52981;
+    public long l52982;
+    public long l52983;
+    public long l52984;
+    public long l52985;
+    public long l52986;
+    public long l52987;
+    public long l52988;
+    public long l52989;
+    public long l52990;
+    public long l52991;
+    public long l52992;
+    public long l52993;
+    public long l52994;
+    public long l52995;
+    public long l52996;
+    public long l52997;
+    public long l52998;
+    public long l52999;
+    public long l53000;
+    public long l53001;
+    public long l53002;
+    public long l53003;
+    public long l53004;
+    public long l53005;
+    public long l53006;
+    public long l53007;
+    public long l53008;
+    public long l53009;
+    public long l53010;
+    public long l53011;
+    public long l53012;
+    public long l53013;
+    public long l53014;
+    public long l53015;
+    public long l53016;
+    public long l53017;
+    public long l53018;
+    public long l53019;
+    public long l53020;
+    public long l53021;
+    public long l53022;
+    public long l53023;
+    public long l53024;
+    public long l53025;
+    public long l53026;
+    public long l53027;
+    public long l53028;
+    public long l53029;
+    public long l53030;
+    public long l53031;
+    public long l53032;
+    public long l53033;
+    public long l53034;
+    public long l53035;
+    public long l53036;
+    public long l53037;
+    public long l53038;
+    public long l53039;
+    public long l53040;
+    public long l53041;
+    public long l53042;
+    public long l53043;
+    public long l53044;
+    public long l53045;
+    public long l53046;
+    public long l53047;
+    public long l53048;
+    public long l53049;
+    public long l53050;
+    public long l53051;
+    public long l53052;
+    public long l53053;
+    public long l53054;
+    public long l53055;
+    public long l53056;
+    public long l53057;
+    public long l53058;
+    public long l53059;
+    public long l53060;
+    public long l53061;
+    public long l53062;
+    public long l53063;
+    public long l53064;
+    public long l53065;
+    public long l53066;
+    public long l53067;
+    public long l53068;
+    public long l53069;
+    public long l53070;
+    public long l53071;
+    public long l53072;
+    public long l53073;
+    public long l53074;
+    public long l53075;
+    public long l53076;
+    public long l53077;
+    public long l53078;
+    public long l53079;
+    public long l53080;
+    public long l53081;
+    public long l53082;
+    public long l53083;
+    public long l53084;
+    public long l53085;
+    public long l53086;
+    public long l53087;
+    public long l53088;
+    public long l53089;
+    public long l53090;
+    public long l53091;
+    public long l53092;
+    public long l53093;
+    public long l53094;
+    public long l53095;
+    public long l53096;
+    public long l53097;
+    public long l53098;
+    public long l53099;
+    public long l53100;
+    public long l53101;
+    public long l53102;
+    public long l53103;
+    public long l53104;
+    public long l53105;
+    public long l53106;
+    public long l53107;
+    public long l53108;
+    public long l53109;
+    public long l53110;
+    public long l53111;
+    public long l53112;
+    public long l53113;
+    public long l53114;
+    public long l53115;
+    public long l53116;
+    public long l53117;
+    public long l53118;
+    public long l53119;
+    public long l53120;
+    public long l53121;
+    public long l53122;
+    public long l53123;
+    public long l53124;
+    public long l53125;
+    public long l53126;
+    public long l53127;
+    public long l53128;
+    public long l53129;
+    public long l53130;
+    public long l53131;
+    public long l53132;
+    public long l53133;
+    public long l53134;
+    public long l53135;
+    public long l53136;
+    public long l53137;
+    public long l53138;
+    public long l53139;
+    public long l53140;
+    public long l53141;
+    public long l53142;
+    public long l53143;
+    public long l53144;
+    public long l53145;
+    public long l53146;
+    public long l53147;
+    public long l53148;
+    public long l53149;
+    public long l53150;
+    public long l53151;
+    public long l53152;
+    public long l53153;
+    public long l53154;
+    public long l53155;
+    public long l53156;
+    public long l53157;
+    public long l53158;
+    public long l53159;
+    public long l53160;
+    public long l53161;
+    public long l53162;
+    public long l53163;
+    public long l53164;
+    public long l53165;
+    public long l53166;
+    public long l53167;
+    public long l53168;
+    public long l53169;
+    public long l53170;
+    public long l53171;
+    public long l53172;
+    public long l53173;
+    public long l53174;
+    public long l53175;
+    public long l53176;
+    public long l53177;
+    public long l53178;
+    public long l53179;
+    public long l53180;
+    public long l53181;
+    public long l53182;
+    public long l53183;
+    public long l53184;
+    public long l53185;
+    public long l53186;
+    public long l53187;
+    public long l53188;
+    public long l53189;
+    public long l53190;
+    public long l53191;
+    public long l53192;
+    public long l53193;
+    public long l53194;
+    public long l53195;
+    public long l53196;
+    public long l53197;
+    public long l53198;
+    public long l53199;
+    public long l53200;
+    public long l53201;
+    public long l53202;
+    public long l53203;
+    public long l53204;
+    public long l53205;
+    public long l53206;
+    public long l53207;
+    public long l53208;
+    public long l53209;
+    public long l53210;
+    public long l53211;
+    public long l53212;
+    public long l53213;
+    public long l53214;
+    public long l53215;
+    public long l53216;
+    public long l53217;
+    public long l53218;
+    public long l53219;
+    public long l53220;
+    public long l53221;
+    public long l53222;
+    public long l53223;
+    public long l53224;
+    public long l53225;
+    public long l53226;
+    public long l53227;
+    public long l53228;
+    public long l53229;
+    public long l53230;
+    public long l53231;
+    public long l53232;
+    public long l53233;
+    public long l53234;
+    public long l53235;
+    public long l53236;
+    public long l53237;
+    public long l53238;
+    public long l53239;
+    public long l53240;
+    public long l53241;
+    public long l53242;
+    public long l53243;
+    public long l53244;
+    public long l53245;
+    public long l53246;
+    public long l53247;
+    public long l53248;
+    public long l53249;
+    public long l53250;
+    public long l53251;
+    public long l53252;
+    public long l53253;
+    public long l53254;
+    public long l53255;
+    public long l53256;
+    public long l53257;
+    public long l53258;
+    public long l53259;
+    public long l53260;
+    public long l53261;
+    public long l53262;
+    public long l53263;
+    public long l53264;
+    public long l53265;
+    public long l53266;
+    public long l53267;
+    public long l53268;
+    public long l53269;
+    public long l53270;
+    public long l53271;
+    public long l53272;
+    public long l53273;
+    public long l53274;
+    public long l53275;
+    public long l53276;
+    public long l53277;
+    public long l53278;
+    public long l53279;
+    public long l53280;
+    public long l53281;
+    public long l53282;
+    public long l53283;
+    public long l53284;
+    public long l53285;
+    public long l53286;
+    public long l53287;
+    public long l53288;
+    public long l53289;
+    public long l53290;
+    public long l53291;
+    public long l53292;
+    public long l53293;
+    public long l53294;
+    public long l53295;
+    public long l53296;
+    public long l53297;
+    public long l53298;
+    public long l53299;
+    public long l53300;
+    public long l53301;
+    public long l53302;
+    public long l53303;
+    public long l53304;
+    public long l53305;
+    public long l53306;
+    public long l53307;
+    public long l53308;
+    public long l53309;
+    public long l53310;
+    public long l53311;
+    public long l53312;
+    public long l53313;
+    public long l53314;
+    public long l53315;
+    public long l53316;
+    public long l53317;
+    public long l53318;
+    public long l53319;
+    public long l53320;
+    public long l53321;
+    public long l53322;
+    public long l53323;
+    public long l53324;
+    public long l53325;
+    public long l53326;
+    public long l53327;
+    public long l53328;
+    public long l53329;
+    public long l53330;
+    public long l53331;
+    public long l53332;
+    public long l53333;
+    public long l53334;
+    public long l53335;
+    public long l53336;
+    public long l53337;
+    public long l53338;
+    public long l53339;
+    public long l53340;
+    public long l53341;
+    public long l53342;
+    public long l53343;
+    public long l53344;
+    public long l53345;
+    public long l53346;
+    public long l53347;
+    public long l53348;
+    public long l53349;
+    public long l53350;
+    public long l53351;
+    public long l53352;
+    public long l53353;
+    public long l53354;
+    public long l53355;
+    public long l53356;
+    public long l53357;
+    public long l53358;
+    public long l53359;
+    public long l53360;
+    public long l53361;
+    public long l53362;
+    public long l53363;
+    public long l53364;
+    public long l53365;
+    public long l53366;
+    public long l53367;
+    public long l53368;
+    public long l53369;
+    public long l53370;
+    public long l53371;
+    public long l53372;
+    public long l53373;
+    public long l53374;
+    public long l53375;
+    public long l53376;
+    public long l53377;
+    public long l53378;
+    public long l53379;
+    public long l53380;
+    public long l53381;
+    public long l53382;
+    public long l53383;
+    public long l53384;
+    public long l53385;
+    public long l53386;
+    public long l53387;
+    public long l53388;
+    public long l53389;
+    public long l53390;
+    public long l53391;
+    public long l53392;
+    public long l53393;
+    public long l53394;
+    public long l53395;
+    public long l53396;
+    public long l53397;
+    public long l53398;
+    public long l53399;
+    public long l53400;
+    public long l53401;
+    public long l53402;
+    public long l53403;
+    public long l53404;
+    public long l53405;
+    public long l53406;
+    public long l53407;
+    public long l53408;
+    public long l53409;
+    public long l53410;
+    public long l53411;
+    public long l53412;
+    public long l53413;
+    public long l53414;
+    public long l53415;
+    public long l53416;
+    public long l53417;
+    public long l53418;
+    public long l53419;
+    public long l53420;
+    public long l53421;
+    public long l53422;
+    public long l53423;
+    public long l53424;
+    public long l53425;
+    public long l53426;
+    public long l53427;
+    public long l53428;
+    public long l53429;
+    public long l53430;
+    public long l53431;
+    public long l53432;
+    public long l53433;
+    public long l53434;
+    public long l53435;
+    public long l53436;
+    public long l53437;
+    public long l53438;
+    public long l53439;
+    public long l53440;
+    public long l53441;
+    public long l53442;
+    public long l53443;
+    public long l53444;
+    public long l53445;
+    public long l53446;
+    public long l53447;
+    public long l53448;
+    public long l53449;
+    public long l53450;
+    public long l53451;
+    public long l53452;
+    public long l53453;
+    public long l53454;
+    public long l53455;
+    public long l53456;
+    public long l53457;
+    public long l53458;
+    public long l53459;
+    public long l53460;
+    public long l53461;
+    public long l53462;
+    public long l53463;
+    public long l53464;
+    public long l53465;
+    public long l53466;
+    public long l53467;
+    public long l53468;
+    public long l53469;
+    public long l53470;
+    public long l53471;
+    public long l53472;
+    public long l53473;
+    public long l53474;
+    public long l53475;
+    public long l53476;
+    public long l53477;
+    public long l53478;
+    public long l53479;
+    public long l53480;
+    public long l53481;
+    public long l53482;
+    public long l53483;
+    public long l53484;
+    public long l53485;
+    public long l53486;
+    public long l53487;
+    public long l53488;
+    public long l53489;
+    public long l53490;
+    public long l53491;
+    public long l53492;
+    public long l53493;
+    public long l53494;
+    public long l53495;
+    public long l53496;
+    public long l53497;
+    public long l53498;
+    public long l53499;
+    public long l53500;
+    public long l53501;
+    public long l53502;
+    public long l53503;
+    public long l53504;
+    public long l53505;
+    public long l53506;
+    public long l53507;
+    public long l53508;
+    public long l53509;
+    public long l53510;
+    public long l53511;
+    public long l53512;
+    public long l53513;
+    public long l53514;
+    public long l53515;
+    public long l53516;
+    public long l53517;
+    public long l53518;
+    public long l53519;
+    public long l53520;
+    public long l53521;
+    public long l53522;
+    public long l53523;
+    public long l53524;
+    public long l53525;
+    public long l53526;
+    public long l53527;
+    public long l53528;
+    public long l53529;
+    public long l53530;
+    public long l53531;
+    public long l53532;
+    public long l53533;
+    public long l53534;
+    public long l53535;
+    public long l53536;
+    public long l53537;
+    public long l53538;
+    public long l53539;
+    public long l53540;
+    public long l53541;
+    public long l53542;
+    public long l53543;
+    public long l53544;
+    public long l53545;
+    public long l53546;
+    public long l53547;
+    public long l53548;
+    public long l53549;
+    public long l53550;
+    public long l53551;
+    public long l53552;
+    public long l53553;
+    public long l53554;
+    public long l53555;
+    public long l53556;
+    public long l53557;
+    public long l53558;
+    public long l53559;
+    public long l53560;
+    public long l53561;
+    public long l53562;
+    public long l53563;
+    public long l53564;
+    public long l53565;
+    public long l53566;
+    public long l53567;
+    public long l53568;
+    public long l53569;
+    public long l53570;
+    public long l53571;
+    public long l53572;
+    public long l53573;
+    public long l53574;
+    public long l53575;
+    public long l53576;
+    public long l53577;
+    public long l53578;
+    public long l53579;
+    public long l53580;
+    public long l53581;
+    public long l53582;
+    public long l53583;
+    public long l53584;
+    public long l53585;
+    public long l53586;
+    public long l53587;
+    public long l53588;
+    public long l53589;
+    public long l53590;
+    public long l53591;
+    public long l53592;
+    public long l53593;
+    public long l53594;
+    public long l53595;
+    public long l53596;
+    public long l53597;
+    public long l53598;
+    public long l53599;
+    public long l53600;
+    public long l53601;
+    public long l53602;
+    public long l53603;
+    public long l53604;
+    public long l53605;
+    public long l53606;
+    public long l53607;
+    public long l53608;
+    public long l53609;
+    public long l53610;
+    public long l53611;
+    public long l53612;
+    public long l53613;
+    public long l53614;
+    public long l53615;
+    public long l53616;
+    public long l53617;
+    public long l53618;
+    public long l53619;
+    public long l53620;
+    public long l53621;
+    public long l53622;
+    public long l53623;
+    public long l53624;
+    public long l53625;
+    public long l53626;
+    public long l53627;
+    public long l53628;
+    public long l53629;
+    public long l53630;
+    public long l53631;
+    public long l53632;
+    public long l53633;
+    public long l53634;
+    public long l53635;
+    public long l53636;
+    public long l53637;
+    public long l53638;
+    public long l53639;
+    public long l53640;
+    public long l53641;
+    public long l53642;
+    public long l53643;
+    public long l53644;
+    public long l53645;
+    public long l53646;
+    public long l53647;
+    public long l53648;
+    public long l53649;
+    public long l53650;
+    public long l53651;
+    public long l53652;
+    public long l53653;
+    public long l53654;
+    public long l53655;
+    public long l53656;
+    public long l53657;
+    public long l53658;
+    public long l53659;
+    public long l53660;
+    public long l53661;
+    public long l53662;
+    public long l53663;
+    public long l53664;
+    public long l53665;
+    public long l53666;
+    public long l53667;
+    public long l53668;
+    public long l53669;
+    public long l53670;
+    public long l53671;
+    public long l53672;
+    public long l53673;
+    public long l53674;
+    public long l53675;
+    public long l53676;
+    public long l53677;
+    public long l53678;
+    public long l53679;
+    public long l53680;
+    public long l53681;
+    public long l53682;
+    public long l53683;
+    public long l53684;
+    public long l53685;
+    public long l53686;
+    public long l53687;
+    public long l53688;
+    public long l53689;
+    public long l53690;
+    public long l53691;
+    public long l53692;
+    public long l53693;
+    public long l53694;
+    public long l53695;
+    public long l53696;
+    public long l53697;
+    public long l53698;
+    public long l53699;
+    public long l53700;
+    public long l53701;
+    public long l53702;
+    public long l53703;
+    public long l53704;
+    public long l53705;
+    public long l53706;
+    public long l53707;
+    public long l53708;
+    public long l53709;
+    public long l53710;
+    public long l53711;
+    public long l53712;
+    public long l53713;
+    public long l53714;
+    public long l53715;
+    public long l53716;
+    public long l53717;
+    public long l53718;
+    public long l53719;
+    public long l53720;
+    public long l53721;
+    public long l53722;
+    public long l53723;
+    public long l53724;
+    public long l53725;
+    public long l53726;
+    public long l53727;
+    public long l53728;
+    public long l53729;
+    public long l53730;
+    public long l53731;
+    public long l53732;
+    public long l53733;
+    public long l53734;
+    public long l53735;
+    public long l53736;
+    public long l53737;
+    public long l53738;
+    public long l53739;
+    public long l53740;
+    public long l53741;
+    public long l53742;
+    public long l53743;
+    public long l53744;
+    public long l53745;
+    public long l53746;
+    public long l53747;
+    public long l53748;
+    public long l53749;
+    public long l53750;
+    public long l53751;
+    public long l53752;
+    public long l53753;
+    public long l53754;
+    public long l53755;
+    public long l53756;
+    public long l53757;
+    public long l53758;
+    public long l53759;
+    public long l53760;
+    public long l53761;
+    public long l53762;
+    public long l53763;
+    public long l53764;
+    public long l53765;
+    public long l53766;
+    public long l53767;
+    public long l53768;
+    public long l53769;
+    public long l53770;
+    public long l53771;
+    public long l53772;
+    public long l53773;
+    public long l53774;
+    public long l53775;
+    public long l53776;
+    public long l53777;
+    public long l53778;
+    public long l53779;
+    public long l53780;
+    public long l53781;
+    public long l53782;
+    public long l53783;
+    public long l53784;
+    public long l53785;
+    public long l53786;
+    public long l53787;
+    public long l53788;
+    public long l53789;
+    public long l53790;
+    public long l53791;
+    public long l53792;
+    public long l53793;
+    public long l53794;
+    public long l53795;
+    public long l53796;
+    public long l53797;
+    public long l53798;
+    public long l53799;
+    public long l53800;
+    public long l53801;
+    public long l53802;
+    public long l53803;
+    public long l53804;
+    public long l53805;
+    public long l53806;
+    public long l53807;
+    public long l53808;
+    public long l53809;
+    public long l53810;
+    public long l53811;
+    public long l53812;
+    public long l53813;
+    public long l53814;
+    public long l53815;
+    public long l53816;
+    public long l53817;
+    public long l53818;
+    public long l53819;
+    public long l53820;
+    public long l53821;
+    public long l53822;
+    public long l53823;
+    public long l53824;
+    public long l53825;
+    public long l53826;
+    public long l53827;
+    public long l53828;
+    public long l53829;
+    public long l53830;
+    public long l53831;
+    public long l53832;
+    public long l53833;
+    public long l53834;
+    public long l53835;
+    public long l53836;
+    public long l53837;
+    public long l53838;
+    public long l53839;
+    public long l53840;
+    public long l53841;
+    public long l53842;
+    public long l53843;
+    public long l53844;
+    public long l53845;
+    public long l53846;
+    public long l53847;
+    public long l53848;
+    public long l53849;
+    public long l53850;
+    public long l53851;
+    public long l53852;
+    public long l53853;
+    public long l53854;
+    public long l53855;
+    public long l53856;
+    public long l53857;
+    public long l53858;
+    public long l53859;
+    public long l53860;
+    public long l53861;
+    public long l53862;
+    public long l53863;
+    public long l53864;
+    public long l53865;
+    public long l53866;
+    public long l53867;
+    public long l53868;
+    public long l53869;
+    public long l53870;
+    public long l53871;
+    public long l53872;
+    public long l53873;
+    public long l53874;
+    public long l53875;
+    public long l53876;
+    public long l53877;
+    public long l53878;
+    public long l53879;
+    public long l53880;
+    public long l53881;
+    public long l53882;
+    public long l53883;
+    public long l53884;
+    public long l53885;
+    public long l53886;
+    public long l53887;
+    public long l53888;
+    public long l53889;
+    public long l53890;
+    public long l53891;
+    public long l53892;
+    public long l53893;
+    public long l53894;
+    public long l53895;
+    public long l53896;
+    public long l53897;
+    public long l53898;
+    public long l53899;
+    public long l53900;
+    public long l53901;
+    public long l53902;
+    public long l53903;
+    public long l53904;
+    public long l53905;
+    public long l53906;
+    public long l53907;
+    public long l53908;
+    public long l53909;
+    public long l53910;
+    public long l53911;
+    public long l53912;
+    public long l53913;
+    public long l53914;
+    public long l53915;
+    public long l53916;
+    public long l53917;
+    public long l53918;
+    public long l53919;
+    public long l53920;
+    public long l53921;
+    public long l53922;
+    public long l53923;
+    public long l53924;
+    public long l53925;
+    public long l53926;
+    public long l53927;
+    public long l53928;
+    public long l53929;
+    public long l53930;
+    public long l53931;
+    public long l53932;
+    public long l53933;
+    public long l53934;
+    public long l53935;
+    public long l53936;
+    public long l53937;
+    public long l53938;
+    public long l53939;
+    public long l53940;
+    public long l53941;
+    public long l53942;
+    public long l53943;
+    public long l53944;
+    public long l53945;
+    public long l53946;
+    public long l53947;
+    public long l53948;
+    public long l53949;
+    public long l53950;
+    public long l53951;
+    public long l53952;
+    public long l53953;
+    public long l53954;
+    public long l53955;
+    public long l53956;
+    public long l53957;
+    public long l53958;
+    public long l53959;
+    public long l53960;
+    public long l53961;
+    public long l53962;
+    public long l53963;
+    public long l53964;
+    public long l53965;
+    public long l53966;
+    public long l53967;
+    public long l53968;
+    public long l53969;
+    public long l53970;
+    public long l53971;
+    public long l53972;
+    public long l53973;
+    public long l53974;
+    public long l53975;
+    public long l53976;
+    public long l53977;
+    public long l53978;
+    public long l53979;
+    public long l53980;
+    public long l53981;
+    public long l53982;
+    public long l53983;
+    public long l53984;
+    public long l53985;
+    public long l53986;
+    public long l53987;
+    public long l53988;
+    public long l53989;
+    public long l53990;
+    public long l53991;
+    public long l53992;
+    public long l53993;
+    public long l53994;
+    public long l53995;
+    public long l53996;
+    public long l53997;
+    public long l53998;
+    public long l53999;
+    public long l54000;
+    public long l54001;
+    public long l54002;
+    public long l54003;
+    public long l54004;
+    public long l54005;
+    public long l54006;
+    public long l54007;
+    public long l54008;
+    public long l54009;
+    public long l54010;
+    public long l54011;
+    public long l54012;
+    public long l54013;
+    public long l54014;
+    public long l54015;
+    public long l54016;
+    public long l54017;
+    public long l54018;
+    public long l54019;
+    public long l54020;
+    public long l54021;
+    public long l54022;
+    public long l54023;
+    public long l54024;
+    public long l54025;
+    public long l54026;
+    public long l54027;
+    public long l54028;
+    public long l54029;
+    public long l54030;
+    public long l54031;
+    public long l54032;
+    public long l54033;
+    public long l54034;
+    public long l54035;
+    public long l54036;
+    public long l54037;
+    public long l54038;
+    public long l54039;
+    public long l54040;
+    public long l54041;
+    public long l54042;
+    public long l54043;
+    public long l54044;
+    public long l54045;
+    public long l54046;
+    public long l54047;
+    public long l54048;
+    public long l54049;
+    public long l54050;
+    public long l54051;
+    public long l54052;
+    public long l54053;
+    public long l54054;
+    public long l54055;
+    public long l54056;
+    public long l54057;
+    public long l54058;
+    public long l54059;
+    public long l54060;
+    public long l54061;
+    public long l54062;
+    public long l54063;
+    public long l54064;
+    public long l54065;
+    public long l54066;
+    public long l54067;
+    public long l54068;
+    public long l54069;
+    public long l54070;
+    public long l54071;
+    public long l54072;
+    public long l54073;
+    public long l54074;
+    public long l54075;
+    public long l54076;
+    public long l54077;
+    public long l54078;
+    public long l54079;
+    public long l54080;
+    public long l54081;
+    public long l54082;
+    public long l54083;
+    public long l54084;
+    public long l54085;
+    public long l54086;
+    public long l54087;
+    public long l54088;
+    public long l54089;
+    public long l54090;
+    public long l54091;
+    public long l54092;
+    public long l54093;
+    public long l54094;
+    public long l54095;
+    public long l54096;
+    public long l54097;
+    public long l54098;
+    public long l54099;
+    public long l54100;
+    public long l54101;
+    public long l54102;
+    public long l54103;
+    public long l54104;
+    public long l54105;
+    public long l54106;
+    public long l54107;
+    public long l54108;
+    public long l54109;
+    public long l54110;
+    public long l54111;
+    public long l54112;
+    public long l54113;
+    public long l54114;
+    public long l54115;
+    public long l54116;
+    public long l54117;
+    public long l54118;
+    public long l54119;
+    public long l54120;
+    public long l54121;
+    public long l54122;
+    public long l54123;
+    public long l54124;
+    public long l54125;
+    public long l54126;
+    public long l54127;
+    public long l54128;
+    public long l54129;
+    public long l54130;
+    public long l54131;
+    public long l54132;
+    public long l54133;
+    public long l54134;
+    public long l54135;
+    public long l54136;
+    public long l54137;
+    public long l54138;
+    public long l54139;
+    public long l54140;
+    public long l54141;
+    public long l54142;
+    public long l54143;
+    public long l54144;
+    public long l54145;
+    public long l54146;
+    public long l54147;
+    public long l54148;
+    public long l54149;
+    public long l54150;
+    public long l54151;
+    public long l54152;
+    public long l54153;
+    public long l54154;
+    public long l54155;
+    public long l54156;
+    public long l54157;
+    public long l54158;
+    public long l54159;
+    public long l54160;
+    public long l54161;
+    public long l54162;
+    public long l54163;
+    public long l54164;
+    public long l54165;
+    public long l54166;
+    public long l54167;
+    public long l54168;
+    public long l54169;
+    public long l54170;
+    public long l54171;
+    public long l54172;
+    public long l54173;
+    public long l54174;
+    public long l54175;
+    public long l54176;
+    public long l54177;
+    public long l54178;
+    public long l54179;
+    public long l54180;
+    public long l54181;
+    public long l54182;
+    public long l54183;
+    public long l54184;
+    public long l54185;
+    public long l54186;
+    public long l54187;
+    public long l54188;
+    public long l54189;
+    public long l54190;
+    public long l54191;
+    public long l54192;
+    public long l54193;
+    public long l54194;
+    public long l54195;
+    public long l54196;
+    public long l54197;
+    public long l54198;
+    public long l54199;
+    public long l54200;
+    public long l54201;
+    public long l54202;
+    public long l54203;
+    public long l54204;
+    public long l54205;
+    public long l54206;
+    public long l54207;
+    public long l54208;
+    public long l54209;
+    public long l54210;
+    public long l54211;
+    public long l54212;
+    public long l54213;
+    public long l54214;
+    public long l54215;
+    public long l54216;
+    public long l54217;
+    public long l54218;
+    public long l54219;
+    public long l54220;
+    public long l54221;
+    public long l54222;
+    public long l54223;
+    public long l54224;
+    public long l54225;
+    public long l54226;
+    public long l54227;
+    public long l54228;
+    public long l54229;
+    public long l54230;
+    public long l54231;
+    public long l54232;
+    public long l54233;
+    public long l54234;
+    public long l54235;
+    public long l54236;
+    public long l54237;
+    public long l54238;
+    public long l54239;
+    public long l54240;
+    public long l54241;
+    public long l54242;
+    public long l54243;
+    public long l54244;
+    public long l54245;
+    public long l54246;
+    public long l54247;
+    public long l54248;
+    public long l54249;
+    public long l54250;
+    public long l54251;
+    public long l54252;
+    public long l54253;
+    public long l54254;
+    public long l54255;
+    public long l54256;
+    public long l54257;
+    public long l54258;
+    public long l54259;
+    public long l54260;
+    public long l54261;
+    public long l54262;
+    public long l54263;
+    public long l54264;
+    public long l54265;
+    public long l54266;
+    public long l54267;
+    public long l54268;
+    public long l54269;
+    public long l54270;
+    public long l54271;
+    public long l54272;
+    public long l54273;
+    public long l54274;
+    public long l54275;
+    public long l54276;
+    public long l54277;
+    public long l54278;
+    public long l54279;
+    public long l54280;
+    public long l54281;
+    public long l54282;
+    public long l54283;
+    public long l54284;
+    public long l54285;
+    public long l54286;
+    public long l54287;
+    public long l54288;
+    public long l54289;
+    public long l54290;
+    public long l54291;
+    public long l54292;
+    public long l54293;
+    public long l54294;
+    public long l54295;
+    public long l54296;
+    public long l54297;
+    public long l54298;
+    public long l54299;
+    public long l54300;
+    public long l54301;
+    public long l54302;
+    public long l54303;
+    public long l54304;
+    public long l54305;
+    public long l54306;
+    public long l54307;
+    public long l54308;
+    public long l54309;
+    public long l54310;
+    public long l54311;
+    public long l54312;
+    public long l54313;
+    public long l54314;
+    public long l54315;
+    public long l54316;
+    public long l54317;
+    public long l54318;
+    public long l54319;
+    public long l54320;
+    public long l54321;
+    public long l54322;
+    public long l54323;
+    public long l54324;
+    public long l54325;
+    public long l54326;
+    public long l54327;
+    public long l54328;
+    public long l54329;
+    public long l54330;
+    public long l54331;
+    public long l54332;
+    public long l54333;
+    public long l54334;
+    public long l54335;
+    public long l54336;
+    public long l54337;
+    public long l54338;
+    public long l54339;
+    public long l54340;
+    public long l54341;
+    public long l54342;
+    public long l54343;
+    public long l54344;
+    public long l54345;
+    public long l54346;
+    public long l54347;
+    public long l54348;
+    public long l54349;
+    public long l54350;
+    public long l54351;
+    public long l54352;
+    public long l54353;
+    public long l54354;
+    public long l54355;
+    public long l54356;
+    public long l54357;
+    public long l54358;
+    public long l54359;
+    public long l54360;
+    public long l54361;
+    public long l54362;
+    public long l54363;
+    public long l54364;
+    public long l54365;
+    public long l54366;
+    public long l54367;
+    public long l54368;
+    public long l54369;
+    public long l54370;
+    public long l54371;
+    public long l54372;
+    public long l54373;
+    public long l54374;
+    public long l54375;
+    public long l54376;
+    public long l54377;
+    public long l54378;
+    public long l54379;
+    public long l54380;
+    public long l54381;
+    public long l54382;
+    public long l54383;
+    public long l54384;
+    public long l54385;
+    public long l54386;
+    public long l54387;
+    public long l54388;
+    public long l54389;
+    public long l54390;
+    public long l54391;
+    public long l54392;
+    public long l54393;
+    public long l54394;
+    public long l54395;
+    public long l54396;
+    public long l54397;
+    public long l54398;
+    public long l54399;
+    public long l54400;
+    public long l54401;
+    public long l54402;
+    public long l54403;
+    public long l54404;
+    public long l54405;
+    public long l54406;
+    public long l54407;
+    public long l54408;
+    public long l54409;
+    public long l54410;
+    public long l54411;
+    public long l54412;
+    public long l54413;
+    public long l54414;
+    public long l54415;
+    public long l54416;
+    public long l54417;
+    public long l54418;
+    public long l54419;
+    public long l54420;
+    public long l54421;
+    public long l54422;
+    public long l54423;
+    public long l54424;
+    public long l54425;
+    public long l54426;
+    public long l54427;
+    public long l54428;
+    public long l54429;
+    public long l54430;
+    public long l54431;
+    public long l54432;
+    public long l54433;
+    public long l54434;
+    public long l54435;
+    public long l54436;
+    public long l54437;
+    public long l54438;
+    public long l54439;
+    public long l54440;
+    public long l54441;
+    public long l54442;
+    public long l54443;
+    public long l54444;
+    public long l54445;
+    public long l54446;
+    public long l54447;
+    public long l54448;
+    public long l54449;
+    public long l54450;
+    public long l54451;
+    public long l54452;
+    public long l54453;
+    public long l54454;
+    public long l54455;
+    public long l54456;
+    public long l54457;
+    public long l54458;
+    public long l54459;
+    public long l54460;
+    public long l54461;
+    public long l54462;
+    public long l54463;
+    public long l54464;
+    public long l54465;
+    public long l54466;
+    public long l54467;
+    public long l54468;
+    public long l54469;
+    public long l54470;
+    public long l54471;
+    public long l54472;
+    public long l54473;
+    public long l54474;
+    public long l54475;
+    public long l54476;
+    public long l54477;
+    public long l54478;
+    public long l54479;
+    public long l54480;
+    public long l54481;
+    public long l54482;
+    public long l54483;
+    public long l54484;
+    public long l54485;
+    public long l54486;
+    public long l54487;
+    public long l54488;
+    public long l54489;
+    public long l54490;
+    public long l54491;
+    public long l54492;
+    public long l54493;
+    public long l54494;
+    public long l54495;
+    public long l54496;
+    public long l54497;
+    public long l54498;
+    public long l54499;
+    public long l54500;
+    public long l54501;
+    public long l54502;
+    public long l54503;
+    public long l54504;
+    public long l54505;
+    public long l54506;
+    public long l54507;
+    public long l54508;
+    public long l54509;
+    public long l54510;
+    public long l54511;
+    public long l54512;
+    public long l54513;
+    public long l54514;
+    public long l54515;
+    public long l54516;
+    public long l54517;
+    public long l54518;
+    public long l54519;
+    public long l54520;
+    public long l54521;
+    public long l54522;
+    public long l54523;
+    public long l54524;
+    public long l54525;
+    public long l54526;
+    public long l54527;
+    public long l54528;
+    public long l54529;
+    public long l54530;
+    public long l54531;
+    public long l54532;
+    public long l54533;
+    public long l54534;
+    public long l54535;
+    public long l54536;
+    public long l54537;
+    public long l54538;
+    public long l54539;
+    public long l54540;
+    public long l54541;
+    public long l54542;
+    public long l54543;
+    public long l54544;
+    public long l54545;
+    public long l54546;
+    public long l54547;
+    public long l54548;
+    public long l54549;
+    public long l54550;
+    public long l54551;
+    public long l54552;
+    public long l54553;
+    public long l54554;
+    public long l54555;
+    public long l54556;
+    public long l54557;
+    public long l54558;
+    public long l54559;
+    public long l54560;
+    public long l54561;
+    public long l54562;
+    public long l54563;
+    public long l54564;
+    public long l54565;
+    public long l54566;
+    public long l54567;
+    public long l54568;
+    public long l54569;
+    public long l54570;
+    public long l54571;
+    public long l54572;
+    public long l54573;
+    public long l54574;
+    public long l54575;
+    public long l54576;
+    public long l54577;
+    public long l54578;
+    public long l54579;
+    public long l54580;
+    public long l54581;
+    public long l54582;
+    public long l54583;
+    public long l54584;
+    public long l54585;
+    public long l54586;
+    public long l54587;
+    public long l54588;
+    public long l54589;
+    public long l54590;
+    public long l54591;
+    public long l54592;
+    public long l54593;
+    public long l54594;
+    public long l54595;
+    public long l54596;
+    public long l54597;
+    public long l54598;
+    public long l54599;
+    public long l54600;
+    public long l54601;
+    public long l54602;
+    public long l54603;
+    public long l54604;
+    public long l54605;
+    public long l54606;
+    public long l54607;
+    public long l54608;
+    public long l54609;
+    public long l54610;
+    public long l54611;
+    public long l54612;
+    public long l54613;
+    public long l54614;
+    public long l54615;
+    public long l54616;
+    public long l54617;
+    public long l54618;
+    public long l54619;
+    public long l54620;
+    public long l54621;
+    public long l54622;
+    public long l54623;
+    public long l54624;
+    public long l54625;
+    public long l54626;
+    public long l54627;
+    public long l54628;
+    public long l54629;
+    public long l54630;
+    public long l54631;
+    public long l54632;
+    public long l54633;
+    public long l54634;
+    public long l54635;
+    public long l54636;
+    public long l54637;
+    public long l54638;
+    public long l54639;
+    public long l54640;
+    public long l54641;
+    public long l54642;
+    public long l54643;
+    public long l54644;
+    public long l54645;
+    public long l54646;
+    public long l54647;
+    public long l54648;
+    public long l54649;
+    public long l54650;
+    public long l54651;
+    public long l54652;
+    public long l54653;
+    public long l54654;
+    public long l54655;
+    public long l54656;
+    public long l54657;
+    public long l54658;
+    public long l54659;
+    public long l54660;
+    public long l54661;
+    public long l54662;
+    public long l54663;
+    public long l54664;
+    public long l54665;
+    public long l54666;
+    public long l54667;
+    public long l54668;
+    public long l54669;
+    public long l54670;
+    public long l54671;
+    public long l54672;
+    public long l54673;
+    public long l54674;
+    public long l54675;
+    public long l54676;
+    public long l54677;
+    public long l54678;
+    public long l54679;
+    public long l54680;
+    public long l54681;
+    public long l54682;
+    public long l54683;
+    public long l54684;
+    public long l54685;
+    public long l54686;
+    public long l54687;
+    public long l54688;
+    public long l54689;
+    public long l54690;
+    public long l54691;
+    public long l54692;
+    public long l54693;
+    public long l54694;
+    public long l54695;
+    public long l54696;
+    public long l54697;
+    public long l54698;
+    public long l54699;
+    public long l54700;
+    public long l54701;
+    public long l54702;
+    public long l54703;
+    public long l54704;
+    public long l54705;
+    public long l54706;
+    public long l54707;
+    public long l54708;
+    public long l54709;
+    public long l54710;
+    public long l54711;
+    public long l54712;
+    public long l54713;
+    public long l54714;
+    public long l54715;
+    public long l54716;
+    public long l54717;
+    public long l54718;
+    public long l54719;
+    public long l54720;
+    public long l54721;
+    public long l54722;
+    public long l54723;
+    public long l54724;
+    public long l54725;
+    public long l54726;
+    public long l54727;
+    public long l54728;
+    public long l54729;
+    public long l54730;
+    public long l54731;
+    public long l54732;
+    public long l54733;
+    public long l54734;
+    public long l54735;
+    public long l54736;
+    public long l54737;
+    public long l54738;
+    public long l54739;
+    public long l54740;
+    public long l54741;
+    public long l54742;
+    public long l54743;
+    public long l54744;
+    public long l54745;
+    public long l54746;
+    public long l54747;
+    public long l54748;
+    public long l54749;
+    public long l54750;
+    public long l54751;
+    public long l54752;
+    public long l54753;
+    public long l54754;
+    public long l54755;
+    public long l54756;
+    public long l54757;
+    public long l54758;
+    public long l54759;
+    public long l54760;
+    public long l54761;
+    public long l54762;
+    public long l54763;
+    public long l54764;
+    public long l54765;
+    public long l54766;
+    public long l54767;
+    public long l54768;
+    public long l54769;
+    public long l54770;
+    public long l54771;
+    public long l54772;
+    public long l54773;
+    public long l54774;
+    public long l54775;
+    public long l54776;
+    public long l54777;
+    public long l54778;
+    public long l54779;
+    public long l54780;
+    public long l54781;
+    public long l54782;
+    public long l54783;
+    public long l54784;
+    public long l54785;
+    public long l54786;
+    public long l54787;
+    public long l54788;
+    public long l54789;
+    public long l54790;
+    public long l54791;
+    public long l54792;
+    public long l54793;
+    public long l54794;
+    public long l54795;
+    public long l54796;
+    public long l54797;
+    public long l54798;
+    public long l54799;
+    public long l54800;
+    public long l54801;
+    public long l54802;
+    public long l54803;
+    public long l54804;
+    public long l54805;
+    public long l54806;
+    public long l54807;
+    public long l54808;
+    public long l54809;
+    public long l54810;
+    public long l54811;
+    public long l54812;
+    public long l54813;
+    public long l54814;
+    public long l54815;
+    public long l54816;
+    public long l54817;
+    public long l54818;
+    public long l54819;
+    public long l54820;
+    public long l54821;
+    public long l54822;
+    public long l54823;
+    public long l54824;
+    public long l54825;
+    public long l54826;
+    public long l54827;
+    public long l54828;
+    public long l54829;
+    public long l54830;
+    public long l54831;
+    public long l54832;
+    public long l54833;
+    public long l54834;
+    public long l54835;
+    public long l54836;
+    public long l54837;
+    public long l54838;
+    public long l54839;
+    public long l54840;
+    public long l54841;
+    public long l54842;
+    public long l54843;
+    public long l54844;
+    public long l54845;
+    public long l54846;
+    public long l54847;
+    public long l54848;
+    public long l54849;
+    public long l54850;
+    public long l54851;
+    public long l54852;
+    public long l54853;
+    public long l54854;
+    public long l54855;
+    public long l54856;
+    public long l54857;
+    public long l54858;
+    public long l54859;
+    public long l54860;
+    public long l54861;
+    public long l54862;
+    public long l54863;
+    public long l54864;
+    public long l54865;
+    public long l54866;
+    public long l54867;
+    public long l54868;
+    public long l54869;
+    public long l54870;
+    public long l54871;
+    public long l54872;
+    public long l54873;
+    public long l54874;
+    public long l54875;
+    public long l54876;
+    public long l54877;
+    public long l54878;
+    public long l54879;
+    public long l54880;
+    public long l54881;
+    public long l54882;
+    public long l54883;
+    public long l54884;
+    public long l54885;
+    public long l54886;
+    public long l54887;
+    public long l54888;
+    public long l54889;
+    public long l54890;
+    public long l54891;
+    public long l54892;
+    public long l54893;
+    public long l54894;
+    public long l54895;
+    public long l54896;
+    public long l54897;
+    public long l54898;
+    public long l54899;
+    public long l54900;
+    public long l54901;
+    public long l54902;
+    public long l54903;
+    public long l54904;
+    public long l54905;
+    public long l54906;
+    public long l54907;
+    public long l54908;
+    public long l54909;
+    public long l54910;
+    public long l54911;
+    public long l54912;
+    public long l54913;
+    public long l54914;
+    public long l54915;
+    public long l54916;
+    public long l54917;
+    public long l54918;
+    public long l54919;
+    public long l54920;
+    public long l54921;
+    public long l54922;
+    public long l54923;
+    public long l54924;
+    public long l54925;
+    public long l54926;
+    public long l54927;
+    public long l54928;
+    public long l54929;
+    public long l54930;
+    public long l54931;
+    public long l54932;
+    public long l54933;
+    public long l54934;
+    public long l54935;
+    public long l54936;
+    public long l54937;
+    public long l54938;
+    public long l54939;
+    public long l54940;
+    public long l54941;
+    public long l54942;
+    public long l54943;
+    public long l54944;
+    public long l54945;
+    public long l54946;
+    public long l54947;
+    public long l54948;
+    public long l54949;
+    public long l54950;
+    public long l54951;
+    public long l54952;
+    public long l54953;
+    public long l54954;
+    public long l54955;
+    public long l54956;
+    public long l54957;
+    public long l54958;
+    public long l54959;
+    public long l54960;
+    public long l54961;
+    public long l54962;
+    public long l54963;
+    public long l54964;
+    public long l54965;
+    public long l54966;
+    public long l54967;
+    public long l54968;
+    public long l54969;
+    public long l54970;
+    public long l54971;
+    public long l54972;
+    public long l54973;
+    public long l54974;
+    public long l54975;
+    public long l54976;
+    public long l54977;
+    public long l54978;
+    public long l54979;
+    public long l54980;
+    public long l54981;
+    public long l54982;
+    public long l54983;
+    public long l54984;
+    public long l54985;
+    public long l54986;
+    public long l54987;
+    public long l54988;
+    public long l54989;
+    public long l54990;
+    public long l54991;
+    public long l54992;
+    public long l54993;
+    public long l54994;
+    public long l54995;
+    public long l54996;
+    public long l54997;
+    public long l54998;
+    public long l54999;
+    public long l55000;
+    public long l55001;
+    public long l55002;
+    public long l55003;
+    public long l55004;
+    public long l55005;
+    public long l55006;
+    public long l55007;
+    public long l55008;
+    public long l55009;
+    public long l55010;
+    public long l55011;
+    public long l55012;
+    public long l55013;
+    public long l55014;
+    public long l55015;
+    public long l55016;
+    public long l55017;
+    public long l55018;
+    public long l55019;
+    public long l55020;
+    public long l55021;
+    public long l55022;
+    public long l55023;
+    public long l55024;
+    public long l55025;
+    public long l55026;
+    public long l55027;
+    public long l55028;
+    public long l55029;
+    public long l55030;
+    public long l55031;
+    public long l55032;
+    public long l55033;
+    public long l55034;
+    public long l55035;
+    public long l55036;
+    public long l55037;
+    public long l55038;
+    public long l55039;
+    public long l55040;
+    public long l55041;
+    public long l55042;
+    public long l55043;
+    public long l55044;
+    public long l55045;
+    public long l55046;
+    public long l55047;
+    public long l55048;
+    public long l55049;
+    public long l55050;
+    public long l55051;
+    public long l55052;
+    public long l55053;
+    public long l55054;
+    public long l55055;
+    public long l55056;
+    public long l55057;
+    public long l55058;
+    public long l55059;
+    public long l55060;
+    public long l55061;
+    public long l55062;
+    public long l55063;
+    public long l55064;
+    public long l55065;
+    public long l55066;
+    public long l55067;
+    public long l55068;
+    public long l55069;
+    public long l55070;
+    public long l55071;
+    public long l55072;
+    public long l55073;
+    public long l55074;
+    public long l55075;
+    public long l55076;
+    public long l55077;
+    public long l55078;
+    public long l55079;
+    public long l55080;
+    public long l55081;
+    public long l55082;
+    public long l55083;
+    public long l55084;
+    public long l55085;
+    public long l55086;
+    public long l55087;
+    public long l55088;
+    public long l55089;
+    public long l55090;
+    public long l55091;
+    public long l55092;
+    public long l55093;
+    public long l55094;
+    public long l55095;
+    public long l55096;
+    public long l55097;
+    public long l55098;
+    public long l55099;
+    public long l55100;
+    public long l55101;
+    public long l55102;
+    public long l55103;
+    public long l55104;
+    public long l55105;
+    public long l55106;
+    public long l55107;
+    public long l55108;
+    public long l55109;
+    public long l55110;
+    public long l55111;
+    public long l55112;
+    public long l55113;
+    public long l55114;
+    public long l55115;
+    public long l55116;
+    public long l55117;
+    public long l55118;
+    public long l55119;
+    public long l55120;
+    public long l55121;
+    public long l55122;
+    public long l55123;
+    public long l55124;
+    public long l55125;
+    public long l55126;
+    public long l55127;
+    public long l55128;
+    public long l55129;
+    public long l55130;
+    public long l55131;
+    public long l55132;
+    public long l55133;
+    public long l55134;
+    public long l55135;
+    public long l55136;
+    public long l55137;
+    public long l55138;
+    public long l55139;
+    public long l55140;
+    public long l55141;
+    public long l55142;
+    public long l55143;
+    public long l55144;
+    public long l55145;
+    public long l55146;
+    public long l55147;
+    public long l55148;
+    public long l55149;
+    public long l55150;
+    public long l55151;
+    public long l55152;
+    public long l55153;
+    public long l55154;
+    public long l55155;
+    public long l55156;
+    public long l55157;
+    public long l55158;
+    public long l55159;
+    public long l55160;
+    public long l55161;
+    public long l55162;
+    public long l55163;
+    public long l55164;
+    public long l55165;
+    public long l55166;
+    public long l55167;
+    public long l55168;
+    public long l55169;
+    public long l55170;
+    public long l55171;
+    public long l55172;
+    public long l55173;
+    public long l55174;
+    public long l55175;
+    public long l55176;
+    public long l55177;
+    public long l55178;
+    public long l55179;
+    public long l55180;
+    public long l55181;
+    public long l55182;
+    public long l55183;
+    public long l55184;
+    public long l55185;
+    public long l55186;
+    public long l55187;
+    public long l55188;
+    public long l55189;
+    public long l55190;
+    public long l55191;
+    public long l55192;
+    public long l55193;
+    public long l55194;
+    public long l55195;
+    public long l55196;
+    public long l55197;
+    public long l55198;
+    public long l55199;
+    public long l55200;
+    public long l55201;
+    public long l55202;
+    public long l55203;
+    public long l55204;
+    public long l55205;
+    public long l55206;
+    public long l55207;
+    public long l55208;
+    public long l55209;
+    public long l55210;
+    public long l55211;
+    public long l55212;
+    public long l55213;
+    public long l55214;
+    public long l55215;
+    public long l55216;
+    public long l55217;
+    public long l55218;
+    public long l55219;
+    public long l55220;
+    public long l55221;
+    public long l55222;
+    public long l55223;
+    public long l55224;
+    public long l55225;
+    public long l55226;
+    public long l55227;
+    public long l55228;
+    public long l55229;
+    public long l55230;
+    public long l55231;
+    public long l55232;
+    public long l55233;
+    public long l55234;
+    public long l55235;
+    public long l55236;
+    public long l55237;
+    public long l55238;
+    public long l55239;
+    public long l55240;
+    public long l55241;
+    public long l55242;
+    public long l55243;
+    public long l55244;
+    public long l55245;
+    public long l55246;
+    public long l55247;
+    public long l55248;
+    public long l55249;
+    public long l55250;
+    public long l55251;
+    public long l55252;
+    public long l55253;
+    public long l55254;
+    public long l55255;
+    public long l55256;
+    public long l55257;
+    public long l55258;
+    public long l55259;
+    public long l55260;
+    public long l55261;
+    public long l55262;
+    public long l55263;
+    public long l55264;
+    public long l55265;
+    public long l55266;
+    public long l55267;
+    public long l55268;
+    public long l55269;
+    public long l55270;
+    public long l55271;
+    public long l55272;
+    public long l55273;
+    public long l55274;
+    public long l55275;
+    public long l55276;
+    public long l55277;
+    public long l55278;
+    public long l55279;
+    public long l55280;
+    public long l55281;
+    public long l55282;
+    public long l55283;
+    public long l55284;
+    public long l55285;
+    public long l55286;
+    public long l55287;
+    public long l55288;
+    public long l55289;
+    public long l55290;
+    public long l55291;
+    public long l55292;
+    public long l55293;
+    public long l55294;
+    public long l55295;
+    public long l55296;
+    public long l55297;
+    public long l55298;
+    public long l55299;
+    public long l55300;
+    public long l55301;
+    public long l55302;
+    public long l55303;
+    public long l55304;
+    public long l55305;
+    public long l55306;
+    public long l55307;
+    public long l55308;
+    public long l55309;
+    public long l55310;
+    public long l55311;
+    public long l55312;
+    public long l55313;
+    public long l55314;
+    public long l55315;
+    public long l55316;
+    public long l55317;
+    public long l55318;
+    public long l55319;
+    public long l55320;
+    public long l55321;
+    public long l55322;
+    public long l55323;
+    public long l55324;
+    public long l55325;
+    public long l55326;
+    public long l55327;
+    public long l55328;
+    public long l55329;
+    public long l55330;
+    public long l55331;
+    public long l55332;
+    public long l55333;
+    public long l55334;
+    public long l55335;
+    public long l55336;
+    public long l55337;
+    public long l55338;
+    public long l55339;
+    public long l55340;
+    public long l55341;
+    public long l55342;
+    public long l55343;
+    public long l55344;
+    public long l55345;
+    public long l55346;
+    public long l55347;
+    public long l55348;
+    public long l55349;
+    public long l55350;
+    public long l55351;
+    public long l55352;
+    public long l55353;
+    public long l55354;
+    public long l55355;
+    public long l55356;
+    public long l55357;
+    public long l55358;
+    public long l55359;
+    public long l55360;
+    public long l55361;
+    public long l55362;
+    public long l55363;
+    public long l55364;
+    public long l55365;
+    public long l55366;
+    public long l55367;
+    public long l55368;
+    public long l55369;
+    public long l55370;
+    public long l55371;
+    public long l55372;
+    public long l55373;
+    public long l55374;
+    public long l55375;
+    public long l55376;
+    public long l55377;
+    public long l55378;
+    public long l55379;
+    public long l55380;
+    public long l55381;
+    public long l55382;
+    public long l55383;
+    public long l55384;
+    public long l55385;
+    public long l55386;
+    public long l55387;
+    public long l55388;
+    public long l55389;
+    public long l55390;
+    public long l55391;
+    public long l55392;
+    public long l55393;
+    public long l55394;
+    public long l55395;
+    public long l55396;
+    public long l55397;
+    public long l55398;
+    public long l55399;
+    public long l55400;
+    public long l55401;
+    public long l55402;
+    public long l55403;
+    public long l55404;
+    public long l55405;
+    public long l55406;
+    public long l55407;
+    public long l55408;
+    public long l55409;
+    public long l55410;
+    public long l55411;
+    public long l55412;
+    public long l55413;
+    public long l55414;
+    public long l55415;
+    public long l55416;
+    public long l55417;
+    public long l55418;
+    public long l55419;
+    public long l55420;
+    public long l55421;
+    public long l55422;
+    public long l55423;
+    public long l55424;
+    public long l55425;
+    public long l55426;
+    public long l55427;
+    public long l55428;
+    public long l55429;
+    public long l55430;
+    public long l55431;
+    public long l55432;
+    public long l55433;
+    public long l55434;
+    public long l55435;
+    public long l55436;
+    public long l55437;
+    public long l55438;
+    public long l55439;
+    public long l55440;
+    public long l55441;
+    public long l55442;
+    public long l55443;
+    public long l55444;
+    public long l55445;
+    public long l55446;
+    public long l55447;
+    public long l55448;
+    public long l55449;
+    public long l55450;
+    public long l55451;
+    public long l55452;
+    public long l55453;
+    public long l55454;
+    public long l55455;
+    public long l55456;
+    public long l55457;
+    public long l55458;
+    public long l55459;
+    public long l55460;
+    public long l55461;
+    public long l55462;
+    public long l55463;
+    public long l55464;
+    public long l55465;
+    public long l55466;
+    public long l55467;
+    public long l55468;
+    public long l55469;
+    public long l55470;
+    public long l55471;
+    public long l55472;
+    public long l55473;
+    public long l55474;
+    public long l55475;
+    public long l55476;
+    public long l55477;
+    public long l55478;
+    public long l55479;
+    public long l55480;
+    public long l55481;
+    public long l55482;
+    public long l55483;
+    public long l55484;
+    public long l55485;
+    public long l55486;
+    public long l55487;
+    public long l55488;
+    public long l55489;
+    public long l55490;
+    public long l55491;
+    public long l55492;
+    public long l55493;
+    public long l55494;
+    public long l55495;
+    public long l55496;
+    public long l55497;
+    public long l55498;
+    public long l55499;
+    public long l55500;
+    public long l55501;
+    public long l55502;
+    public long l55503;
+    public long l55504;
+    public long l55505;
+    public long l55506;
+    public long l55507;
+    public long l55508;
+    public long l55509;
+    public long l55510;
+    public long l55511;
+    public long l55512;
+    public long l55513;
+    public long l55514;
+    public long l55515;
+    public long l55516;
+    public long l55517;
+    public long l55518;
+    public long l55519;
+    public long l55520;
+    public long l55521;
+    public long l55522;
+    public long l55523;
+    public long l55524;
+    public long l55525;
+    public long l55526;
+    public long l55527;
+    public long l55528;
+    public long l55529;
+    public long l55530;
+    public long l55531;
+    public long l55532;
+    public long l55533;
+    public long l55534;
+    public long l55535;
+    public long l55536;
+    public long l55537;
+    public long l55538;
+    public long l55539;
+    public long l55540;
+    public long l55541;
+    public long l55542;
+    public long l55543;
+    public long l55544;
+    public long l55545;
+    public long l55546;
+    public long l55547;
+    public long l55548;
+    public long l55549;
+    public long l55550;
+    public long l55551;
+    public long l55552;
+    public long l55553;
+    public long l55554;
+    public long l55555;
+    public long l55556;
+    public long l55557;
+    public long l55558;
+    public long l55559;
+    public long l55560;
+    public long l55561;
+    public long l55562;
+    public long l55563;
+    public long l55564;
+    public long l55565;
+    public long l55566;
+    public long l55567;
+    public long l55568;
+    public long l55569;
+    public long l55570;
+    public long l55571;
+    public long l55572;
+    public long l55573;
+    public long l55574;
+    public long l55575;
+    public long l55576;
+    public long l55577;
+    public long l55578;
+    public long l55579;
+    public long l55580;
+    public long l55581;
+    public long l55582;
+    public long l55583;
+    public long l55584;
+    public long l55585;
+    public long l55586;
+    public long l55587;
+    public long l55588;
+    public long l55589;
+    public long l55590;
+    public long l55591;
+    public long l55592;
+    public long l55593;
+    public long l55594;
+    public long l55595;
+    public long l55596;
+    public long l55597;
+    public long l55598;
+    public long l55599;
+    public long l55600;
+    public long l55601;
+    public long l55602;
+    public long l55603;
+    public long l55604;
+    public long l55605;
+    public long l55606;
+    public long l55607;
+    public long l55608;
+    public long l55609;
+    public long l55610;
+    public long l55611;
+    public long l55612;
+    public long l55613;
+    public long l55614;
+    public long l55615;
+    public long l55616;
+    public long l55617;
+    public long l55618;
+    public long l55619;
+    public long l55620;
+    public long l55621;
+    public long l55622;
+    public long l55623;
+    public long l55624;
+    public long l55625;
+    public long l55626;
+    public long l55627;
+    public long l55628;
+    public long l55629;
+    public long l55630;
+    public long l55631;
+    public long l55632;
+    public long l55633;
+    public long l55634;
+    public long l55635;
+    public long l55636;
+    public long l55637;
+    public long l55638;
+    public long l55639;
+    public long l55640;
+    public long l55641;
+    public long l55642;
+    public long l55643;
+    public long l55644;
+    public long l55645;
+    public long l55646;
+    public long l55647;
+    public long l55648;
+    public long l55649;
+    public long l55650;
+    public long l55651;
+    public long l55652;
+    public long l55653;
+    public long l55654;
+    public long l55655;
+    public long l55656;
+    public long l55657;
+    public long l55658;
+    public long l55659;
+    public long l55660;
+    public long l55661;
+    public long l55662;
+    public long l55663;
+    public long l55664;
+    public long l55665;
+    public long l55666;
+    public long l55667;
+    public long l55668;
+    public long l55669;
+    public long l55670;
+    public long l55671;
+    public long l55672;
+    public long l55673;
+    public long l55674;
+    public long l55675;
+    public long l55676;
+    public long l55677;
+    public long l55678;
+    public long l55679;
+    public long l55680;
+    public long l55681;
+    public long l55682;
+    public long l55683;
+    public long l55684;
+    public long l55685;
+    public long l55686;
+    public long l55687;
+    public long l55688;
+    public long l55689;
+    public long l55690;
+    public long l55691;
+    public long l55692;
+    public long l55693;
+    public long l55694;
+    public long l55695;
+    public long l55696;
+    public long l55697;
+    public long l55698;
+    public long l55699;
+    public long l55700;
+    public long l55701;
+    public long l55702;
+    public long l55703;
+    public long l55704;
+    public long l55705;
+    public long l55706;
+    public long l55707;
+    public long l55708;
+    public long l55709;
+    public long l55710;
+    public long l55711;
+    public long l55712;
+    public long l55713;
+    public long l55714;
+    public long l55715;
+    public long l55716;
+    public long l55717;
+    public long l55718;
+    public long l55719;
+    public long l55720;
+    public long l55721;
+    public long l55722;
+    public long l55723;
+    public long l55724;
+    public long l55725;
+    public long l55726;
+    public long l55727;
+    public long l55728;
+    public long l55729;
+    public long l55730;
+    public long l55731;
+    public long l55732;
+    public long l55733;
+    public long l55734;
+    public long l55735;
+    public long l55736;
+    public long l55737;
+    public long l55738;
+    public long l55739;
+    public long l55740;
+    public long l55741;
+    public long l55742;
+    public long l55743;
+    public long l55744;
+    public long l55745;
+    public long l55746;
+    public long l55747;
+    public long l55748;
+    public long l55749;
+    public long l55750;
+    public long l55751;
+    public long l55752;
+    public long l55753;
+    public long l55754;
+    public long l55755;
+    public long l55756;
+    public long l55757;
+    public long l55758;
+    public long l55759;
+    public long l55760;
+    public long l55761;
+    public long l55762;
+    public long l55763;
+    public long l55764;
+    public long l55765;
+    public long l55766;
+    public long l55767;
+    public long l55768;
+    public long l55769;
+    public long l55770;
+    public long l55771;
+    public long l55772;
+    public long l55773;
+    public long l55774;
+    public long l55775;
+    public long l55776;
+    public long l55777;
+    public long l55778;
+    public long l55779;
+    public long l55780;
+    public long l55781;
+    public long l55782;
+    public long l55783;
+    public long l55784;
+    public long l55785;
+    public long l55786;
+    public long l55787;
+    public long l55788;
+    public long l55789;
+    public long l55790;
+    public long l55791;
+    public long l55792;
+    public long l55793;
+    public long l55794;
+    public long l55795;
+    public long l55796;
+    public long l55797;
+    public long l55798;
+    public long l55799;
+    public long l55800;
+    public long l55801;
+    public long l55802;
+    public long l55803;
+    public long l55804;
+    public long l55805;
+    public long l55806;
+    public long l55807;
+    public long l55808;
+    public long l55809;
+    public long l55810;
+    public long l55811;
+    public long l55812;
+    public long l55813;
+    public long l55814;
+    public long l55815;
+    public long l55816;
+    public long l55817;
+    public long l55818;
+    public long l55819;
+    public long l55820;
+    public long l55821;
+    public long l55822;
+    public long l55823;
+    public long l55824;
+    public long l55825;
+    public long l55826;
+    public long l55827;
+    public long l55828;
+    public long l55829;
+    public long l55830;
+    public long l55831;
+    public long l55832;
+    public long l55833;
+    public long l55834;
+    public long l55835;
+    public long l55836;
+    public long l55837;
+    public long l55838;
+    public long l55839;
+    public long l55840;
+    public long l55841;
+    public long l55842;
+    public long l55843;
+    public long l55844;
+    public long l55845;
+    public long l55846;
+    public long l55847;
+    public long l55848;
+    public long l55849;
+    public long l55850;
+    public long l55851;
+    public long l55852;
+    public long l55853;
+    public long l55854;
+    public long l55855;
+    public long l55856;
+    public long l55857;
+    public long l55858;
+    public long l55859;
+    public long l55860;
+    public long l55861;
+    public long l55862;
+    public long l55863;
+    public long l55864;
+    public long l55865;
+    public long l55866;
+    public long l55867;
+    public long l55868;
+    public long l55869;
+    public long l55870;
+    public long l55871;
+    public long l55872;
+    public long l55873;
+    public long l55874;
+    public long l55875;
+    public long l55876;
+    public long l55877;
+    public long l55878;
+    public long l55879;
+    public long l55880;
+    public long l55881;
+    public long l55882;
+    public long l55883;
+    public long l55884;
+    public long l55885;
+    public long l55886;
+    public long l55887;
+    public long l55888;
+    public long l55889;
+    public long l55890;
+    public long l55891;
+    public long l55892;
+    public long l55893;
+    public long l55894;
+    public long l55895;
+    public long l55896;
+    public long l55897;
+    public long l55898;
+    public long l55899;
+    public long l55900;
+    public long l55901;
+    public long l55902;
+    public long l55903;
+    public long l55904;
+    public long l55905;
+    public long l55906;
+    public long l55907;
+    public long l55908;
+    public long l55909;
+    public long l55910;
+    public long l55911;
+    public long l55912;
+    public long l55913;
+    public long l55914;
+    public long l55915;
+    public long l55916;
+    public long l55917;
+    public long l55918;
+    public long l55919;
+    public long l55920;
+    public long l55921;
+    public long l55922;
+    public long l55923;
+    public long l55924;
+    public long l55925;
+    public long l55926;
+    public long l55927;
+    public long l55928;
+    public long l55929;
+    public long l55930;
+    public long l55931;
+    public long l55932;
+    public long l55933;
+    public long l55934;
+    public long l55935;
+    public long l55936;
+    public long l55937;
+    public long l55938;
+    public long l55939;
+    public long l55940;
+    public long l55941;
+    public long l55942;
+    public long l55943;
+    public long l55944;
+    public long l55945;
+    public long l55946;
+    public long l55947;
+    public long l55948;
+    public long l55949;
+    public long l55950;
+    public long l55951;
+    public long l55952;
+    public long l55953;
+    public long l55954;
+    public long l55955;
+    public long l55956;
+    public long l55957;
+    public long l55958;
+    public long l55959;
+    public long l55960;
+    public long l55961;
+    public long l55962;
+    public long l55963;
+    public long l55964;
+    public long l55965;
+    public long l55966;
+    public long l55967;
+    public long l55968;
+    public long l55969;
+    public long l55970;
+    public long l55971;
+    public long l55972;
+    public long l55973;
+    public long l55974;
+    public long l55975;
+    public long l55976;
+    public long l55977;
+    public long l55978;
+    public long l55979;
+    public long l55980;
+    public long l55981;
+    public long l55982;
+    public long l55983;
+    public long l55984;
+    public long l55985;
+    public long l55986;
+    public long l55987;
+    public long l55988;
+    public long l55989;
+    public long l55990;
+    public long l55991;
+    public long l55992;
+    public long l55993;
+    public long l55994;
+    public long l55995;
+    public long l55996;
+    public long l55997;
+    public long l55998;
+    public long l55999;
+    public long l56000;
+    public long l56001;
+    public long l56002;
+    public long l56003;
+    public long l56004;
+    public long l56005;
+    public long l56006;
+    public long l56007;
+    public long l56008;
+    public long l56009;
+    public long l56010;
+    public long l56011;
+    public long l56012;
+    public long l56013;
+    public long l56014;
+    public long l56015;
+    public long l56016;
+    public long l56017;
+    public long l56018;
+    public long l56019;
+    public long l56020;
+    public long l56021;
+    public long l56022;
+    public long l56023;
+    public long l56024;
+    public long l56025;
+    public long l56026;
+    public long l56027;
+    public long l56028;
+    public long l56029;
+    public long l56030;
+    public long l56031;
+    public long l56032;
+    public long l56033;
+    public long l56034;
+    public long l56035;
+    public long l56036;
+    public long l56037;
+    public long l56038;
+    public long l56039;
+    public long l56040;
+    public long l56041;
+    public long l56042;
+    public long l56043;
+    public long l56044;
+    public long l56045;
+    public long l56046;
+    public long l56047;
+    public long l56048;
+    public long l56049;
+    public long l56050;
+    public long l56051;
+    public long l56052;
+    public long l56053;
+    public long l56054;
+    public long l56055;
+    public long l56056;
+    public long l56057;
+    public long l56058;
+    public long l56059;
+    public long l56060;
+    public long l56061;
+    public long l56062;
+    public long l56063;
+    public long l56064;
+    public long l56065;
+    public long l56066;
+    public long l56067;
+    public long l56068;
+    public long l56069;
+    public long l56070;
+    public long l56071;
+    public long l56072;
+    public long l56073;
+    public long l56074;
+    public long l56075;
+    public long l56076;
+    public long l56077;
+    public long l56078;
+    public long l56079;
+    public long l56080;
+    public long l56081;
+    public long l56082;
+    public long l56083;
+    public long l56084;
+    public long l56085;
+    public long l56086;
+    public long l56087;
+    public long l56088;
+    public long l56089;
+    public long l56090;
+    public long l56091;
+    public long l56092;
+    public long l56093;
+    public long l56094;
+    public long l56095;
+    public long l56096;
+    public long l56097;
+    public long l56098;
+    public long l56099;
+    public long l56100;
+    public long l56101;
+    public long l56102;
+    public long l56103;
+    public long l56104;
+    public long l56105;
+    public long l56106;
+    public long l56107;
+    public long l56108;
+    public long l56109;
+    public long l56110;
+    public long l56111;
+    public long l56112;
+    public long l56113;
+    public long l56114;
+    public long l56115;
+    public long l56116;
+    public long l56117;
+    public long l56118;
+    public long l56119;
+    public long l56120;
+    public long l56121;
+    public long l56122;
+    public long l56123;
+    public long l56124;
+    public long l56125;
+    public long l56126;
+    public long l56127;
+    public long l56128;
+    public long l56129;
+    public long l56130;
+    public long l56131;
+    public long l56132;
+    public long l56133;
+    public long l56134;
+    public long l56135;
+    public long l56136;
+    public long l56137;
+    public long l56138;
+    public long l56139;
+    public long l56140;
+    public long l56141;
+    public long l56142;
+    public long l56143;
+    public long l56144;
+    public long l56145;
+    public long l56146;
+    public long l56147;
+    public long l56148;
+    public long l56149;
+    public long l56150;
+    public long l56151;
+    public long l56152;
+    public long l56153;
+    public long l56154;
+    public long l56155;
+    public long l56156;
+    public long l56157;
+    public long l56158;
+    public long l56159;
+    public long l56160;
+    public long l56161;
+    public long l56162;
+    public long l56163;
+    public long l56164;
+    public long l56165;
+    public long l56166;
+    public long l56167;
+    public long l56168;
+    public long l56169;
+    public long l56170;
+    public long l56171;
+    public long l56172;
+    public long l56173;
+    public long l56174;
+    public long l56175;
+    public long l56176;
+    public long l56177;
+    public long l56178;
+    public long l56179;
+    public long l56180;
+    public long l56181;
+    public long l56182;
+    public long l56183;
+    public long l56184;
+    public long l56185;
+    public long l56186;
+    public long l56187;
+    public long l56188;
+    public long l56189;
+    public long l56190;
+    public long l56191;
+    public long l56192;
+    public long l56193;
+    public long l56194;
+    public long l56195;
+    public long l56196;
+    public long l56197;
+    public long l56198;
+    public long l56199;
+    public long l56200;
+    public long l56201;
+    public long l56202;
+    public long l56203;
+    public long l56204;
+    public long l56205;
+    public long l56206;
+    public long l56207;
+    public long l56208;
+    public long l56209;
+    public long l56210;
+    public long l56211;
+    public long l56212;
+    public long l56213;
+    public long l56214;
+    public long l56215;
+    public long l56216;
+    public long l56217;
+    public long l56218;
+    public long l56219;
+    public long l56220;
+    public long l56221;
+    public long l56222;
+    public long l56223;
+    public long l56224;
+    public long l56225;
+    public long l56226;
+    public long l56227;
+    public long l56228;
+    public long l56229;
+    public long l56230;
+    public long l56231;
+    public long l56232;
+    public long l56233;
+    public long l56234;
+    public long l56235;
+    public long l56236;
+    public long l56237;
+    public long l56238;
+    public long l56239;
+    public long l56240;
+    public long l56241;
+    public long l56242;
+    public long l56243;
+    public long l56244;
+    public long l56245;
+    public long l56246;
+    public long l56247;
+    public long l56248;
+    public long l56249;
+    public long l56250;
+    public long l56251;
+    public long l56252;
+    public long l56253;
+    public long l56254;
+    public long l56255;
+    public long l56256;
+    public long l56257;
+    public long l56258;
+    public long l56259;
+    public long l56260;
+    public long l56261;
+    public long l56262;
+    public long l56263;
+    public long l56264;
+    public long l56265;
+    public long l56266;
+    public long l56267;
+    public long l56268;
+    public long l56269;
+    public long l56270;
+    public long l56271;
+    public long l56272;
+    public long l56273;
+    public long l56274;
+    public long l56275;
+    public long l56276;
+    public long l56277;
+    public long l56278;
+    public long l56279;
+    public long l56280;
+    public long l56281;
+    public long l56282;
+    public long l56283;
+    public long l56284;
+    public long l56285;
+    public long l56286;
+    public long l56287;
+    public long l56288;
+    public long l56289;
+    public long l56290;
+    public long l56291;
+    public long l56292;
+    public long l56293;
+    public long l56294;
+    public long l56295;
+    public long l56296;
+    public long l56297;
+    public long l56298;
+    public long l56299;
+    public long l56300;
+    public long l56301;
+    public long l56302;
+    public long l56303;
+    public long l56304;
+    public long l56305;
+    public long l56306;
+    public long l56307;
+    public long l56308;
+    public long l56309;
+    public long l56310;
+    public long l56311;
+    public long l56312;
+    public long l56313;
+    public long l56314;
+    public long l56315;
+    public long l56316;
+    public long l56317;
+    public long l56318;
+    public long l56319;
+    public long l56320;
+    public long l56321;
+    public long l56322;
+    public long l56323;
+    public long l56324;
+    public long l56325;
+    public long l56326;
+    public long l56327;
+    public long l56328;
+    public long l56329;
+    public long l56330;
+    public long l56331;
+    public long l56332;
+    public long l56333;
+    public long l56334;
+    public long l56335;
+    public long l56336;
+    public long l56337;
+    public long l56338;
+    public long l56339;
+    public long l56340;
+    public long l56341;
+    public long l56342;
+    public long l56343;
+    public long l56344;
+    public long l56345;
+    public long l56346;
+    public long l56347;
+    public long l56348;
+    public long l56349;
+    public long l56350;
+    public long l56351;
+    public long l56352;
+    public long l56353;
+    public long l56354;
+    public long l56355;
+    public long l56356;
+    public long l56357;
+    public long l56358;
+    public long l56359;
+    public long l56360;
+    public long l56361;
+    public long l56362;
+    public long l56363;
+    public long l56364;
+    public long l56365;
+    public long l56366;
+    public long l56367;
+    public long l56368;
+    public long l56369;
+    public long l56370;
+    public long l56371;
+    public long l56372;
+    public long l56373;
+    public long l56374;
+    public long l56375;
+    public long l56376;
+    public long l56377;
+    public long l56378;
+    public long l56379;
+    public long l56380;
+    public long l56381;
+    public long l56382;
+    public long l56383;
+    public long l56384;
+    public long l56385;
+    public long l56386;
+    public long l56387;
+    public long l56388;
+    public long l56389;
+    public long l56390;
+    public long l56391;
+    public long l56392;
+    public long l56393;
+    public long l56394;
+    public long l56395;
+    public long l56396;
+    public long l56397;
+    public long l56398;
+    public long l56399;
+    public long l56400;
+    public long l56401;
+    public long l56402;
+    public long l56403;
+    public long l56404;
+    public long l56405;
+    public long l56406;
+    public long l56407;
+    public long l56408;
+    public long l56409;
+    public long l56410;
+    public long l56411;
+    public long l56412;
+    public long l56413;
+    public long l56414;
+    public long l56415;
+    public long l56416;
+    public long l56417;
+    public long l56418;
+    public long l56419;
+    public long l56420;
+    public long l56421;
+    public long l56422;
+    public long l56423;
+    public long l56424;
+    public long l56425;
+    public long l56426;
+    public long l56427;
+    public long l56428;
+    public long l56429;
+    public long l56430;
+    public long l56431;
+    public long l56432;
+    public long l56433;
+    public long l56434;
+    public long l56435;
+    public long l56436;
+    public long l56437;
+    public long l56438;
+    public long l56439;
+    public long l56440;
+    public long l56441;
+    public long l56442;
+    public long l56443;
+    public long l56444;
+    public long l56445;
+    public long l56446;
+    public long l56447;
+    public long l56448;
+    public long l56449;
+    public long l56450;
+    public long l56451;
+    public long l56452;
+    public long l56453;
+    public long l56454;
+    public long l56455;
+    public long l56456;
+    public long l56457;
+    public long l56458;
+    public long l56459;
+    public long l56460;
+    public long l56461;
+    public long l56462;
+    public long l56463;
+    public long l56464;
+    public long l56465;
+    public long l56466;
+    public long l56467;
+    public long l56468;
+    public long l56469;
+    public long l56470;
+    public long l56471;
+    public long l56472;
+    public long l56473;
+    public long l56474;
+    public long l56475;
+    public long l56476;
+    public long l56477;
+    public long l56478;
+    public long l56479;
+    public long l56480;
+    public long l56481;
+    public long l56482;
+    public long l56483;
+    public long l56484;
+    public long l56485;
+    public long l56486;
+    public long l56487;
+    public long l56488;
+    public long l56489;
+    public long l56490;
+    public long l56491;
+    public long l56492;
+    public long l56493;
+    public long l56494;
+    public long l56495;
+    public long l56496;
+    public long l56497;
+    public long l56498;
+    public long l56499;
+    public long l56500;
+    public long l56501;
+    public long l56502;
+    public long l56503;
+    public long l56504;
+    public long l56505;
+    public long l56506;
+    public long l56507;
+    public long l56508;
+    public long l56509;
+    public long l56510;
+    public long l56511;
+    public long l56512;
+    public long l56513;
+    public long l56514;
+    public long l56515;
+    public long l56516;
+    public long l56517;
+    public long l56518;
+    public long l56519;
+    public long l56520;
+    public long l56521;
+    public long l56522;
+    public long l56523;
+    public long l56524;
+    public long l56525;
+    public long l56526;
+    public long l56527;
+    public long l56528;
+    public long l56529;
+    public long l56530;
+    public long l56531;
+    public long l56532;
+    public long l56533;
+    public long l56534;
+    public long l56535;
+    public long l56536;
+    public long l56537;
+    public long l56538;
+    public long l56539;
+    public long l56540;
+    public long l56541;
+    public long l56542;
+    public long l56543;
+    public long l56544;
+    public long l56545;
+    public long l56546;
+    public long l56547;
+    public long l56548;
+    public long l56549;
+    public long l56550;
+    public long l56551;
+    public long l56552;
+    public long l56553;
+    public long l56554;
+    public long l56555;
+    public long l56556;
+    public long l56557;
+    public long l56558;
+    public long l56559;
+    public long l56560;
+    public long l56561;
+    public long l56562;
+    public long l56563;
+    public long l56564;
+    public long l56565;
+    public long l56566;
+    public long l56567;
+    public long l56568;
+    public long l56569;
+    public long l56570;
+    public long l56571;
+    public long l56572;
+    public long l56573;
+    public long l56574;
+    public long l56575;
+    public long l56576;
+    public long l56577;
+    public long l56578;
+    public long l56579;
+    public long l56580;
+    public long l56581;
+    public long l56582;
+    public long l56583;
+    public long l56584;
+    public long l56585;
+    public long l56586;
+    public long l56587;
+    public long l56588;
+    public long l56589;
+    public long l56590;
+    public long l56591;
+    public long l56592;
+    public long l56593;
+    public long l56594;
+    public long l56595;
+    public long l56596;
+    public long l56597;
+    public long l56598;
+    public long l56599;
+    public long l56600;
+    public long l56601;
+    public long l56602;
+    public long l56603;
+    public long l56604;
+    public long l56605;
+    public long l56606;
+    public long l56607;
+    public long l56608;
+    public long l56609;
+    public long l56610;
+    public long l56611;
+    public long l56612;
+    public long l56613;
+    public long l56614;
+    public long l56615;
+    public long l56616;
+    public long l56617;
+    public long l56618;
+    public long l56619;
+    public long l56620;
+    public long l56621;
+    public long l56622;
+    public long l56623;
+    public long l56624;
+    public long l56625;
+    public long l56626;
+    public long l56627;
+    public long l56628;
+    public long l56629;
+    public long l56630;
+    public long l56631;
+    public long l56632;
+    public long l56633;
+    public long l56634;
+    public long l56635;
+    public long l56636;
+    public long l56637;
+    public long l56638;
+    public long l56639;
+    public long l56640;
+    public long l56641;
+    public long l56642;
+    public long l56643;
+    public long l56644;
+    public long l56645;
+    public long l56646;
+    public long l56647;
+    public long l56648;
+    public long l56649;
+    public long l56650;
+    public long l56651;
+    public long l56652;
+    public long l56653;
+    public long l56654;
+    public long l56655;
+    public long l56656;
+    public long l56657;
+    public long l56658;
+    public long l56659;
+    public long l56660;
+    public long l56661;
+    public long l56662;
+    public long l56663;
+    public long l56664;
+    public long l56665;
+    public long l56666;
+    public long l56667;
+    public long l56668;
+    public long l56669;
+    public long l56670;
+    public long l56671;
+    public long l56672;
+    public long l56673;
+    public long l56674;
+    public long l56675;
+    public long l56676;
+    public long l56677;
+    public long l56678;
+    public long l56679;
+    public long l56680;
+    public long l56681;
+    public long l56682;
+    public long l56683;
+    public long l56684;
+    public long l56685;
+    public long l56686;
+    public long l56687;
+    public long l56688;
+    public long l56689;
+    public long l56690;
+    public long l56691;
+    public long l56692;
+    public long l56693;
+    public long l56694;
+    public long l56695;
+    public long l56696;
+    public long l56697;
+    public long l56698;
+    public long l56699;
+    public long l56700;
+    public long l56701;
+    public long l56702;
+    public long l56703;
+    public long l56704;
+    public long l56705;
+    public long l56706;
+    public long l56707;
+    public long l56708;
+    public long l56709;
+    public long l56710;
+    public long l56711;
+    public long l56712;
+    public long l56713;
+    public long l56714;
+    public long l56715;
+    public long l56716;
+    public long l56717;
+    public long l56718;
+    public long l56719;
+    public long l56720;
+    public long l56721;
+    public long l56722;
+    public long l56723;
+    public long l56724;
+    public long l56725;
+    public long l56726;
+    public long l56727;
+    public long l56728;
+    public long l56729;
+    public long l56730;
+    public long l56731;
+    public long l56732;
+    public long l56733;
+    public long l56734;
+    public long l56735;
+    public long l56736;
+    public long l56737;
+    public long l56738;
+    public long l56739;
+    public long l56740;
+    public long l56741;
+    public long l56742;
+    public long l56743;
+    public long l56744;
+    public long l56745;
+    public long l56746;
+    public long l56747;
+    public long l56748;
+    public long l56749;
+    public long l56750;
+    public long l56751;
+    public long l56752;
+    public long l56753;
+    public long l56754;
+    public long l56755;
+    public long l56756;
+    public long l56757;
+    public long l56758;
+    public long l56759;
+    public long l56760;
+    public long l56761;
+    public long l56762;
+    public long l56763;
+    public long l56764;
+    public long l56765;
+    public long l56766;
+    public long l56767;
+    public long l56768;
+    public long l56769;
+    public long l56770;
+    public long l56771;
+    public long l56772;
+    public long l56773;
+    public long l56774;
+    public long l56775;
+    public long l56776;
+    public long l56777;
+    public long l56778;
+    public long l56779;
+    public long l56780;
+    public long l56781;
+    public long l56782;
+    public long l56783;
+    public long l56784;
+    public long l56785;
+    public long l56786;
+    public long l56787;
+    public long l56788;
+    public long l56789;
+    public long l56790;
+    public long l56791;
+    public long l56792;
+    public long l56793;
+    public long l56794;
+    public long l56795;
+    public long l56796;
+    public long l56797;
+    public long l56798;
+    public long l56799;
+    public long l56800;
+    public long l56801;
+    public long l56802;
+    public long l56803;
+    public long l56804;
+    public long l56805;
+    public long l56806;
+    public long l56807;
+    public long l56808;
+    public long l56809;
+    public long l56810;
+    public long l56811;
+    public long l56812;
+    public long l56813;
+    public long l56814;
+    public long l56815;
+    public long l56816;
+    public long l56817;
+    public long l56818;
+    public long l56819;
+    public long l56820;
+    public long l56821;
+    public long l56822;
+    public long l56823;
+    public long l56824;
+    public long l56825;
+    public long l56826;
+    public long l56827;
+    public long l56828;
+    public long l56829;
+    public long l56830;
+    public long l56831;
+    public long l56832;
+    public long l56833;
+    public long l56834;
+    public long l56835;
+    public long l56836;
+    public long l56837;
+    public long l56838;
+    public long l56839;
+    public long l56840;
+    public long l56841;
+    public long l56842;
+    public long l56843;
+    public long l56844;
+    public long l56845;
+    public long l56846;
+    public long l56847;
+    public long l56848;
+    public long l56849;
+    public long l56850;
+    public long l56851;
+    public long l56852;
+    public long l56853;
+    public long l56854;
+    public long l56855;
+    public long l56856;
+    public long l56857;
+    public long l56858;
+    public long l56859;
+    public long l56860;
+    public long l56861;
+    public long l56862;
+    public long l56863;
+    public long l56864;
+    public long l56865;
+    public long l56866;
+    public long l56867;
+    public long l56868;
+    public long l56869;
+    public long l56870;
+    public long l56871;
+    public long l56872;
+    public long l56873;
+    public long l56874;
+    public long l56875;
+    public long l56876;
+    public long l56877;
+    public long l56878;
+    public long l56879;
+    public long l56880;
+    public long l56881;
+    public long l56882;
+    public long l56883;
+    public long l56884;
+    public long l56885;
+    public long l56886;
+    public long l56887;
+    public long l56888;
+    public long l56889;
+    public long l56890;
+    public long l56891;
+    public long l56892;
+    public long l56893;
+    public long l56894;
+    public long l56895;
+    public long l56896;
+    public long l56897;
+    public long l56898;
+    public long l56899;
+    public long l56900;
+    public long l56901;
+    public long l56902;
+    public long l56903;
+    public long l56904;
+    public long l56905;
+    public long l56906;
+    public long l56907;
+    public long l56908;
+    public long l56909;
+    public long l56910;
+    public long l56911;
+    public long l56912;
+    public long l56913;
+    public long l56914;
+    public long l56915;
+    public long l56916;
+    public long l56917;
+    public long l56918;
+    public long l56919;
+    public long l56920;
+    public long l56921;
+    public long l56922;
+    public long l56923;
+    public long l56924;
+    public long l56925;
+    public long l56926;
+    public long l56927;
+    public long l56928;
+    public long l56929;
+    public long l56930;
+    public long l56931;
+    public long l56932;
+    public long l56933;
+    public long l56934;
+    public long l56935;
+    public long l56936;
+    public long l56937;
+    public long l56938;
+    public long l56939;
+    public long l56940;
+    public long l56941;
+    public long l56942;
+    public long l56943;
+    public long l56944;
+    public long l56945;
+    public long l56946;
+    public long l56947;
+    public long l56948;
+    public long l56949;
+    public long l56950;
+    public long l56951;
+    public long l56952;
+    public long l56953;
+    public long l56954;
+    public long l56955;
+    public long l56956;
+    public long l56957;
+    public long l56958;
+    public long l56959;
+    public long l56960;
+    public long l56961;
+    public long l56962;
+    public long l56963;
+    public long l56964;
+    public long l56965;
+    public long l56966;
+    public long l56967;
+    public long l56968;
+    public long l56969;
+    public long l56970;
+    public long l56971;
+    public long l56972;
+    public long l56973;
+    public long l56974;
+    public long l56975;
+    public long l56976;
+    public long l56977;
+    public long l56978;
+    public long l56979;
+    public long l56980;
+    public long l56981;
+    public long l56982;
+    public long l56983;
+    public long l56984;
+    public long l56985;
+    public long l56986;
+    public long l56987;
+    public long l56988;
+    public long l56989;
+    public long l56990;
+    public long l56991;
+    public long l56992;
+    public long l56993;
+    public long l56994;
+    public long l56995;
+    public long l56996;
+    public long l56997;
+    public long l56998;
+    public long l56999;
+    public long l57000;
+    public long l57001;
+    public long l57002;
+    public long l57003;
+    public long l57004;
+    public long l57005;
+    public long l57006;
+    public long l57007;
+    public long l57008;
+    public long l57009;
+    public long l57010;
+    public long l57011;
+    public long l57012;
+    public long l57013;
+    public long l57014;
+    public long l57015;
+    public long l57016;
+    public long l57017;
+    public long l57018;
+    public long l57019;
+    public long l57020;
+    public long l57021;
+    public long l57022;
+    public long l57023;
+    public long l57024;
+    public long l57025;
+    public long l57026;
+    public long l57027;
+    public long l57028;
+    public long l57029;
+    public long l57030;
+    public long l57031;
+    public long l57032;
+    public long l57033;
+    public long l57034;
+    public long l57035;
+    public long l57036;
+    public long l57037;
+    public long l57038;
+    public long l57039;
+    public long l57040;
+    public long l57041;
+    public long l57042;
+    public long l57043;
+    public long l57044;
+    public long l57045;
+    public long l57046;
+    public long l57047;
+    public long l57048;
+    public long l57049;
+    public long l57050;
+    public long l57051;
+    public long l57052;
+    public long l57053;
+    public long l57054;
+    public long l57055;
+    public long l57056;
+    public long l57057;
+    public long l57058;
+    public long l57059;
+    public long l57060;
+    public long l57061;
+    public long l57062;
+    public long l57063;
+    public long l57064;
+    public long l57065;
+    public long l57066;
+    public long l57067;
+    public long l57068;
+    public long l57069;
+    public long l57070;
+    public long l57071;
+    public long l57072;
+    public long l57073;
+    public long l57074;
+    public long l57075;
+    public long l57076;
+    public long l57077;
+    public long l57078;
+    public long l57079;
+    public long l57080;
+    public long l57081;
+    public long l57082;
+    public long l57083;
+    public long l57084;
+    public long l57085;
+    public long l57086;
+    public long l57087;
+    public long l57088;
+    public long l57089;
+    public long l57090;
+    public long l57091;
+    public long l57092;
+    public long l57093;
+    public long l57094;
+    public long l57095;
+    public long l57096;
+    public long l57097;
+    public long l57098;
+    public long l57099;
+    public long l57100;
+    public long l57101;
+    public long l57102;
+    public long l57103;
+    public long l57104;
+    public long l57105;
+    public long l57106;
+    public long l57107;
+    public long l57108;
+    public long l57109;
+    public long l57110;
+    public long l57111;
+    public long l57112;
+    public long l57113;
+    public long l57114;
+    public long l57115;
+    public long l57116;
+    public long l57117;
+    public long l57118;
+    public long l57119;
+    public long l57120;
+    public long l57121;
+    public long l57122;
+    public long l57123;
+    public long l57124;
+    public long l57125;
+    public long l57126;
+    public long l57127;
+    public long l57128;
+    public long l57129;
+    public long l57130;
+    public long l57131;
+    public long l57132;
+    public long l57133;
+    public long l57134;
+    public long l57135;
+    public long l57136;
+    public long l57137;
+    public long l57138;
+    public long l57139;
+    public long l57140;
+    public long l57141;
+    public long l57142;
+    public long l57143;
+    public long l57144;
+    public long l57145;
+    public long l57146;
+    public long l57147;
+    public long l57148;
+    public long l57149;
+    public long l57150;
+    public long l57151;
+    public long l57152;
+    public long l57153;
+    public long l57154;
+    public long l57155;
+    public long l57156;
+    public long l57157;
+    public long l57158;
+    public long l57159;
+    public long l57160;
+    public long l57161;
+    public long l57162;
+    public long l57163;
+    public long l57164;
+    public long l57165;
+    public long l57166;
+    public long l57167;
+    public long l57168;
+    public long l57169;
+    public long l57170;
+    public long l57171;
+    public long l57172;
+    public long l57173;
+    public long l57174;
+    public long l57175;
+    public long l57176;
+    public long l57177;
+    public long l57178;
+    public long l57179;
+    public long l57180;
+    public long l57181;
+    public long l57182;
+    public long l57183;
+    public long l57184;
+    public long l57185;
+    public long l57186;
+    public long l57187;
+    public long l57188;
+    public long l57189;
+    public long l57190;
+    public long l57191;
+    public long l57192;
+    public long l57193;
+    public long l57194;
+    public long l57195;
+    public long l57196;
+    public long l57197;
+    public long l57198;
+    public long l57199;
+    public long l57200;
+    public long l57201;
+    public long l57202;
+    public long l57203;
+    public long l57204;
+    public long l57205;
+    public long l57206;
+    public long l57207;
+    public long l57208;
+    public long l57209;
+    public long l57210;
+    public long l57211;
+    public long l57212;
+    public long l57213;
+    public long l57214;
+    public long l57215;
+    public long l57216;
+    public long l57217;
+    public long l57218;
+    public long l57219;
+    public long l57220;
+    public long l57221;
+    public long l57222;
+    public long l57223;
+    public long l57224;
+    public long l57225;
+    public long l57226;
+    public long l57227;
+    public long l57228;
+    public long l57229;
+    public long l57230;
+    public long l57231;
+    public long l57232;
+    public long l57233;
+    public long l57234;
+    public long l57235;
+    public long l57236;
+    public long l57237;
+    public long l57238;
+    public long l57239;
+    public long l57240;
+    public long l57241;
+    public long l57242;
+    public long l57243;
+    public long l57244;
+    public long l57245;
+    public long l57246;
+    public long l57247;
+    public long l57248;
+    public long l57249;
+    public long l57250;
+    public long l57251;
+    public long l57252;
+    public long l57253;
+    public long l57254;
+    public long l57255;
+    public long l57256;
+    public long l57257;
+    public long l57258;
+    public long l57259;
+    public long l57260;
+    public long l57261;
+    public long l57262;
+    public long l57263;
+    public long l57264;
+    public long l57265;
+    public long l57266;
+    public long l57267;
+    public long l57268;
+    public long l57269;
+    public long l57270;
+    public long l57271;
+    public long l57272;
+    public long l57273;
+    public long l57274;
+    public long l57275;
+    public long l57276;
+    public long l57277;
+    public long l57278;
+    public long l57279;
+    public long l57280;
+    public long l57281;
+    public long l57282;
+    public long l57283;
+    public long l57284;
+    public long l57285;
+    public long l57286;
+    public long l57287;
+    public long l57288;
+    public long l57289;
+    public long l57290;
+    public long l57291;
+    public long l57292;
+    public long l57293;
+    public long l57294;
+    public long l57295;
+    public long l57296;
+    public long l57297;
+    public long l57298;
+    public long l57299;
+    public long l57300;
+    public long l57301;
+    public long l57302;
+    public long l57303;
+    public long l57304;
+    public long l57305;
+    public long l57306;
+    public long l57307;
+    public long l57308;
+    public long l57309;
+    public long l57310;
+    public long l57311;
+    public long l57312;
+    public long l57313;
+    public long l57314;
+    public long l57315;
+    public long l57316;
+    public long l57317;
+    public long l57318;
+    public long l57319;
+    public long l57320;
+    public long l57321;
+    public long l57322;
+    public long l57323;
+    public long l57324;
+    public long l57325;
+    public long l57326;
+    public long l57327;
+    public long l57328;
+    public long l57329;
+    public long l57330;
+    public long l57331;
+    public long l57332;
+    public long l57333;
+    public long l57334;
+    public long l57335;
+    public long l57336;
+    public long l57337;
+    public long l57338;
+    public long l57339;
+    public long l57340;
+    public long l57341;
+    public long l57342;
+    public long l57343;
+    public long l57344;
+    public long l57345;
+    public long l57346;
+    public long l57347;
+    public long l57348;
+    public long l57349;
+    public long l57350;
+    public long l57351;
+    public long l57352;
+    public long l57353;
+    public long l57354;
+    public long l57355;
+    public long l57356;
+    public long l57357;
+    public long l57358;
+    public long l57359;
+    public long l57360;
+    public long l57361;
+    public long l57362;
+    public long l57363;
+    public long l57364;
+    public long l57365;
+    public long l57366;
+    public long l57367;
+    public long l57368;
+    public long l57369;
+    public long l57370;
+    public long l57371;
+    public long l57372;
+    public long l57373;
+    public long l57374;
+    public long l57375;
+    public long l57376;
+    public long l57377;
+    public long l57378;
+    public long l57379;
+    public long l57380;
+    public long l57381;
+    public long l57382;
+    public long l57383;
+    public long l57384;
+    public long l57385;
+    public long l57386;
+    public long l57387;
+    public long l57388;
+    public long l57389;
+    public long l57390;
+    public long l57391;
+    public long l57392;
+    public long l57393;
+    public long l57394;
+    public long l57395;
+    public long l57396;
+    public long l57397;
+    public long l57398;
+    public long l57399;
+    public long l57400;
+    public long l57401;
+    public long l57402;
+    public long l57403;
+    public long l57404;
+    public long l57405;
+    public long l57406;
+    public long l57407;
+    public long l57408;
+    public long l57409;
+    public long l57410;
+    public long l57411;
+    public long l57412;
+    public long l57413;
+    public long l57414;
+    public long l57415;
+    public long l57416;
+    public long l57417;
+    public long l57418;
+    public long l57419;
+    public long l57420;
+    public long l57421;
+    public long l57422;
+    public long l57423;
+    public long l57424;
+    public long l57425;
+    public long l57426;
+    public long l57427;
+    public long l57428;
+    public long l57429;
+    public long l57430;
+    public long l57431;
+    public long l57432;
+    public long l57433;
+    public long l57434;
+    public long l57435;
+    public long l57436;
+    public long l57437;
+    public long l57438;
+    public long l57439;
+    public long l57440;
+    public long l57441;
+    public long l57442;
+    public long l57443;
+    public long l57444;
+    public long l57445;
+    public long l57446;
+    public long l57447;
+    public long l57448;
+    public long l57449;
+    public long l57450;
+    public long l57451;
+    public long l57452;
+    public long l57453;
+    public long l57454;
+    public long l57455;
+    public long l57456;
+    public long l57457;
+    public long l57458;
+    public long l57459;
+    public long l57460;
+    public long l57461;
+    public long l57462;
+    public long l57463;
+    public long l57464;
+    public long l57465;
+    public long l57466;
+    public long l57467;
+    public long l57468;
+    public long l57469;
+    public long l57470;
+    public long l57471;
+    public long l57472;
+    public long l57473;
+    public long l57474;
+    public long l57475;
+    public long l57476;
+    public long l57477;
+    public long l57478;
+    public long l57479;
+    public long l57480;
+    public long l57481;
+    public long l57482;
+    public long l57483;
+    public long l57484;
+    public long l57485;
+    public long l57486;
+    public long l57487;
+    public long l57488;
+    public long l57489;
+    public long l57490;
+    public long l57491;
+    public long l57492;
+    public long l57493;
+    public long l57494;
+    public long l57495;
+    public long l57496;
+    public long l57497;
+    public long l57498;
+    public long l57499;
+    public long l57500;
+    public long l57501;
+    public long l57502;
+    public long l57503;
+    public long l57504;
+    public long l57505;
+    public long l57506;
+    public long l57507;
+    public long l57508;
+    public long l57509;
+    public long l57510;
+    public long l57511;
+    public long l57512;
+    public long l57513;
+    public long l57514;
+    public long l57515;
+    public long l57516;
+    public long l57517;
+    public long l57518;
+    public long l57519;
+    public long l57520;
+    public long l57521;
+    public long l57522;
+    public long l57523;
+    public long l57524;
+    public long l57525;
+    public long l57526;
+    public long l57527;
+    public long l57528;
+    public long l57529;
+    public long l57530;
+    public long l57531;
+    public long l57532;
+    public long l57533;
+    public long l57534;
+    public long l57535;
+    public long l57536;
+    public long l57537;
+    public long l57538;
+    public long l57539;
+    public long l57540;
+    public long l57541;
+    public long l57542;
+    public long l57543;
+    public long l57544;
+    public long l57545;
+    public long l57546;
+    public long l57547;
+    public long l57548;
+    public long l57549;
+    public long l57550;
+    public long l57551;
+    public long l57552;
+    public long l57553;
+    public long l57554;
+    public long l57555;
+    public long l57556;
+    public long l57557;
+    public long l57558;
+    public long l57559;
+    public long l57560;
+    public long l57561;
+    public long l57562;
+    public long l57563;
+    public long l57564;
+    public long l57565;
+    public long l57566;
+    public long l57567;
+    public long l57568;
+    public long l57569;
+    public long l57570;
+    public long l57571;
+    public long l57572;
+    public long l57573;
+    public long l57574;
+    public long l57575;
+    public long l57576;
+    public long l57577;
+    public long l57578;
+    public long l57579;
+    public long l57580;
+    public long l57581;
+    public long l57582;
+    public long l57583;
+    public long l57584;
+    public long l57585;
+    public long l57586;
+    public long l57587;
+    public long l57588;
+    public long l57589;
+    public long l57590;
+    public long l57591;
+    public long l57592;
+    public long l57593;
+    public long l57594;
+    public long l57595;
+    public long l57596;
+    public long l57597;
+    public long l57598;
+    public long l57599;
+    public long l57600;
+    public long l57601;
+    public long l57602;
+    public long l57603;
+    public long l57604;
+    public long l57605;
+    public long l57606;
+    public long l57607;
+    public long l57608;
+    public long l57609;
+    public long l57610;
+    public long l57611;
+    public long l57612;
+    public long l57613;
+    public long l57614;
+    public long l57615;
+    public long l57616;
+    public long l57617;
+    public long l57618;
+    public long l57619;
+    public long l57620;
+    public long l57621;
+    public long l57622;
+    public long l57623;
+    public long l57624;
+    public long l57625;
+    public long l57626;
+    public long l57627;
+    public long l57628;
+    public long l57629;
+    public long l57630;
+    public long l57631;
+    public long l57632;
+    public long l57633;
+    public long l57634;
+    public long l57635;
+    public long l57636;
+    public long l57637;
+    public long l57638;
+    public long l57639;
+    public long l57640;
+    public long l57641;
+    public long l57642;
+    public long l57643;
+    public long l57644;
+    public long l57645;
+    public long l57646;
+    public long l57647;
+    public long l57648;
+    public long l57649;
+    public long l57650;
+    public long l57651;
+    public long l57652;
+    public long l57653;
+    public long l57654;
+    public long l57655;
+    public long l57656;
+    public long l57657;
+    public long l57658;
+    public long l57659;
+    public long l57660;
+    public long l57661;
+    public long l57662;
+    public long l57663;
+    public long l57664;
+    public long l57665;
+    public long l57666;
+    public long l57667;
+    public long l57668;
+    public long l57669;
+    public long l57670;
+    public long l57671;
+    public long l57672;
+    public long l57673;
+    public long l57674;
+    public long l57675;
+    public long l57676;
+    public long l57677;
+    public long l57678;
+    public long l57679;
+    public long l57680;
+    public long l57681;
+    public long l57682;
+    public long l57683;
+    public long l57684;
+    public long l57685;
+    public long l57686;
+    public long l57687;
+    public long l57688;
+    public long l57689;
+    public long l57690;
+    public long l57691;
+    public long l57692;
+    public long l57693;
+    public long l57694;
+    public long l57695;
+    public long l57696;
+    public long l57697;
+    public long l57698;
+    public long l57699;
+    public long l57700;
+    public long l57701;
+    public long l57702;
+    public long l57703;
+    public long l57704;
+    public long l57705;
+    public long l57706;
+    public long l57707;
+    public long l57708;
+    public long l57709;
+    public long l57710;
+    public long l57711;
+    public long l57712;
+    public long l57713;
+    public long l57714;
+    public long l57715;
+    public long l57716;
+    public long l57717;
+    public long l57718;
+    public long l57719;
+    public long l57720;
+    public long l57721;
+    public long l57722;
+    public long l57723;
+    public long l57724;
+    public long l57725;
+    public long l57726;
+    public long l57727;
+    public long l57728;
+    public long l57729;
+    public long l57730;
+    public long l57731;
+    public long l57732;
+    public long l57733;
+    public long l57734;
+    public long l57735;
+    public long l57736;
+    public long l57737;
+    public long l57738;
+    public long l57739;
+    public long l57740;
+    public long l57741;
+    public long l57742;
+    public long l57743;
+    public long l57744;
+    public long l57745;
+    public long l57746;
+    public long l57747;
+    public long l57748;
+    public long l57749;
+    public long l57750;
+    public long l57751;
+    public long l57752;
+    public long l57753;
+    public long l57754;
+    public long l57755;
+    public long l57756;
+    public long l57757;
+    public long l57758;
+    public long l57759;
+    public long l57760;
+    public long l57761;
+    public long l57762;
+    public long l57763;
+    public long l57764;
+    public long l57765;
+    public long l57766;
+    public long l57767;
+    public long l57768;
+    public long l57769;
+    public long l57770;
+    public long l57771;
+    public long l57772;
+    public long l57773;
+    public long l57774;
+    public long l57775;
+    public long l57776;
+    public long l57777;
+    public long l57778;
+    public long l57779;
+    public long l57780;
+    public long l57781;
+    public long l57782;
+    public long l57783;
+    public long l57784;
+    public long l57785;
+    public long l57786;
+    public long l57787;
+    public long l57788;
+    public long l57789;
+    public long l57790;
+    public long l57791;
+    public long l57792;
+    public long l57793;
+    public long l57794;
+    public long l57795;
+    public long l57796;
+    public long l57797;
+    public long l57798;
+    public long l57799;
+    public long l57800;
+    public long l57801;
+    public long l57802;
+    public long l57803;
+    public long l57804;
+    public long l57805;
+    public long l57806;
+    public long l57807;
+    public long l57808;
+    public long l57809;
+    public long l57810;
+    public long l57811;
+    public long l57812;
+    public long l57813;
+    public long l57814;
+    public long l57815;
+    public long l57816;
+    public long l57817;
+    public long l57818;
+    public long l57819;
+    public long l57820;
+    public long l57821;
+    public long l57822;
+    public long l57823;
+    public long l57824;
+    public long l57825;
+    public long l57826;
+    public long l57827;
+    public long l57828;
+    public long l57829;
+    public long l57830;
+    public long l57831;
+    public long l57832;
+    public long l57833;
+    public long l57834;
+    public long l57835;
+    public long l57836;
+    public long l57837;
+    public long l57838;
+    public long l57839;
+    public long l57840;
+    public long l57841;
+    public long l57842;
+    public long l57843;
+    public long l57844;
+    public long l57845;
+    public long l57846;
+    public long l57847;
+    public long l57848;
+    public long l57849;
+    public long l57850;
+    public long l57851;
+    public long l57852;
+    public long l57853;
+    public long l57854;
+    public long l57855;
+    public long l57856;
+    public long l57857;
+    public long l57858;
+    public long l57859;
+    public long l57860;
+    public long l57861;
+    public long l57862;
+    public long l57863;
+    public long l57864;
+    public long l57865;
+    public long l57866;
+    public long l57867;
+    public long l57868;
+    public long l57869;
+    public long l57870;
+    public long l57871;
+    public long l57872;
+    public long l57873;
+    public long l57874;
+    public long l57875;
+    public long l57876;
+    public long l57877;
+    public long l57878;
+    public long l57879;
+    public long l57880;
+    public long l57881;
+    public long l57882;
+    public long l57883;
+    public long l57884;
+    public long l57885;
+    public long l57886;
+    public long l57887;
+    public long l57888;
+    public long l57889;
+    public long l57890;
+    public long l57891;
+    public long l57892;
+    public long l57893;
+    public long l57894;
+    public long l57895;
+    public long l57896;
+    public long l57897;
+    public long l57898;
+    public long l57899;
+    public long l57900;
+    public long l57901;
+    public long l57902;
+    public long l57903;
+    public long l57904;
+    public long l57905;
+    public long l57906;
+    public long l57907;
+    public long l57908;
+    public long l57909;
+    public long l57910;
+    public long l57911;
+    public long l57912;
+    public long l57913;
+    public long l57914;
+    public long l57915;
+    public long l57916;
+    public long l57917;
+    public long l57918;
+    public long l57919;
+    public long l57920;
+    public long l57921;
+    public long l57922;
+    public long l57923;
+    public long l57924;
+    public long l57925;
+    public long l57926;
+    public long l57927;
+    public long l57928;
+    public long l57929;
+    public long l57930;
+    public long l57931;
+    public long l57932;
+    public long l57933;
+    public long l57934;
+    public long l57935;
+    public long l57936;
+    public long l57937;
+    public long l57938;
+    public long l57939;
+    public long l57940;
+    public long l57941;
+    public long l57942;
+    public long l57943;
+    public long l57944;
+    public long l57945;
+    public long l57946;
+    public long l57947;
+    public long l57948;
+    public long l57949;
+    public long l57950;
+    public long l57951;
+    public long l57952;
+    public long l57953;
+    public long l57954;
+    public long l57955;
+    public long l57956;
+    public long l57957;
+    public long l57958;
+    public long l57959;
+    public long l57960;
+    public long l57961;
+    public long l57962;
+    public long l57963;
+    public long l57964;
+    public long l57965;
+    public long l57966;
+    public long l57967;
+    public long l57968;
+    public long l57969;
+    public long l57970;
+    public long l57971;
+    public long l57972;
+    public long l57973;
+    public long l57974;
+    public long l57975;
+    public long l57976;
+    public long l57977;
+    public long l57978;
+    public long l57979;
+    public long l57980;
+    public long l57981;
+    public long l57982;
+    public long l57983;
+    public long l57984;
+    public long l57985;
+    public long l57986;
+    public long l57987;
+    public long l57988;
+    public long l57989;
+    public long l57990;
+    public long l57991;
+    public long l57992;
+    public long l57993;
+    public long l57994;
+    public long l57995;
+    public long l57996;
+    public long l57997;
+    public long l57998;
+    public long l57999;
+    public long l58000;
+    public long l58001;
+    public long l58002;
+    public long l58003;
+    public long l58004;
+    public long l58005;
+    public long l58006;
+    public long l58007;
+    public long l58008;
+    public long l58009;
+    public long l58010;
+    public long l58011;
+    public long l58012;
+    public long l58013;
+    public long l58014;
+    public long l58015;
+    public long l58016;
+    public long l58017;
+    public long l58018;
+    public long l58019;
+    public long l58020;
+    public long l58021;
+    public long l58022;
+    public long l58023;
+    public long l58024;
+    public long l58025;
+    public long l58026;
+    public long l58027;
+    public long l58028;
+    public long l58029;
+    public long l58030;
+    public long l58031;
+    public long l58032;
+    public long l58033;
+    public long l58034;
+    public long l58035;
+    public long l58036;
+    public long l58037;
+    public long l58038;
+    public long l58039;
+    public long l58040;
+    public long l58041;
+    public long l58042;
+    public long l58043;
+    public long l58044;
+    public long l58045;
+    public long l58046;
+    public long l58047;
+    public long l58048;
+    public long l58049;
+    public long l58050;
+    public long l58051;
+    public long l58052;
+    public long l58053;
+    public long l58054;
+    public long l58055;
+    public long l58056;
+    public long l58057;
+    public long l58058;
+    public long l58059;
+    public long l58060;
+    public long l58061;
+    public long l58062;
+    public long l58063;
+    public long l58064;
+    public long l58065;
+    public long l58066;
+    public long l58067;
+    public long l58068;
+    public long l58069;
+    public long l58070;
+    public long l58071;
+    public long l58072;
+    public long l58073;
+    public long l58074;
+    public long l58075;
+    public long l58076;
+    public long l58077;
+    public long l58078;
+    public long l58079;
+    public long l58080;
+    public long l58081;
+    public long l58082;
+    public long l58083;
+    public long l58084;
+    public long l58085;
+    public long l58086;
+    public long l58087;
+    public long l58088;
+    public long l58089;
+    public long l58090;
+    public long l58091;
+    public long l58092;
+    public long l58093;
+    public long l58094;
+    public long l58095;
+    public long l58096;
+    public long l58097;
+    public long l58098;
+    public long l58099;
+    public long l58100;
+    public long l58101;
+    public long l58102;
+    public long l58103;
+    public long l58104;
+    public long l58105;
+    public long l58106;
+    public long l58107;
+    public long l58108;
+    public long l58109;
+    public long l58110;
+    public long l58111;
+    public long l58112;
+    public long l58113;
+    public long l58114;
+    public long l58115;
+    public long l58116;
+    public long l58117;
+    public long l58118;
+    public long l58119;
+    public long l58120;
+    public long l58121;
+    public long l58122;
+    public long l58123;
+    public long l58124;
+    public long l58125;
+    public long l58126;
+    public long l58127;
+    public long l58128;
+    public long l58129;
+    public long l58130;
+    public long l58131;
+    public long l58132;
+    public long l58133;
+    public long l58134;
+    public long l58135;
+    public long l58136;
+    public long l58137;
+    public long l58138;
+    public long l58139;
+    public long l58140;
+    public long l58141;
+    public long l58142;
+    public long l58143;
+    public long l58144;
+    public long l58145;
+    public long l58146;
+    public long l58147;
+    public long l58148;
+    public long l58149;
+    public long l58150;
+    public long l58151;
+    public long l58152;
+    public long l58153;
+    public long l58154;
+    public long l58155;
+    public long l58156;
+    public long l58157;
+    public long l58158;
+    public long l58159;
+    public long l58160;
+    public long l58161;
+    public long l58162;
+    public long l58163;
+    public long l58164;
+    public long l58165;
+    public long l58166;
+    public long l58167;
+    public long l58168;
+    public long l58169;
+    public long l58170;
+    public long l58171;
+    public long l58172;
+    public long l58173;
+    public long l58174;
+    public long l58175;
+    public long l58176;
+    public long l58177;
+    public long l58178;
+    public long l58179;
+    public long l58180;
+    public long l58181;
+    public long l58182;
+    public long l58183;
+    public long l58184;
+    public long l58185;
+    public long l58186;
+    public long l58187;
+    public long l58188;
+    public long l58189;
+    public long l58190;
+    public long l58191;
+    public long l58192;
+    public long l58193;
+    public long l58194;
+    public long l58195;
+    public long l58196;
+    public long l58197;
+    public long l58198;
+    public long l58199;
+    public long l58200;
+    public long l58201;
+    public long l58202;
+    public long l58203;
+    public long l58204;
+    public long l58205;
+    public long l58206;
+    public long l58207;
+    public long l58208;
+    public long l58209;
+    public long l58210;
+    public long l58211;
+    public long l58212;
+    public long l58213;
+    public long l58214;
+    public long l58215;
+    public long l58216;
+    public long l58217;
+    public long l58218;
+    public long l58219;
+    public long l58220;
+    public long l58221;
+    public long l58222;
+    public long l58223;
+    public long l58224;
+    public long l58225;
+    public long l58226;
+    public long l58227;
+    public long l58228;
+    public long l58229;
+    public long l58230;
+    public long l58231;
+    public long l58232;
+    public long l58233;
+    public long l58234;
+    public long l58235;
+    public long l58236;
+    public long l58237;
+    public long l58238;
+    public long l58239;
+    public long l58240;
+    public long l58241;
+    public long l58242;
+    public long l58243;
+    public long l58244;
+    public long l58245;
+    public long l58246;
+    public long l58247;
+    public long l58248;
+    public long l58249;
+    public long l58250;
+    public long l58251;
+    public long l58252;
+    public long l58253;
+    public long l58254;
+    public long l58255;
+    public long l58256;
+    public long l58257;
+    public long l58258;
+    public long l58259;
+    public long l58260;
+    public long l58261;
+    public long l58262;
+    public long l58263;
+    public long l58264;
+    public long l58265;
+    public long l58266;
+    public long l58267;
+    public long l58268;
+    public long l58269;
+    public long l58270;
+    public long l58271;
+    public long l58272;
+    public long l58273;
+    public long l58274;
+    public long l58275;
+    public long l58276;
+    public long l58277;
+    public long l58278;
+    public long l58279;
+    public long l58280;
+    public long l58281;
+    public long l58282;
+    public long l58283;
+    public long l58284;
+    public long l58285;
+    public long l58286;
+    public long l58287;
+    public long l58288;
+    public long l58289;
+    public long l58290;
+    public long l58291;
+    public long l58292;
+    public long l58293;
+    public long l58294;
+    public long l58295;
+    public long l58296;
+    public long l58297;
+    public long l58298;
+    public long l58299;
+    public long l58300;
+    public long l58301;
+    public long l58302;
+    public long l58303;
+    public long l58304;
+    public long l58305;
+    public long l58306;
+    public long l58307;
+    public long l58308;
+    public long l58309;
+    public long l58310;
+    public long l58311;
+    public long l58312;
+    public long l58313;
+    public long l58314;
+    public long l58315;
+    public long l58316;
+    public long l58317;
+    public long l58318;
+    public long l58319;
+    public long l58320;
+    public long l58321;
+    public long l58322;
+    public long l58323;
+    public long l58324;
+    public long l58325;
+    public long l58326;
+    public long l58327;
+    public long l58328;
+    public long l58329;
+    public long l58330;
+    public long l58331;
+    public long l58332;
+    public long l58333;
+    public long l58334;
+    public long l58335;
+    public long l58336;
+    public long l58337;
+    public long l58338;
+    public long l58339;
+    public long l58340;
+    public long l58341;
+    public long l58342;
+    public long l58343;
+    public long l58344;
+    public long l58345;
+    public long l58346;
+    public long l58347;
+    public long l58348;
+    public long l58349;
+    public long l58350;
+    public long l58351;
+    public long l58352;
+    public long l58353;
+    public long l58354;
+    public long l58355;
+    public long l58356;
+    public long l58357;
+    public long l58358;
+    public long l58359;
+    public long l58360;
+    public long l58361;
+    public long l58362;
+    public long l58363;
+    public long l58364;
+    public long l58365;
+    public long l58366;
+    public long l58367;
+    public long l58368;
+    public long l58369;
+    public long l58370;
+    public long l58371;
+    public long l58372;
+    public long l58373;
+    public long l58374;
+    public long l58375;
+    public long l58376;
+    public long l58377;
+    public long l58378;
+    public long l58379;
+    public long l58380;
+    public long l58381;
+    public long l58382;
+    public long l58383;
+    public long l58384;
+    public long l58385;
+    public long l58386;
+    public long l58387;
+    public long l58388;
+    public long l58389;
+    public long l58390;
+    public long l58391;
+    public long l58392;
+    public long l58393;
+    public long l58394;
+    public long l58395;
+    public long l58396;
+    public long l58397;
+    public long l58398;
+    public long l58399;
+    public long l58400;
+    public long l58401;
+    public long l58402;
+    public long l58403;
+    public long l58404;
+    public long l58405;
+    public long l58406;
+    public long l58407;
+    public long l58408;
+    public long l58409;
+    public long l58410;
+    public long l58411;
+    public long l58412;
+    public long l58413;
+    public long l58414;
+    public long l58415;
+    public long l58416;
+    public long l58417;
+    public long l58418;
+    public long l58419;
+    public long l58420;
+    public long l58421;
+    public long l58422;
+    public long l58423;
+    public long l58424;
+    public long l58425;
+    public long l58426;
+    public long l58427;
+    public long l58428;
+    public long l58429;
+    public long l58430;
+    public long l58431;
+    public long l58432;
+    public long l58433;
+    public long l58434;
+    public long l58435;
+    public long l58436;
+    public long l58437;
+    public long l58438;
+    public long l58439;
+    public long l58440;
+    public long l58441;
+    public long l58442;
+    public long l58443;
+    public long l58444;
+    public long l58445;
+    public long l58446;
+    public long l58447;
+    public long l58448;
+    public long l58449;
+    public long l58450;
+    public long l58451;
+    public long l58452;
+    public long l58453;
+    public long l58454;
+    public long l58455;
+    public long l58456;
+    public long l58457;
+    public long l58458;
+    public long l58459;
+    public long l58460;
+    public long l58461;
+    public long l58462;
+    public long l58463;
+    public long l58464;
+    public long l58465;
+    public long l58466;
+    public long l58467;
+    public long l58468;
+    public long l58469;
+    public long l58470;
+    public long l58471;
+    public long l58472;
+    public long l58473;
+    public long l58474;
+    public long l58475;
+    public long l58476;
+    public long l58477;
+    public long l58478;
+    public long l58479;
+    public long l58480;
+    public long l58481;
+    public long l58482;
+    public long l58483;
+    public long l58484;
+    public long l58485;
+    public long l58486;
+    public long l58487;
+    public long l58488;
+    public long l58489;
+    public long l58490;
+    public long l58491;
+    public long l58492;
+    public long l58493;
+    public long l58494;
+    public long l58495;
+    public long l58496;
+    public long l58497;
+    public long l58498;
+    public long l58499;
+    public long l58500;
+    public long l58501;
+    public long l58502;
+    public long l58503;
+    public long l58504;
+    public long l58505;
+    public long l58506;
+    public long l58507;
+    public long l58508;
+    public long l58509;
+    public long l58510;
+    public long l58511;
+    public long l58512;
+    public long l58513;
+    public long l58514;
+    public long l58515;
+    public long l58516;
+    public long l58517;
+    public long l58518;
+    public long l58519;
+    public long l58520;
+    public long l58521;
+    public long l58522;
+    public long l58523;
+    public long l58524;
+    public long l58525;
+    public long l58526;
+    public long l58527;
+    public long l58528;
+    public long l58529;
+    public long l58530;
+    public long l58531;
+    public long l58532;
+    public long l58533;
+    public long l58534;
+    public long l58535;
+    public long l58536;
+    public long l58537;
+    public long l58538;
+    public long l58539;
+    public long l58540;
+    public long l58541;
+    public long l58542;
+    public long l58543;
+    public long l58544;
+    public long l58545;
+    public long l58546;
+    public long l58547;
+    public long l58548;
+    public long l58549;
+    public long l58550;
+    public long l58551;
+    public long l58552;
+    public long l58553;
+    public long l58554;
+    public long l58555;
+    public long l58556;
+    public long l58557;
+    public long l58558;
+    public long l58559;
+    public long l58560;
+    public long l58561;
+    public long l58562;
+    public long l58563;
+    public long l58564;
+    public long l58565;
+    public long l58566;
+    public long l58567;
+    public long l58568;
+    public long l58569;
+    public long l58570;
+    public long l58571;
+    public long l58572;
+    public long l58573;
+    public long l58574;
+    public long l58575;
+    public long l58576;
+    public long l58577;
+    public long l58578;
+    public long l58579;
+    public long l58580;
+    public long l58581;
+    public long l58582;
+    public long l58583;
+    public long l58584;
+    public long l58585;
+    public long l58586;
+    public long l58587;
+    public long l58588;
+    public long l58589;
+    public long l58590;
+    public long l58591;
+    public long l58592;
+    public long l58593;
+    public long l58594;
+    public long l58595;
+    public long l58596;
+    public long l58597;
+    public long l58598;
+    public long l58599;
+    public long l58600;
+    public long l58601;
+    public long l58602;
+    public long l58603;
+    public long l58604;
+    public long l58605;
+    public long l58606;
+    public long l58607;
+    public long l58608;
+    public long l58609;
+    public long l58610;
+    public long l58611;
+    public long l58612;
+    public long l58613;
+    public long l58614;
+    public long l58615;
+    public long l58616;
+    public long l58617;
+    public long l58618;
+    public long l58619;
+    public long l58620;
+    public long l58621;
+    public long l58622;
+    public long l58623;
+    public long l58624;
+    public long l58625;
+    public long l58626;
+    public long l58627;
+    public long l58628;
+    public long l58629;
+    public long l58630;
+    public long l58631;
+    public long l58632;
+    public long l58633;
+    public long l58634;
+    public long l58635;
+    public long l58636;
+    public long l58637;
+    public long l58638;
+    public long l58639;
+    public long l58640;
+    public long l58641;
+    public long l58642;
+    public long l58643;
+    public long l58644;
+    public long l58645;
+    public long l58646;
+    public long l58647;
+    public long l58648;
+    public long l58649;
+    public long l58650;
+    public long l58651;
+    public long l58652;
+    public long l58653;
+    public long l58654;
+    public long l58655;
+    public long l58656;
+    public long l58657;
+    public long l58658;
+    public long l58659;
+    public long l58660;
+    public long l58661;
+    public long l58662;
+    public long l58663;
+    public long l58664;
+    public long l58665;
+    public long l58666;
+    public long l58667;
+    public long l58668;
+    public long l58669;
+    public long l58670;
+    public long l58671;
+    public long l58672;
+    public long l58673;
+    public long l58674;
+    public long l58675;
+    public long l58676;
+    public long l58677;
+    public long l58678;
+    public long l58679;
+    public long l58680;
+    public long l58681;
+    public long l58682;
+    public long l58683;
+    public long l58684;
+    public long l58685;
+    public long l58686;
+    public long l58687;
+    public long l58688;
+    public long l58689;
+    public long l58690;
+    public long l58691;
+    public long l58692;
+    public long l58693;
+    public long l58694;
+    public long l58695;
+    public long l58696;
+    public long l58697;
+    public long l58698;
+    public long l58699;
+    public long l58700;
+    public long l58701;
+    public long l58702;
+    public long l58703;
+    public long l58704;
+    public long l58705;
+    public long l58706;
+    public long l58707;
+    public long l58708;
+    public long l58709;
+    public long l58710;
+    public long l58711;
+    public long l58712;
+    public long l58713;
+    public long l58714;
+    public long l58715;
+    public long l58716;
+    public long l58717;
+    public long l58718;
+    public long l58719;
+    public long l58720;
+    public long l58721;
+    public long l58722;
+    public long l58723;
+    public long l58724;
+    public long l58725;
+    public long l58726;
+    public long l58727;
+    public long l58728;
+    public long l58729;
+    public long l58730;
+    public long l58731;
+    public long l58732;
+    public long l58733;
+    public long l58734;
+    public long l58735;
+    public long l58736;
+    public long l58737;
+    public long l58738;
+    public long l58739;
+    public long l58740;
+    public long l58741;
+    public long l58742;
+    public long l58743;
+    public long l58744;
+    public long l58745;
+    public long l58746;
+    public long l58747;
+    public long l58748;
+    public long l58749;
+    public long l58750;
+    public long l58751;
+    public long l58752;
+    public long l58753;
+    public long l58754;
+    public long l58755;
+    public long l58756;
+    public long l58757;
+    public long l58758;
+    public long l58759;
+    public long l58760;
+    public long l58761;
+    public long l58762;
+    public long l58763;
+    public long l58764;
+    public long l58765;
+    public long l58766;
+    public long l58767;
+    public long l58768;
+    public long l58769;
+    public long l58770;
+    public long l58771;
+    public long l58772;
+    public long l58773;
+    public long l58774;
+    public long l58775;
+    public long l58776;
+    public long l58777;
+    public long l58778;
+    public long l58779;
+    public long l58780;
+    public long l58781;
+    public long l58782;
+    public long l58783;
+    public long l58784;
+    public long l58785;
+    public long l58786;
+    public long l58787;
+    public long l58788;
+    public long l58789;
+    public long l58790;
+    public long l58791;
+    public long l58792;
+    public long l58793;
+    public long l58794;
+    public long l58795;
+    public long l58796;
+    public long l58797;
+    public long l58798;
+    public long l58799;
+    public long l58800;
+    public long l58801;
+    public long l58802;
+    public long l58803;
+    public long l58804;
+    public long l58805;
+    public long l58806;
+    public long l58807;
+    public long l58808;
+    public long l58809;
+    public long l58810;
+    public long l58811;
+    public long l58812;
+    public long l58813;
+    public long l58814;
+    public long l58815;
+    public long l58816;
+    public long l58817;
+    public long l58818;
+    public long l58819;
+    public long l58820;
+    public long l58821;
+    public long l58822;
+    public long l58823;
+    public long l58824;
+    public long l58825;
+    public long l58826;
+    public long l58827;
+    public long l58828;
+    public long l58829;
+    public long l58830;
+    public long l58831;
+    public long l58832;
+    public long l58833;
+    public long l58834;
+    public long l58835;
+    public long l58836;
+    public long l58837;
+    public long l58838;
+    public long l58839;
+    public long l58840;
+    public long l58841;
+    public long l58842;
+    public long l58843;
+    public long l58844;
+    public long l58845;
+    public long l58846;
+    public long l58847;
+    public long l58848;
+    public long l58849;
+    public long l58850;
+    public long l58851;
+    public long l58852;
+    public long l58853;
+    public long l58854;
+    public long l58855;
+    public long l58856;
+    public long l58857;
+    public long l58858;
+    public long l58859;
+    public long l58860;
+    public long l58861;
+    public long l58862;
+    public long l58863;
+    public long l58864;
+    public long l58865;
+    public long l58866;
+    public long l58867;
+    public long l58868;
+    public long l58869;
+    public long l58870;
+    public long l58871;
+    public long l58872;
+    public long l58873;
+    public long l58874;
+    public long l58875;
+    public long l58876;
+    public long l58877;
+    public long l58878;
+    public long l58879;
+    public long l58880;
+    public long l58881;
+    public long l58882;
+    public long l58883;
+    public long l58884;
+    public long l58885;
+    public long l58886;
+    public long l58887;
+    public long l58888;
+    public long l58889;
+    public long l58890;
+    public long l58891;
+    public long l58892;
+    public long l58893;
+    public long l58894;
+    public long l58895;
+    public long l58896;
+    public long l58897;
+    public long l58898;
+    public long l58899;
+    public long l58900;
+    public long l58901;
+    public long l58902;
+    public long l58903;
+    public long l58904;
+    public long l58905;
+    public long l58906;
+    public long l58907;
+    public long l58908;
+    public long l58909;
+    public long l58910;
+    public long l58911;
+    public long l58912;
+    public long l58913;
+    public long l58914;
+    public long l58915;
+    public long l58916;
+    public long l58917;
+    public long l58918;
+    public long l58919;
+    public long l58920;
+    public long l58921;
+    public long l58922;
+    public long l58923;
+    public long l58924;
+    public long l58925;
+    public long l58926;
+    public long l58927;
+    public long l58928;
+    public long l58929;
+    public long l58930;
+    public long l58931;
+    public long l58932;
+    public long l58933;
+    public long l58934;
+    public long l58935;
+    public long l58936;
+    public long l58937;
+    public long l58938;
+    public long l58939;
+    public long l58940;
+    public long l58941;
+    public long l58942;
+    public long l58943;
+    public long l58944;
+    public long l58945;
+    public long l58946;
+    public long l58947;
+    public long l58948;
+    public long l58949;
+    public long l58950;
+    public long l58951;
+    public long l58952;
+    public long l58953;
+    public long l58954;
+    public long l58955;
+    public long l58956;
+    public long l58957;
+    public long l58958;
+    public long l58959;
+    public long l58960;
+    public long l58961;
+    public long l58962;
+    public long l58963;
+    public long l58964;
+    public long l58965;
+    public long l58966;
+    public long l58967;
+    public long l58968;
+    public long l58969;
+    public long l58970;
+    public long l58971;
+    public long l58972;
+    public long l58973;
+    public long l58974;
+    public long l58975;
+    public long l58976;
+    public long l58977;
+    public long l58978;
+    public long l58979;
+    public long l58980;
+    public long l58981;
+    public long l58982;
+    public long l58983;
+    public long l58984;
+    public long l58985;
+    public long l58986;
+    public long l58987;
+    public long l58988;
+    public long l58989;
+    public long l58990;
+    public long l58991;
+    public long l58992;
+    public long l58993;
+    public long l58994;
+    public long l58995;
+    public long l58996;
+    public long l58997;
+    public long l58998;
+    public long l58999;
+    public long l59000;
+    public long l59001;
+    public long l59002;
+    public long l59003;
+    public long l59004;
+    public long l59005;
+    public long l59006;
+    public long l59007;
+    public long l59008;
+    public long l59009;
+    public long l59010;
+    public long l59011;
+    public long l59012;
+    public long l59013;
+    public long l59014;
+    public long l59015;
+    public long l59016;
+    public long l59017;
+    public long l59018;
+    public long l59019;
+    public long l59020;
+    public long l59021;
+    public long l59022;
+    public long l59023;
+    public long l59024;
+    public long l59025;
+    public long l59026;
+    public long l59027;
+    public long l59028;
+    public long l59029;
+    public long l59030;
+    public long l59031;
+    public long l59032;
+    public long l59033;
+    public long l59034;
+    public long l59035;
+    public long l59036;
+    public long l59037;
+    public long l59038;
+    public long l59039;
+    public long l59040;
+    public long l59041;
+    public long l59042;
+    public long l59043;
+    public long l59044;
+    public long l59045;
+    public long l59046;
+    public long l59047;
+    public long l59048;
+    public long l59049;
+    public long l59050;
+    public long l59051;
+    public long l59052;
+    public long l59053;
+    public long l59054;
+    public long l59055;
+    public long l59056;
+    public long l59057;
+    public long l59058;
+    public long l59059;
+    public long l59060;
+    public long l59061;
+    public long l59062;
+    public long l59063;
+    public long l59064;
+    public long l59065;
+    public long l59066;
+    public long l59067;
+    public long l59068;
+    public long l59069;
+    public long l59070;
+    public long l59071;
+    public long l59072;
+    public long l59073;
+    public long l59074;
+    public long l59075;
+    public long l59076;
+    public long l59077;
+    public long l59078;
+    public long l59079;
+    public long l59080;
+    public long l59081;
+    public long l59082;
+    public long l59083;
+    public long l59084;
+    public long l59085;
+    public long l59086;
+    public long l59087;
+    public long l59088;
+    public long l59089;
+    public long l59090;
+    public long l59091;
+    public long l59092;
+    public long l59093;
+    public long l59094;
+    public long l59095;
+    public long l59096;
+    public long l59097;
+    public long l59098;
+    public long l59099;
+    public long l59100;
+    public long l59101;
+    public long l59102;
+    public long l59103;
+    public long l59104;
+    public long l59105;
+    public long l59106;
+    public long l59107;
+    public long l59108;
+    public long l59109;
+    public long l59110;
+    public long l59111;
+    public long l59112;
+    public long l59113;
+    public long l59114;
+    public long l59115;
+    public long l59116;
+    public long l59117;
+    public long l59118;
+    public long l59119;
+    public long l59120;
+    public long l59121;
+    public long l59122;
+    public long l59123;
+    public long l59124;
+    public long l59125;
+    public long l59126;
+    public long l59127;
+    public long l59128;
+    public long l59129;
+    public long l59130;
+    public long l59131;
+    public long l59132;
+    public long l59133;
+    public long l59134;
+    public long l59135;
+    public long l59136;
+    public long l59137;
+    public long l59138;
+    public long l59139;
+    public long l59140;
+    public long l59141;
+    public long l59142;
+    public long l59143;
+    public long l59144;
+    public long l59145;
+    public long l59146;
+    public long l59147;
+    public long l59148;
+    public long l59149;
+    public long l59150;
+    public long l59151;
+    public long l59152;
+    public long l59153;
+    public long l59154;
+    public long l59155;
+    public long l59156;
+    public long l59157;
+    public long l59158;
+    public long l59159;
+    public long l59160;
+    public long l59161;
+    public long l59162;
+    public long l59163;
+    public long l59164;
+    public long l59165;
+    public long l59166;
+    public long l59167;
+    public long l59168;
+    public long l59169;
+    public long l59170;
+    public long l59171;
+    public long l59172;
+    public long l59173;
+    public long l59174;
+    public long l59175;
+    public long l59176;
+    public long l59177;
+    public long l59178;
+    public long l59179;
+    public long l59180;
+    public long l59181;
+    public long l59182;
+    public long l59183;
+    public long l59184;
+    public long l59185;
+    public long l59186;
+    public long l59187;
+    public long l59188;
+    public long l59189;
+    public long l59190;
+    public long l59191;
+    public long l59192;
+    public long l59193;
+    public long l59194;
+    public long l59195;
+    public long l59196;
+    public long l59197;
+    public long l59198;
+    public long l59199;
+    public long l59200;
+    public long l59201;
+    public long l59202;
+    public long l59203;
+    public long l59204;
+    public long l59205;
+    public long l59206;
+    public long l59207;
+    public long l59208;
+    public long l59209;
+    public long l59210;
+    public long l59211;
+    public long l59212;
+    public long l59213;
+    public long l59214;
+    public long l59215;
+    public long l59216;
+    public long l59217;
+    public long l59218;
+    public long l59219;
+    public long l59220;
+    public long l59221;
+    public long l59222;
+    public long l59223;
+    public long l59224;
+    public long l59225;
+    public long l59226;
+    public long l59227;
+    public long l59228;
+    public long l59229;
+    public long l59230;
+    public long l59231;
+    public long l59232;
+    public long l59233;
+    public long l59234;
+    public long l59235;
+    public long l59236;
+    public long l59237;
+    public long l59238;
+    public long l59239;
+    public long l59240;
+    public long l59241;
+    public long l59242;
+    public long l59243;
+    public long l59244;
+    public long l59245;
+    public long l59246;
+    public long l59247;
+    public long l59248;
+    public long l59249;
+    public long l59250;
+    public long l59251;
+    public long l59252;
+    public long l59253;
+    public long l59254;
+    public long l59255;
+    public long l59256;
+    public long l59257;
+    public long l59258;
+    public long l59259;
+    public long l59260;
+    public long l59261;
+    public long l59262;
+    public long l59263;
+    public long l59264;
+    public long l59265;
+    public long l59266;
+    public long l59267;
+    public long l59268;
+    public long l59269;
+    public long l59270;
+    public long l59271;
+    public long l59272;
+    public long l59273;
+    public long l59274;
+    public long l59275;
+    public long l59276;
+    public long l59277;
+    public long l59278;
+    public long l59279;
+    public long l59280;
+    public long l59281;
+    public long l59282;
+    public long l59283;
+    public long l59284;
+    public long l59285;
+    public long l59286;
+    public long l59287;
+    public long l59288;
+    public long l59289;
+    public long l59290;
+    public long l59291;
+    public long l59292;
+    public long l59293;
+    public long l59294;
+    public long l59295;
+    public long l59296;
+    public long l59297;
+    public long l59298;
+    public long l59299;
+    public long l59300;
+    public long l59301;
+    public long l59302;
+    public long l59303;
+    public long l59304;
+    public long l59305;
+    public long l59306;
+    public long l59307;
+    public long l59308;
+    public long l59309;
+    public long l59310;
+    public long l59311;
+    public long l59312;
+    public long l59313;
+    public long l59314;
+    public long l59315;
+    public long l59316;
+    public long l59317;
+    public long l59318;
+    public long l59319;
+    public long l59320;
+    public long l59321;
+    public long l59322;
+    public long l59323;
+    public long l59324;
+    public long l59325;
+    public long l59326;
+    public long l59327;
+    public long l59328;
+    public long l59329;
+    public long l59330;
+    public long l59331;
+    public long l59332;
+    public long l59333;
+    public long l59334;
+    public long l59335;
+    public long l59336;
+    public long l59337;
+    public long l59338;
+    public long l59339;
+    public long l59340;
+    public long l59341;
+    public long l59342;
+    public long l59343;
+    public long l59344;
+    public long l59345;
+    public long l59346;
+    public long l59347;
+    public long l59348;
+    public long l59349;
+    public long l59350;
+    public long l59351;
+    public long l59352;
+    public long l59353;
+    public long l59354;
+    public long l59355;
+    public long l59356;
+    public long l59357;
+    public long l59358;
+    public long l59359;
+    public long l59360;
+    public long l59361;
+    public long l59362;
+    public long l59363;
+    public long l59364;
+    public long l59365;
+    public long l59366;
+    public long l59367;
+    public long l59368;
+    public long l59369;
+    public long l59370;
+    public long l59371;
+    public long l59372;
+    public long l59373;
+    public long l59374;
+    public long l59375;
+    public long l59376;
+    public long l59377;
+    public long l59378;
+    public long l59379;
+    public long l59380;
+    public long l59381;
+    public long l59382;
+    public long l59383;
+    public long l59384;
+    public long l59385;
+    public long l59386;
+    public long l59387;
+    public long l59388;
+    public long l59389;
+    public long l59390;
+    public long l59391;
+    public long l59392;
+    public long l59393;
+    public long l59394;
+    public long l59395;
+    public long l59396;
+    public long l59397;
+    public long l59398;
+    public long l59399;
+    public long l59400;
+    public long l59401;
+    public long l59402;
+    public long l59403;
+    public long l59404;
+    public long l59405;
+    public long l59406;
+    public long l59407;
+    public long l59408;
+    public long l59409;
+    public long l59410;
+    public long l59411;
+    public long l59412;
+    public long l59413;
+    public long l59414;
+    public long l59415;
+    public long l59416;
+    public long l59417;
+    public long l59418;
+    public long l59419;
+    public long l59420;
+    public long l59421;
+    public long l59422;
+    public long l59423;
+    public long l59424;
+    public long l59425;
+    public long l59426;
+    public long l59427;
+    public long l59428;
+    public long l59429;
+    public long l59430;
+    public long l59431;
+    public long l59432;
+    public long l59433;
+    public long l59434;
+    public long l59435;
+    public long l59436;
+    public long l59437;
+    public long l59438;
+    public long l59439;
+    public long l59440;
+    public long l59441;
+    public long l59442;
+    public long l59443;
+    public long l59444;
+    public long l59445;
+    public long l59446;
+    public long l59447;
+    public long l59448;
+    public long l59449;
+    public long l59450;
+    public long l59451;
+    public long l59452;
+    public long l59453;
+    public long l59454;
+    public long l59455;
+    public long l59456;
+    public long l59457;
+    public long l59458;
+    public long l59459;
+    public long l59460;
+    public long l59461;
+    public long l59462;
+    public long l59463;
+    public long l59464;
+    public long l59465;
+    public long l59466;
+    public long l59467;
+    public long l59468;
+    public long l59469;
+    public long l59470;
+    public long l59471;
+    public long l59472;
+    public long l59473;
+    public long l59474;
+    public long l59475;
+    public long l59476;
+    public long l59477;
+    public long l59478;
+    public long l59479;
+    public long l59480;
+    public long l59481;
+    public long l59482;
+    public long l59483;
+    public long l59484;
+    public long l59485;
+    public long l59486;
+    public long l59487;
+    public long l59488;
+    public long l59489;
+    public long l59490;
+    public long l59491;
+    public long l59492;
+    public long l59493;
+    public long l59494;
+    public long l59495;
+    public long l59496;
+    public long l59497;
+    public long l59498;
+    public long l59499;
+    public long l59500;
+    public long l59501;
+    public long l59502;
+    public long l59503;
+    public long l59504;
+    public long l59505;
+    public long l59506;
+    public long l59507;
+    public long l59508;
+    public long l59509;
+    public long l59510;
+    public long l59511;
+    public long l59512;
+    public long l59513;
+    public long l59514;
+    public long l59515;
+    public long l59516;
+    public long l59517;
+    public long l59518;
+    public long l59519;
+    public long l59520;
+    public long l59521;
+    public long l59522;
+    public long l59523;
+    public long l59524;
+    public long l59525;
+    public long l59526;
+    public long l59527;
+    public long l59528;
+    public long l59529;
+    public long l59530;
+    public long l59531;
+    public long l59532;
+    public long l59533;
+    public long l59534;
+    public long l59535;
+    public long l59536;
+    public long l59537;
+    public long l59538;
+    public long l59539;
+    public long l59540;
+    public long l59541;
+    public long l59542;
+    public long l59543;
+    public long l59544;
+    public long l59545;
+    public long l59546;
+    public long l59547;
+    public long l59548;
+    public long l59549;
+    public long l59550;
+    public long l59551;
+    public long l59552;
+    public long l59553;
+    public long l59554;
+    public long l59555;
+    public long l59556;
+    public long l59557;
+    public long l59558;
+    public long l59559;
+    public long l59560;
+    public long l59561;
+    public long l59562;
+    public long l59563;
+    public long l59564;
+    public long l59565;
+    public long l59566;
+    public long l59567;
+    public long l59568;
+    public long l59569;
+    public long l59570;
+    public long l59571;
+    public long l59572;
+    public long l59573;
+    public long l59574;
+    public long l59575;
+    public long l59576;
+    public long l59577;
+    public long l59578;
+    public long l59579;
+    public long l59580;
+    public long l59581;
+    public long l59582;
+    public long l59583;
+    public long l59584;
+    public long l59585;
+    public long l59586;
+    public long l59587;
+    public long l59588;
+    public long l59589;
+    public long l59590;
+    public long l59591;
+    public long l59592;
+    public long l59593;
+    public long l59594;
+    public long l59595;
+    public long l59596;
+    public long l59597;
+    public long l59598;
+    public long l59599;
+    public long l59600;
+    public long l59601;
+    public long l59602;
+    public long l59603;
+    public long l59604;
+    public long l59605;
+    public long l59606;
+    public long l59607;
+    public long l59608;
+    public long l59609;
+    public long l59610;
+    public long l59611;
+    public long l59612;
+    public long l59613;
+    public long l59614;
+    public long l59615;
+    public long l59616;
+    public long l59617;
+    public long l59618;
+    public long l59619;
+    public long l59620;
+    public long l59621;
+    public long l59622;
+    public long l59623;
+    public long l59624;
+    public long l59625;
+    public long l59626;
+    public long l59627;
+    public long l59628;
+    public long l59629;
+    public long l59630;
+    public long l59631;
+    public long l59632;
+    public long l59633;
+    public long l59634;
+    public long l59635;
+    public long l59636;
+    public long l59637;
+    public long l59638;
+    public long l59639;
+    public long l59640;
+    public long l59641;
+    public long l59642;
+    public long l59643;
+    public long l59644;
+    public long l59645;
+    public long l59646;
+    public long l59647;
+    public long l59648;
+    public long l59649;
+    public long l59650;
+    public long l59651;
+    public long l59652;
+    public long l59653;
+    public long l59654;
+    public long l59655;
+    public long l59656;
+    public long l59657;
+    public long l59658;
+    public long l59659;
+    public long l59660;
+    public long l59661;
+    public long l59662;
+    public long l59663;
+    public long l59664;
+    public long l59665;
+    public long l59666;
+    public long l59667;
+    public long l59668;
+    public long l59669;
+    public long l59670;
+    public long l59671;
+    public long l59672;
+    public long l59673;
+    public long l59674;
+    public long l59675;
+    public long l59676;
+    public long l59677;
+    public long l59678;
+    public long l59679;
+    public long l59680;
+    public long l59681;
+    public long l59682;
+    public long l59683;
+    public long l59684;
+    public long l59685;
+    public long l59686;
+    public long l59687;
+    public long l59688;
+    public long l59689;
+    public long l59690;
+    public long l59691;
+    public long l59692;
+    public long l59693;
+    public long l59694;
+    public long l59695;
+    public long l59696;
+    public long l59697;
+    public long l59698;
+    public long l59699;
+    public long l59700;
+    public long l59701;
+    public long l59702;
+    public long l59703;
+    public long l59704;
+    public long l59705;
+    public long l59706;
+    public long l59707;
+    public long l59708;
+    public long l59709;
+    public long l59710;
+    public long l59711;
+    public long l59712;
+    public long l59713;
+    public long l59714;
+    public long l59715;
+    public long l59716;
+    public long l59717;
+    public long l59718;
+    public long l59719;
+    public long l59720;
+    public long l59721;
+    public long l59722;
+    public long l59723;
+    public long l59724;
+    public long l59725;
+    public long l59726;
+    public long l59727;
+    public long l59728;
+    public long l59729;
+    public long l59730;
+    public long l59731;
+    public long l59732;
+    public long l59733;
+    public long l59734;
+    public long l59735;
+    public long l59736;
+    public long l59737;
+    public long l59738;
+    public long l59739;
+    public long l59740;
+    public long l59741;
+    public long l59742;
+    public long l59743;
+    public long l59744;
+    public long l59745;
+    public long l59746;
+    public long l59747;
+    public long l59748;
+    public long l59749;
+    public long l59750;
+    public long l59751;
+    public long l59752;
+    public long l59753;
+    public long l59754;
+    public long l59755;
+    public long l59756;
+    public long l59757;
+    public long l59758;
+    public long l59759;
+    public long l59760;
+    public long l59761;
+    public long l59762;
+    public long l59763;
+    public long l59764;
+    public long l59765;
+    public long l59766;
+    public long l59767;
+    public long l59768;
+    public long l59769;
+    public long l59770;
+    public long l59771;
+    public long l59772;
+    public long l59773;
+    public long l59774;
+    public long l59775;
+    public long l59776;
+    public long l59777;
+    public long l59778;
+    public long l59779;
+    public long l59780;
+    public long l59781;
+    public long l59782;
+    public long l59783;
+    public long l59784;
+    public long l59785;
+    public long l59786;
+    public long l59787;
+    public long l59788;
+    public long l59789;
+    public long l59790;
+    public long l59791;
+    public long l59792;
+    public long l59793;
+    public long l59794;
+    public long l59795;
+    public long l59796;
+    public long l59797;
+    public long l59798;
+    public long l59799;
+    public long l59800;
+    public long l59801;
+    public long l59802;
+    public long l59803;
+    public long l59804;
+    public long l59805;
+    public long l59806;
+    public long l59807;
+    public long l59808;
+    public long l59809;
+    public long l59810;
+    public long l59811;
+    public long l59812;
+    public long l59813;
+    public long l59814;
+    public long l59815;
+    public long l59816;
+    public long l59817;
+    public long l59818;
+    public long l59819;
+    public long l59820;
+    public long l59821;
+    public long l59822;
+    public long l59823;
+    public long l59824;
+    public long l59825;
+    public long l59826;
+    public long l59827;
+    public long l59828;
+    public long l59829;
+    public long l59830;
+    public long l59831;
+    public long l59832;
+    public long l59833;
+    public long l59834;
+    public long l59835;
+    public long l59836;
+    public long l59837;
+    public long l59838;
+    public long l59839;
+    public long l59840;
+    public long l59841;
+    public long l59842;
+    public long l59843;
+    public long l59844;
+    public long l59845;
+    public long l59846;
+    public long l59847;
+    public long l59848;
+    public long l59849;
+    public long l59850;
+    public long l59851;
+    public long l59852;
+    public long l59853;
+    public long l59854;
+    public long l59855;
+    public long l59856;
+    public long l59857;
+    public long l59858;
+    public long l59859;
+    public long l59860;
+    public long l59861;
+    public long l59862;
+    public long l59863;
+    public long l59864;
+    public long l59865;
+    public long l59866;
+    public long l59867;
+    public long l59868;
+    public long l59869;
+    public long l59870;
+    public long l59871;
+    public long l59872;
+    public long l59873;
+    public long l59874;
+    public long l59875;
+    public long l59876;
+    public long l59877;
+    public long l59878;
+    public long l59879;
+    public long l59880;
+    public long l59881;
+    public long l59882;
+    public long l59883;
+    public long l59884;
+    public long l59885;
+    public long l59886;
+    public long l59887;
+    public long l59888;
+    public long l59889;
+    public long l59890;
+    public long l59891;
+    public long l59892;
+    public long l59893;
+    public long l59894;
+    public long l59895;
+    public long l59896;
+    public long l59897;
+    public long l59898;
+    public long l59899;
+    public long l59900;
+    public long l59901;
+    public long l59902;
+    public long l59903;
+    public long l59904;
+    public long l59905;
+    public long l59906;
+    public long l59907;
+    public long l59908;
+    public long l59909;
+    public long l59910;
+    public long l59911;
+    public long l59912;
+    public long l59913;
+    public long l59914;
+    public long l59915;
+    public long l59916;
+    public long l59917;
+    public long l59918;
+    public long l59919;
+    public long l59920;
+    public long l59921;
+    public long l59922;
+    public long l59923;
+    public long l59924;
+    public long l59925;
+    public long l59926;
+    public long l59927;
+    public long l59928;
+    public long l59929;
+    public long l59930;
+    public long l59931;
+    public long l59932;
+    public long l59933;
+    public long l59934;
+    public long l59935;
+    public long l59936;
+    public long l59937;
+    public long l59938;
+    public long l59939;
+    public long l59940;
+    public long l59941;
+    public long l59942;
+    public long l59943;
+    public long l59944;
+    public long l59945;
+    public long l59946;
+    public long l59947;
+    public long l59948;
+    public long l59949;
+    public long l59950;
+    public long l59951;
+    public long l59952;
+    public long l59953;
+    public long l59954;
+    public long l59955;
+    public long l59956;
+    public long l59957;
+    public long l59958;
+    public long l59959;
+    public long l59960;
+    public long l59961;
+    public long l59962;
+    public long l59963;
+    public long l59964;
+    public long l59965;
+    public long l59966;
+    public long l59967;
+    public long l59968;
+    public long l59969;
+    public long l59970;
+    public long l59971;
+    public long l59972;
+    public long l59973;
+    public long l59974;
+    public long l59975;
+    public long l59976;
+    public long l59977;
+    public long l59978;
+    public long l59979;
+    public long l59980;
+    public long l59981;
+    public long l59982;
+    public long l59983;
+    public long l59984;
+    public long l59985;
+    public long l59986;
+    public long l59987;
+    public long l59988;
+    public long l59989;
+    public long l59990;
+    public long l59991;
+    public long l59992;
+    public long l59993;
+    public long l59994;
+    public long l59995;
+    public long l59996;
+    public long l59997;
+    public long l59998;
+    public long l59999;
+    public long l60000;
+    public long l60001;
+    public long l60002;
+    public long l60003;
+    public long l60004;
+    public long l60005;
+    public long l60006;
+    public long l60007;
+    public long l60008;
+    public long l60009;
+    public long l60010;
+    public long l60011;
+    public long l60012;
+    public long l60013;
+    public long l60014;
+    public long l60015;
+    public long l60016;
+    public long l60017;
+    public long l60018;
+    public long l60019;
+    public long l60020;
+    public long l60021;
+    public long l60022;
+    public long l60023;
+    public long l60024;
+    public long l60025;
+    public long l60026;
+    public long l60027;
+    public long l60028;
+    public long l60029;
+    public long l60030;
+    public long l60031;
+    public long l60032;
+    public long l60033;
+    public long l60034;
+    public long l60035;
+    public long l60036;
+    public long l60037;
+    public long l60038;
+    public long l60039;
+    public long l60040;
+    public long l60041;
+    public long l60042;
+    public long l60043;
+    public long l60044;
+    public long l60045;
+    public long l60046;
+    public long l60047;
+    public long l60048;
+    public long l60049;
+    public long l60050;
+    public long l60051;
+    public long l60052;
+    public long l60053;
+    public long l60054;
+    public long l60055;
+    public long l60056;
+    public long l60057;
+    public long l60058;
+    public long l60059;
+    public long l60060;
+    public long l60061;
+    public long l60062;
+    public long l60063;
+    public long l60064;
+    public long l60065;
+    public long l60066;
+    public long l60067;
+    public long l60068;
+    public long l60069;
+    public long l60070;
+    public long l60071;
+    public long l60072;
+    public long l60073;
+    public long l60074;
+    public long l60075;
+    public long l60076;
+    public long l60077;
+    public long l60078;
+    public long l60079;
+    public long l60080;
+    public long l60081;
+    public long l60082;
+    public long l60083;
+    public long l60084;
+    public long l60085;
+    public long l60086;
+    public long l60087;
+    public long l60088;
+    public long l60089;
+    public long l60090;
+    public long l60091;
+    public long l60092;
+    public long l60093;
+    public long l60094;
+    public long l60095;
+    public long l60096;
+    public long l60097;
+    public long l60098;
+    public long l60099;
+    public long l60100;
+    public long l60101;
+    public long l60102;
+    public long l60103;
+    public long l60104;
+    public long l60105;
+    public long l60106;
+    public long l60107;
+    public long l60108;
+    public long l60109;
+    public long l60110;
+    public long l60111;
+    public long l60112;
+    public long l60113;
+    public long l60114;
+    public long l60115;
+    public long l60116;
+    public long l60117;
+    public long l60118;
+    public long l60119;
+    public long l60120;
+    public long l60121;
+    public long l60122;
+    public long l60123;
+    public long l60124;
+    public long l60125;
+    public long l60126;
+    public long l60127;
+    public long l60128;
+    public long l60129;
+    public long l60130;
+    public long l60131;
+    public long l60132;
+    public long l60133;
+    public long l60134;
+    public long l60135;
+    public long l60136;
+    public long l60137;
+    public long l60138;
+    public long l60139;
+    public long l60140;
+    public long l60141;
+    public long l60142;
+    public long l60143;
+    public long l60144;
+    public long l60145;
+    public long l60146;
+    public long l60147;
+    public long l60148;
+    public long l60149;
+    public long l60150;
+    public long l60151;
+    public long l60152;
+    public long l60153;
+    public long l60154;
+    public long l60155;
+    public long l60156;
+    public long l60157;
+    public long l60158;
+    public long l60159;
+    public long l60160;
+    public long l60161;
+    public long l60162;
+    public long l60163;
+    public long l60164;
+    public long l60165;
+    public long l60166;
+    public long l60167;
+    public long l60168;
+    public long l60169;
+    public long l60170;
+    public long l60171;
+    public long l60172;
+    public long l60173;
+    public long l60174;
+    public long l60175;
+    public long l60176;
+    public long l60177;
+    public long l60178;
+    public long l60179;
+    public long l60180;
+    public long l60181;
+    public long l60182;
+    public long l60183;
+    public long l60184;
+    public long l60185;
+    public long l60186;
+    public long l60187;
+    public long l60188;
+    public long l60189;
+    public long l60190;
+    public long l60191;
+    public long l60192;
+    public long l60193;
+    public long l60194;
+    public long l60195;
+    public long l60196;
+    public long l60197;
+    public long l60198;
+    public long l60199;
+    public long l60200;
+    public long l60201;
+    public long l60202;
+    public long l60203;
+    public long l60204;
+    public long l60205;
+    public long l60206;
+    public long l60207;
+    public long l60208;
+    public long l60209;
+    public long l60210;
+    public long l60211;
+    public long l60212;
+    public long l60213;
+    public long l60214;
+    public long l60215;
+    public long l60216;
+    public long l60217;
+    public long l60218;
+    public long l60219;
+    public long l60220;
+    public long l60221;
+    public long l60222;
+    public long l60223;
+    public long l60224;
+    public long l60225;
+    public long l60226;
+    public long l60227;
+    public long l60228;
+    public long l60229;
+    public long l60230;
+    public long l60231;
+    public long l60232;
+    public long l60233;
+    public long l60234;
+    public long l60235;
+    public long l60236;
+    public long l60237;
+    public long l60238;
+    public long l60239;
+    public long l60240;
+    public long l60241;
+    public long l60242;
+    public long l60243;
+    public long l60244;
+    public long l60245;
+    public long l60246;
+    public long l60247;
+    public long l60248;
+    public long l60249;
+    public long l60250;
+    public long l60251;
+    public long l60252;
+    public long l60253;
+    public long l60254;
+    public long l60255;
+    public long l60256;
+    public long l60257;
+    public long l60258;
+    public long l60259;
+    public long l60260;
+    public long l60261;
+    public long l60262;
+    public long l60263;
+    public long l60264;
+    public long l60265;
+    public long l60266;
+    public long l60267;
+    public long l60268;
+    public long l60269;
+    public long l60270;
+    public long l60271;
+    public long l60272;
+    public long l60273;
+    public long l60274;
+    public long l60275;
+    public long l60276;
+    public long l60277;
+    public long l60278;
+    public long l60279;
+    public long l60280;
+    public long l60281;
+    public long l60282;
+    public long l60283;
+    public long l60284;
+    public long l60285;
+    public long l60286;
+    public long l60287;
+    public long l60288;
+    public long l60289;
+    public long l60290;
+    public long l60291;
+    public long l60292;
+    public long l60293;
+    public long l60294;
+    public long l60295;
+    public long l60296;
+    public long l60297;
+    public long l60298;
+    public long l60299;
+    public long l60300;
+    public long l60301;
+    public long l60302;
+    public long l60303;
+    public long l60304;
+    public long l60305;
+    public long l60306;
+    public long l60307;
+    public long l60308;
+    public long l60309;
+    public long l60310;
+    public long l60311;
+    public long l60312;
+    public long l60313;
+    public long l60314;
+    public long l60315;
+    public long l60316;
+    public long l60317;
+    public long l60318;
+    public long l60319;
+    public long l60320;
+    public long l60321;
+    public long l60322;
+    public long l60323;
+    public long l60324;
+    public long l60325;
+    public long l60326;
+    public long l60327;
+    public long l60328;
+    public long l60329;
+    public long l60330;
+    public long l60331;
+    public long l60332;
+    public long l60333;
+    public long l60334;
+    public long l60335;
+    public long l60336;
+    public long l60337;
+    public long l60338;
+    public long l60339;
+    public long l60340;
+    public long l60341;
+    public long l60342;
+    public long l60343;
+    public long l60344;
+    public long l60345;
+    public long l60346;
+    public long l60347;
+    public long l60348;
+    public long l60349;
+    public long l60350;
+    public long l60351;
+    public long l60352;
+    public long l60353;
+    public long l60354;
+    public long l60355;
+    public long l60356;
+    public long l60357;
+    public long l60358;
+    public long l60359;
+    public long l60360;
+    public long l60361;
+    public long l60362;
+    public long l60363;
+    public long l60364;
+    public long l60365;
+    public long l60366;
+    public long l60367;
+    public long l60368;
+    public long l60369;
+    public long l60370;
+    public long l60371;
+    public long l60372;
+    public long l60373;
+    public long l60374;
+    public long l60375;
+    public long l60376;
+    public long l60377;
+    public long l60378;
+    public long l60379;
+    public long l60380;
+    public long l60381;
+    public long l60382;
+    public long l60383;
+    public long l60384;
+    public long l60385;
+    public long l60386;
+    public long l60387;
+    public long l60388;
+    public long l60389;
+    public long l60390;
+    public long l60391;
+    public long l60392;
+    public long l60393;
+    public long l60394;
+    public long l60395;
+    public long l60396;
+    public long l60397;
+    public long l60398;
+    public long l60399;
+    public long l60400;
+    public long l60401;
+    public long l60402;
+    public long l60403;
+    public long l60404;
+    public long l60405;
+    public long l60406;
+    public long l60407;
+    public long l60408;
+    public long l60409;
+    public long l60410;
+    public long l60411;
+    public long l60412;
+    public long l60413;
+    public long l60414;
+    public long l60415;
+    public long l60416;
+    public long l60417;
+    public long l60418;
+    public long l60419;
+    public long l60420;
+    public long l60421;
+    public long l60422;
+    public long l60423;
+    public long l60424;
+    public long l60425;
+    public long l60426;
+    public long l60427;
+    public long l60428;
+    public long l60429;
+    public long l60430;
+    public long l60431;
+    public long l60432;
+    public long l60433;
+    public long l60434;
+    public long l60435;
+    public long l60436;
+    public long l60437;
+    public long l60438;
+    public long l60439;
+    public long l60440;
+    public long l60441;
+    public long l60442;
+    public long l60443;
+    public long l60444;
+    public long l60445;
+    public long l60446;
+    public long l60447;
+    public long l60448;
+    public long l60449;
+    public long l60450;
+    public long l60451;
+    public long l60452;
+    public long l60453;
+    public long l60454;
+    public long l60455;
+    public long l60456;
+    public long l60457;
+    public long l60458;
+    public long l60459;
+    public long l60460;
+    public long l60461;
+    public long l60462;
+    public long l60463;
+    public long l60464;
+    public long l60465;
+    public long l60466;
+    public long l60467;
+    public long l60468;
+    public long l60469;
+    public long l60470;
+    public long l60471;
+    public long l60472;
+    public long l60473;
+    public long l60474;
+    public long l60475;
+    public long l60476;
+    public long l60477;
+    public long l60478;
+    public long l60479;
+    public long l60480;
+    public long l60481;
+    public long l60482;
+    public long l60483;
+    public long l60484;
+    public long l60485;
+    public long l60486;
+    public long l60487;
+    public long l60488;
+    public long l60489;
+    public long l60490;
+    public long l60491;
+    public long l60492;
+    public long l60493;
+    public long l60494;
+    public long l60495;
+    public long l60496;
+    public long l60497;
+    public long l60498;
+    public long l60499;
+    public long l60500;
+    public long l60501;
+    public long l60502;
+    public long l60503;
+    public long l60504;
+    public long l60505;
+    public long l60506;
+    public long l60507;
+    public long l60508;
+    public long l60509;
+    public long l60510;
+    public long l60511;
+    public long l60512;
+    public long l60513;
+    public long l60514;
+    public long l60515;
+    public long l60516;
+    public long l60517;
+    public long l60518;
+    public long l60519;
+    public long l60520;
+    public long l60521;
+    public long l60522;
+    public long l60523;
+    public long l60524;
+    public long l60525;
+    public long l60526;
+    public long l60527;
+    public long l60528;
+    public long l60529;
+    public long l60530;
+    public long l60531;
+    public long l60532;
+    public long l60533;
+    public long l60534;
+    public long l60535;
+    public long l60536;
+    public long l60537;
+    public long l60538;
+    public long l60539;
+    public long l60540;
+    public long l60541;
+    public long l60542;
+    public long l60543;
+    public long l60544;
+    public long l60545;
+    public long l60546;
+    public long l60547;
+    public long l60548;
+    public long l60549;
+    public long l60550;
+    public long l60551;
+    public long l60552;
+    public long l60553;
+    public long l60554;
+    public long l60555;
+    public long l60556;
+    public long l60557;
+    public long l60558;
+    public long l60559;
+    public long l60560;
+    public long l60561;
+    public long l60562;
+    public long l60563;
+    public long l60564;
+    public long l60565;
+    public long l60566;
+    public long l60567;
+    public long l60568;
+    public long l60569;
+    public long l60570;
+    public long l60571;
+    public long l60572;
+    public long l60573;
+    public long l60574;
+    public long l60575;
+    public long l60576;
+    public long l60577;
+    public long l60578;
+    public long l60579;
+    public long l60580;
+    public long l60581;
+    public long l60582;
+    public long l60583;
+    public long l60584;
+    public long l60585;
+    public long l60586;
+    public long l60587;
+    public long l60588;
+    public long l60589;
+    public long l60590;
+    public long l60591;
+    public long l60592;
+    public long l60593;
+    public long l60594;
+    public long l60595;
+    public long l60596;
+    public long l60597;
+    public long l60598;
+    public long l60599;
+    public long l60600;
+    public long l60601;
+    public long l60602;
+    public long l60603;
+    public long l60604;
+    public long l60605;
+    public long l60606;
+    public long l60607;
+    public long l60608;
+    public long l60609;
+    public long l60610;
+    public long l60611;
+    public long l60612;
+    public long l60613;
+    public long l60614;
+    public long l60615;
+    public long l60616;
+    public long l60617;
+    public long l60618;
+    public long l60619;
+    public long l60620;
+    public long l60621;
+    public long l60622;
+    public long l60623;
+    public long l60624;
+    public long l60625;
+    public long l60626;
+    public long l60627;
+    public long l60628;
+    public long l60629;
+    public long l60630;
+    public long l60631;
+    public long l60632;
+    public long l60633;
+    public long l60634;
+    public long l60635;
+    public long l60636;
+    public long l60637;
+    public long l60638;
+    public long l60639;
+    public long l60640;
+    public long l60641;
+    public long l60642;
+    public long l60643;
+    public long l60644;
+    public long l60645;
+    public long l60646;
+    public long l60647;
+    public long l60648;
+    public long l60649;
+    public long l60650;
+    public long l60651;
+    public long l60652;
+    public long l60653;
+    public long l60654;
+    public long l60655;
+    public long l60656;
+    public long l60657;
+    public long l60658;
+    public long l60659;
+    public long l60660;
+    public long l60661;
+    public long l60662;
+    public long l60663;
+    public long l60664;
+    public long l60665;
+    public long l60666;
+    public long l60667;
+    public long l60668;
+    public long l60669;
+    public long l60670;
+    public long l60671;
+    public long l60672;
+    public long l60673;
+    public long l60674;
+    public long l60675;
+    public long l60676;
+    public long l60677;
+    public long l60678;
+    public long l60679;
+    public long l60680;
+    public long l60681;
+    public long l60682;
+    public long l60683;
+    public long l60684;
+    public long l60685;
+    public long l60686;
+    public long l60687;
+    public long l60688;
+    public long l60689;
+    public long l60690;
+    public long l60691;
+    public long l60692;
+    public long l60693;
+    public long l60694;
+    public long l60695;
+    public long l60696;
+    public long l60697;
+    public long l60698;
+    public long l60699;
+    public long l60700;
+    public long l60701;
+    public long l60702;
+    public long l60703;
+    public long l60704;
+    public long l60705;
+    public long l60706;
+    public long l60707;
+    public long l60708;
+    public long l60709;
+    public long l60710;
+    public long l60711;
+    public long l60712;
+    public long l60713;
+    public long l60714;
+    public long l60715;
+    public long l60716;
+    public long l60717;
+    public long l60718;
+    public long l60719;
+    public long l60720;
+    public long l60721;
+    public long l60722;
+    public long l60723;
+    public long l60724;
+    public long l60725;
+    public long l60726;
+    public long l60727;
+    public long l60728;
+    public long l60729;
+    public long l60730;
+    public long l60731;
+    public long l60732;
+    public long l60733;
+    public long l60734;
+    public long l60735;
+    public long l60736;
+    public long l60737;
+    public long l60738;
+    public long l60739;
+    public long l60740;
+    public long l60741;
+    public long l60742;
+    public long l60743;
+    public long l60744;
+    public long l60745;
+    public long l60746;
+    public long l60747;
+    public long l60748;
+    public long l60749;
+    public long l60750;
+    public long l60751;
+    public long l60752;
+    public long l60753;
+    public long l60754;
+    public long l60755;
+    public long l60756;
+    public long l60757;
+    public long l60758;
+    public long l60759;
+    public long l60760;
+    public long l60761;
+    public long l60762;
+    public long l60763;
+    public long l60764;
+    public long l60765;
+    public long l60766;
+    public long l60767;
+    public long l60768;
+    public long l60769;
+    public long l60770;
+    public long l60771;
+    public long l60772;
+    public long l60773;
+    public long l60774;
+    public long l60775;
+    public long l60776;
+    public long l60777;
+    public long l60778;
+    public long l60779;
+    public long l60780;
+    public long l60781;
+    public long l60782;
+    public long l60783;
+    public long l60784;
+    public long l60785;
+    public long l60786;
+    public long l60787;
+    public long l60788;
+    public long l60789;
+    public long l60790;
+    public long l60791;
+    public long l60792;
+    public long l60793;
+    public long l60794;
+    public long l60795;
+    public long l60796;
+    public long l60797;
+    public long l60798;
+    public long l60799;
+    public long l60800;
+    public long l60801;
+    public long l60802;
+    public long l60803;
+    public long l60804;
+    public long l60805;
+    public long l60806;
+    public long l60807;
+    public long l60808;
+    public long l60809;
+    public long l60810;
+    public long l60811;
+    public long l60812;
+    public long l60813;
+    public long l60814;
+    public long l60815;
+    public long l60816;
+    public long l60817;
+    public long l60818;
+    public long l60819;
+    public long l60820;
+    public long l60821;
+    public long l60822;
+    public long l60823;
+    public long l60824;
+    public long l60825;
+    public long l60826;
+    public long l60827;
+    public long l60828;
+    public long l60829;
+    public long l60830;
+    public long l60831;
+    public long l60832;
+    public long l60833;
+    public long l60834;
+    public long l60835;
+    public long l60836;
+    public long l60837;
+    public long l60838;
+    public long l60839;
+    public long l60840;
+    public long l60841;
+    public long l60842;
+    public long l60843;
+    public long l60844;
+    public long l60845;
+    public long l60846;
+    public long l60847;
+    public long l60848;
+    public long l60849;
+    public long l60850;
+    public long l60851;
+    public long l60852;
+    public long l60853;
+    public long l60854;
+    public long l60855;
+    public long l60856;
+    public long l60857;
+    public long l60858;
+    public long l60859;
+    public long l60860;
+    public long l60861;
+    public long l60862;
+    public long l60863;
+    public long l60864;
+    public long l60865;
+    public long l60866;
+    public long l60867;
+    public long l60868;
+    public long l60869;
+    public long l60870;
+    public long l60871;
+    public long l60872;
+    public long l60873;
+    public long l60874;
+    public long l60875;
+    public long l60876;
+    public long l60877;
+    public long l60878;
+    public long l60879;
+    public long l60880;
+    public long l60881;
+    public long l60882;
+    public long l60883;
+    public long l60884;
+    public long l60885;
+    public long l60886;
+    public long l60887;
+    public long l60888;
+    public long l60889;
+    public long l60890;
+    public long l60891;
+    public long l60892;
+    public long l60893;
+    public long l60894;
+    public long l60895;
+    public long l60896;
+    public long l60897;
+    public long l60898;
+    public long l60899;
+    public long l60900;
+    public long l60901;
+    public long l60902;
+    public long l60903;
+    public long l60904;
+    public long l60905;
+    public long l60906;
+    public long l60907;
+    public long l60908;
+    public long l60909;
+    public long l60910;
+    public long l60911;
+    public long l60912;
+    public long l60913;
+    public long l60914;
+    public long l60915;
+    public long l60916;
+    public long l60917;
+    public long l60918;
+    public long l60919;
+    public long l60920;
+    public long l60921;
+    public long l60922;
+    public long l60923;
+    public long l60924;
+    public long l60925;
+    public long l60926;
+    public long l60927;
+    public long l60928;
+    public long l60929;
+    public long l60930;
+    public long l60931;
+    public long l60932;
+    public long l60933;
+    public long l60934;
+    public long l60935;
+    public long l60936;
+    public long l60937;
+    public long l60938;
+    public long l60939;
+    public long l60940;
+    public long l60941;
+    public long l60942;
+    public long l60943;
+    public long l60944;
+    public long l60945;
+    public long l60946;
+    public long l60947;
+    public long l60948;
+    public long l60949;
+    public long l60950;
+    public long l60951;
+    public long l60952;
+    public long l60953;
+    public long l60954;
+    public long l60955;
+    public long l60956;
+    public long l60957;
+    public long l60958;
+    public long l60959;
+    public long l60960;
+    public long l60961;
+    public long l60962;
+    public long l60963;
+    public long l60964;
+    public long l60965;
+    public long l60966;
+    public long l60967;
+    public long l60968;
+    public long l60969;
+    public long l60970;
+    public long l60971;
+    public long l60972;
+    public long l60973;
+    public long l60974;
+    public long l60975;
+    public long l60976;
+    public long l60977;
+    public long l60978;
+    public long l60979;
+    public long l60980;
+    public long l60981;
+    public long l60982;
+    public long l60983;
+    public long l60984;
+    public long l60985;
+    public long l60986;
+    public long l60987;
+    public long l60988;
+    public long l60989;
+    public long l60990;
+    public long l60991;
+    public long l60992;
+    public long l60993;
+    public long l60994;
+    public long l60995;
+    public long l60996;
+    public long l60997;
+    public long l60998;
+    public long l60999;
+    public long l61000;
+    public long l61001;
+    public long l61002;
+    public long l61003;
+    public long l61004;
+    public long l61005;
+    public long l61006;
+    public long l61007;
+    public long l61008;
+    public long l61009;
+    public long l61010;
+    public long l61011;
+    public long l61012;
+    public long l61013;
+    public long l61014;
+    public long l61015;
+    public long l61016;
+    public long l61017;
+    public long l61018;
+    public long l61019;
+    public long l61020;
+    public long l61021;
+    public long l61022;
+    public long l61023;
+    public long l61024;
+    public long l61025;
+    public long l61026;
+    public long l61027;
+    public long l61028;
+    public long l61029;
+    public long l61030;
+    public long l61031;
+    public long l61032;
+    public long l61033;
+    public long l61034;
+    public long l61035;
+    public long l61036;
+    public long l61037;
+    public long l61038;
+    public long l61039;
+    public long l61040;
+    public long l61041;
+    public long l61042;
+    public long l61043;
+    public long l61044;
+    public long l61045;
+    public long l61046;
+    public long l61047;
+    public long l61048;
+    public long l61049;
+    public long l61050;
+    public long l61051;
+    public long l61052;
+    public long l61053;
+    public long l61054;
+    public long l61055;
+    public long l61056;
+    public long l61057;
+    public long l61058;
+    public long l61059;
+    public long l61060;
+    public long l61061;
+    public long l61062;
+    public long l61063;
+    public long l61064;
+    public long l61065;
+    public long l61066;
+    public long l61067;
+    public long l61068;
+    public long l61069;
+    public long l61070;
+    public long l61071;
+    public long l61072;
+    public long l61073;
+    public long l61074;
+    public long l61075;
+    public long l61076;
+    public long l61077;
+    public long l61078;
+    public long l61079;
+    public long l61080;
+    public long l61081;
+    public long l61082;
+    public long l61083;
+    public long l61084;
+    public long l61085;
+    public long l61086;
+    public long l61087;
+    public long l61088;
+    public long l61089;
+    public long l61090;
+    public long l61091;
+    public long l61092;
+    public long l61093;
+    public long l61094;
+    public long l61095;
+    public long l61096;
+    public long l61097;
+    public long l61098;
+    public long l61099;
+    public long l61100;
+    public long l61101;
+    public long l61102;
+    public long l61103;
+    public long l61104;
+    public long l61105;
+    public long l61106;
+    public long l61107;
+    public long l61108;
+    public long l61109;
+    public long l61110;
+    public long l61111;
+    public long l61112;
+    public long l61113;
+    public long l61114;
+    public long l61115;
+    public long l61116;
+    public long l61117;
+    public long l61118;
+    public long l61119;
+    public long l61120;
+    public long l61121;
+    public long l61122;
+    public long l61123;
+    public long l61124;
+    public long l61125;
+    public long l61126;
+    public long l61127;
+    public long l61128;
+    public long l61129;
+    public long l61130;
+    public long l61131;
+    public long l61132;
+    public long l61133;
+    public long l61134;
+    public long l61135;
+    public long l61136;
+    public long l61137;
+    public long l61138;
+    public long l61139;
+    public long l61140;
+    public long l61141;
+    public long l61142;
+    public long l61143;
+    public long l61144;
+    public long l61145;
+    public long l61146;
+    public long l61147;
+    public long l61148;
+    public long l61149;
+    public long l61150;
+    public long l61151;
+    public long l61152;
+    public long l61153;
+    public long l61154;
+    public long l61155;
+    public long l61156;
+    public long l61157;
+    public long l61158;
+    public long l61159;
+    public long l61160;
+    public long l61161;
+    public long l61162;
+    public long l61163;
+    public long l61164;
+    public long l61165;
+    public long l61166;
+    public long l61167;
+    public long l61168;
+    public long l61169;
+    public long l61170;
+    public long l61171;
+    public long l61172;
+    public long l61173;
+    public long l61174;
+    public long l61175;
+    public long l61176;
+    public long l61177;
+    public long l61178;
+    public long l61179;
+    public long l61180;
+    public long l61181;
+    public long l61182;
+    public long l61183;
+    public long l61184;
+    public long l61185;
+    public long l61186;
+    public long l61187;
+    public long l61188;
+    public long l61189;
+    public long l61190;
+    public long l61191;
+    public long l61192;
+    public long l61193;
+    public long l61194;
+    public long l61195;
+    public long l61196;
+    public long l61197;
+    public long l61198;
+    public long l61199;
+    public long l61200;
+    public long l61201;
+    public long l61202;
+    public long l61203;
+    public long l61204;
+    public long l61205;
+    public long l61206;
+    public long l61207;
+    public long l61208;
+    public long l61209;
+    public long l61210;
+    public long l61211;
+    public long l61212;
+    public long l61213;
+    public long l61214;
+    public long l61215;
+    public long l61216;
+    public long l61217;
+    public long l61218;
+    public long l61219;
+    public long l61220;
+    public long l61221;
+    public long l61222;
+    public long l61223;
+    public long l61224;
+    public long l61225;
+    public long l61226;
+    public long l61227;
+    public long l61228;
+    public long l61229;
+    public long l61230;
+    public long l61231;
+    public long l61232;
+    public long l61233;
+    public long l61234;
+    public long l61235;
+    public long l61236;
+    public long l61237;
+    public long l61238;
+    public long l61239;
+    public long l61240;
+    public long l61241;
+    public long l61242;
+    public long l61243;
+    public long l61244;
+    public long l61245;
+    public long l61246;
+    public long l61247;
+    public long l61248;
+    public long l61249;
+    public long l61250;
+    public long l61251;
+    public long l61252;
+    public long l61253;
+    public long l61254;
+    public long l61255;
+    public long l61256;
+    public long l61257;
+    public long l61258;
+    public long l61259;
+    public long l61260;
+    public long l61261;
+    public long l61262;
+    public long l61263;
+    public long l61264;
+    public long l61265;
+    public long l61266;
+    public long l61267;
+    public long l61268;
+    public long l61269;
+    public long l61270;
+    public long l61271;
+    public long l61272;
+    public long l61273;
+    public long l61274;
+    public long l61275;
+    public long l61276;
+    public long l61277;
+    public long l61278;
+    public long l61279;
+    public long l61280;
+    public long l61281;
+    public long l61282;
+    public long l61283;
+    public long l61284;
+    public long l61285;
+    public long l61286;
+    public long l61287;
+    public long l61288;
+    public long l61289;
+    public long l61290;
+    public long l61291;
+    public long l61292;
+    public long l61293;
+    public long l61294;
+    public long l61295;
+    public long l61296;
+    public long l61297;
+    public long l61298;
+    public long l61299;
+    public long l61300;
+    public long l61301;
+    public long l61302;
+    public long l61303;
+    public long l61304;
+    public long l61305;
+    public long l61306;
+    public long l61307;
+    public long l61308;
+    public long l61309;
+    public long l61310;
+    public long l61311;
+    public long l61312;
+    public long l61313;
+    public long l61314;
+    public long l61315;
+    public long l61316;
+    public long l61317;
+    public long l61318;
+    public long l61319;
+    public long l61320;
+    public long l61321;
+    public long l61322;
+    public long l61323;
+    public long l61324;
+    public long l61325;
+    public long l61326;
+    public long l61327;
+    public long l61328;
+    public long l61329;
+    public long l61330;
+    public long l61331;
+    public long l61332;
+    public long l61333;
+    public long l61334;
+    public long l61335;
+    public long l61336;
+    public long l61337;
+    public long l61338;
+    public long l61339;
+    public long l61340;
+    public long l61341;
+    public long l61342;
+    public long l61343;
+    public long l61344;
+    public long l61345;
+    public long l61346;
+    public long l61347;
+    public long l61348;
+    public long l61349;
+    public long l61350;
+    public long l61351;
+    public long l61352;
+    public long l61353;
+    public long l61354;
+    public long l61355;
+    public long l61356;
+    public long l61357;
+    public long l61358;
+    public long l61359;
+    public long l61360;
+    public long l61361;
+    public long l61362;
+    public long l61363;
+    public long l61364;
+    public long l61365;
+    public long l61366;
+    public long l61367;
+    public long l61368;
+    public long l61369;
+    public long l61370;
+    public long l61371;
+    public long l61372;
+    public long l61373;
+    public long l61374;
+    public long l61375;
+    public long l61376;
+    public long l61377;
+    public long l61378;
+    public long l61379;
+    public long l61380;
+    public long l61381;
+    public long l61382;
+    public long l61383;
+    public long l61384;
+    public long l61385;
+    public long l61386;
+    public long l61387;
+    public long l61388;
+    public long l61389;
+    public long l61390;
+    public long l61391;
+    public long l61392;
+    public long l61393;
+    public long l61394;
+    public long l61395;
+    public long l61396;
+    public long l61397;
+    public long l61398;
+    public long l61399;
+    public long l61400;
+    public long l61401;
+    public long l61402;
+    public long l61403;
+    public long l61404;
+    public long l61405;
+    public long l61406;
+    public long l61407;
+    public long l61408;
+    public long l61409;
+    public long l61410;
+    public long l61411;
+    public long l61412;
+    public long l61413;
+    public long l61414;
+    public long l61415;
+    public long l61416;
+    public long l61417;
+    public long l61418;
+    public long l61419;
+    public long l61420;
+    public long l61421;
+    public long l61422;
+    public long l61423;
+    public long l61424;
+    public long l61425;
+    public long l61426;
+    public long l61427;
+    public long l61428;
+    public long l61429;
+    public long l61430;
+    public long l61431;
+    public long l61432;
+    public long l61433;
+    public long l61434;
+    public long l61435;
+    public long l61436;
+    public long l61437;
+    public long l61438;
+    public long l61439;
+    public long l61440;
+    public long l61441;
+    public long l61442;
+    public long l61443;
+    public long l61444;
+    public long l61445;
+    public long l61446;
+    public long l61447;
+    public long l61448;
+    public long l61449;
+    public long l61450;
+    public long l61451;
+    public long l61452;
+    public long l61453;
+    public long l61454;
+    public long l61455;
+    public long l61456;
+    public long l61457;
+    public long l61458;
+    public long l61459;
+    public long l61460;
+    public long l61461;
+    public long l61462;
+    public long l61463;
+    public long l61464;
+    public long l61465;
+    public long l61466;
+    public long l61467;
+    public long l61468;
+    public long l61469;
+    public long l61470;
+    public long l61471;
+    public long l61472;
+    public long l61473;
+    public long l61474;
+    public long l61475;
+    public long l61476;
+    public long l61477;
+    public long l61478;
+    public long l61479;
+    public long l61480;
+    public long l61481;
+    public long l61482;
+    public long l61483;
+    public long l61484;
+    public long l61485;
+    public long l61486;
+    public long l61487;
+    public long l61488;
+    public long l61489;
+    public long l61490;
+    public long l61491;
+    public long l61492;
+    public long l61493;
+    public long l61494;
+    public long l61495;
+    public long l61496;
+    public long l61497;
+    public long l61498;
+    public long l61499;
+    public long l61500;
+    public long l61501;
+    public long l61502;
+    public long l61503;
+    public long l61504;
+    public long l61505;
+    public long l61506;
+    public long l61507;
+    public long l61508;
+    public long l61509;
+    public long l61510;
+    public long l61511;
+    public long l61512;
+    public long l61513;
+    public long l61514;
+    public long l61515;
+    public long l61516;
+    public long l61517;
+    public long l61518;
+    public long l61519;
+    public long l61520;
+    public long l61521;
+    public long l61522;
+    public long l61523;
+    public long l61524;
+    public long l61525;
+    public long l61526;
+    public long l61527;
+    public long l61528;
+    public long l61529;
+    public long l61530;
+    public long l61531;
+    public long l61532;
+    public long l61533;
+    public long l61534;
+    public long l61535;
+    public long l61536;
+    public long l61537;
+    public long l61538;
+    public long l61539;
+    public long l61540;
+    public long l61541;
+    public long l61542;
+    public long l61543;
+    public long l61544;
+    public long l61545;
+    public long l61546;
+    public long l61547;
+    public long l61548;
+    public long l61549;
+    public long l61550;
+    public long l61551;
+    public long l61552;
+    public long l61553;
+    public long l61554;
+    public long l61555;
+    public long l61556;
+    public long l61557;
+    public long l61558;
+    public long l61559;
+    public long l61560;
+    public long l61561;
+    public long l61562;
+    public long l61563;
+    public long l61564;
+    public long l61565;
+    public long l61566;
+    public long l61567;
+    public long l61568;
+    public long l61569;
+    public long l61570;
+    public long l61571;
+    public long l61572;
+    public long l61573;
+    public long l61574;
+    public long l61575;
+    public long l61576;
+    public long l61577;
+    public long l61578;
+    public long l61579;
+    public long l61580;
+    public long l61581;
+    public long l61582;
+    public long l61583;
+    public long l61584;
+    public long l61585;
+    public long l61586;
+    public long l61587;
+    public long l61588;
+    public long l61589;
+    public long l61590;
+    public long l61591;
+    public long l61592;
+    public long l61593;
+    public long l61594;
+    public long l61595;
+    public long l61596;
+    public long l61597;
+    public long l61598;
+    public long l61599;
+    public long l61600;
+    public long l61601;
+    public long l61602;
+    public long l61603;
+    public long l61604;
+    public long l61605;
+    public long l61606;
+    public long l61607;
+    public long l61608;
+    public long l61609;
+    public long l61610;
+    public long l61611;
+    public long l61612;
+    public long l61613;
+    public long l61614;
+    public long l61615;
+    public long l61616;
+    public long l61617;
+    public long l61618;
+    public long l61619;
+    public long l61620;
+    public long l61621;
+    public long l61622;
+    public long l61623;
+    public long l61624;
+    public long l61625;
+    public long l61626;
+    public long l61627;
+    public long l61628;
+    public long l61629;
+    public long l61630;
+    public long l61631;
+    public long l61632;
+    public long l61633;
+    public long l61634;
+    public long l61635;
+    public long l61636;
+    public long l61637;
+    public long l61638;
+    public long l61639;
+    public long l61640;
+    public long l61641;
+    public long l61642;
+    public long l61643;
+    public long l61644;
+    public long l61645;
+    public long l61646;
+    public long l61647;
+    public long l61648;
+    public long l61649;
+    public long l61650;
+    public long l61651;
+    public long l61652;
+    public long l61653;
+    public long l61654;
+    public long l61655;
+    public long l61656;
+    public long l61657;
+    public long l61658;
+    public long l61659;
+    public long l61660;
+    public long l61661;
+    public long l61662;
+    public long l61663;
+    public long l61664;
+    public long l61665;
+    public long l61666;
+    public long l61667;
+    public long l61668;
+    public long l61669;
+    public long l61670;
+    public long l61671;
+    public long l61672;
+    public long l61673;
+    public long l61674;
+    public long l61675;
+    public long l61676;
+    public long l61677;
+    public long l61678;
+    public long l61679;
+    public long l61680;
+    public long l61681;
+    public long l61682;
+    public long l61683;
+    public long l61684;
+    public long l61685;
+    public long l61686;
+    public long l61687;
+    public long l61688;
+    public long l61689;
+    public long l61690;
+    public long l61691;
+    public long l61692;
+    public long l61693;
+    public long l61694;
+    public long l61695;
+    public long l61696;
+    public long l61697;
+    public long l61698;
+    public long l61699;
+    public long l61700;
+    public long l61701;
+    public long l61702;
+    public long l61703;
+    public long l61704;
+    public long l61705;
+    public long l61706;
+    public long l61707;
+    public long l61708;
+    public long l61709;
+    public long l61710;
+    public long l61711;
+    public long l61712;
+    public long l61713;
+    public long l61714;
+    public long l61715;
+    public long l61716;
+    public long l61717;
+    public long l61718;
+    public long l61719;
+    public long l61720;
+    public long l61721;
+    public long l61722;
+    public long l61723;
+    public long l61724;
+    public long l61725;
+    public long l61726;
+    public long l61727;
+    public long l61728;
+    public long l61729;
+    public long l61730;
+    public long l61731;
+    public long l61732;
+    public long l61733;
+    public long l61734;
+    public long l61735;
+    public long l61736;
+    public long l61737;
+    public long l61738;
+    public long l61739;
+    public long l61740;
+    public long l61741;
+    public long l61742;
+    public long l61743;
+    public long l61744;
+    public long l61745;
+    public long l61746;
+    public long l61747;
+    public long l61748;
+    public long l61749;
+    public long l61750;
+    public long l61751;
+    public long l61752;
+    public long l61753;
+    public long l61754;
+    public long l61755;
+    public long l61756;
+    public long l61757;
+    public long l61758;
+    public long l61759;
+    public long l61760;
+    public long l61761;
+    public long l61762;
+    public long l61763;
+    public long l61764;
+    public long l61765;
+    public long l61766;
+    public long l61767;
+    public long l61768;
+    public long l61769;
+    public long l61770;
+    public long l61771;
+    public long l61772;
+    public long l61773;
+    public long l61774;
+    public long l61775;
+    public long l61776;
+    public long l61777;
+    public long l61778;
+    public long l61779;
+    public long l61780;
+    public long l61781;
+    public long l61782;
+    public long l61783;
+    public long l61784;
+    public long l61785;
+    public long l61786;
+    public long l61787;
+    public long l61788;
+    public long l61789;
+    public long l61790;
+    public long l61791;
+    public long l61792;
+    public long l61793;
+    public long l61794;
+    public long l61795;
+    public long l61796;
+    public long l61797;
+    public long l61798;
+    public long l61799;
+    public long l61800;
+    public long l61801;
+    public long l61802;
+    public long l61803;
+    public long l61804;
+    public long l61805;
+    public long l61806;
+    public long l61807;
+    public long l61808;
+    public long l61809;
+    public long l61810;
+    public long l61811;
+    public long l61812;
+    public long l61813;
+    public long l61814;
+    public long l61815;
+    public long l61816;
+    public long l61817;
+    public long l61818;
+    public long l61819;
+    public long l61820;
+    public long l61821;
+    public long l61822;
+    public long l61823;
+    public long l61824;
+    public long l61825;
+    public long l61826;
+    public long l61827;
+    public long l61828;
+    public long l61829;
+    public long l61830;
+    public long l61831;
+    public long l61832;
+    public long l61833;
+    public long l61834;
+    public long l61835;
+    public long l61836;
+    public long l61837;
+    public long l61838;
+    public long l61839;
+    public long l61840;
+    public long l61841;
+    public long l61842;
+    public long l61843;
+    public long l61844;
+    public long l61845;
+    public long l61846;
+    public long l61847;
+    public long l61848;
+    public long l61849;
+    public long l61850;
+    public long l61851;
+    public long l61852;
+    public long l61853;
+    public long l61854;
+    public long l61855;
+    public long l61856;
+    public long l61857;
+    public long l61858;
+    public long l61859;
+    public long l61860;
+    public long l61861;
+    public long l61862;
+    public long l61863;
+    public long l61864;
+    public long l61865;
+    public long l61866;
+    public long l61867;
+    public long l61868;
+    public long l61869;
+    public long l61870;
+    public long l61871;
+    public long l61872;
+    public long l61873;
+    public long l61874;
+    public long l61875;
+    public long l61876;
+    public long l61877;
+    public long l61878;
+    public long l61879;
+    public long l61880;
+    public long l61881;
+    public long l61882;
+    public long l61883;
+    public long l61884;
+    public long l61885;
+    public long l61886;
+    public long l61887;
+    public long l61888;
+    public long l61889;
+    public long l61890;
+    public long l61891;
+    public long l61892;
+    public long l61893;
+    public long l61894;
+    public long l61895;
+    public long l61896;
+    public long l61897;
+    public long l61898;
+    public long l61899;
+    public long l61900;
+    public long l61901;
+    public long l61902;
+    public long l61903;
+    public long l61904;
+    public long l61905;
+    public long l61906;
+    public long l61907;
+    public long l61908;
+    public long l61909;
+    public long l61910;
+    public long l61911;
+    public long l61912;
+    public long l61913;
+    public long l61914;
+    public long l61915;
+    public long l61916;
+    public long l61917;
+    public long l61918;
+    public long l61919;
+    public long l61920;
+    public long l61921;
+    public long l61922;
+    public long l61923;
+    public long l61924;
+    public long l61925;
+    public long l61926;
+    public long l61927;
+    public long l61928;
+    public long l61929;
+    public long l61930;
+    public long l61931;
+    public long l61932;
+    public long l61933;
+    public long l61934;
+    public long l61935;
+    public long l61936;
+    public long l61937;
+    public long l61938;
+    public long l61939;
+    public long l61940;
+    public long l61941;
+    public long l61942;
+    public long l61943;
+    public long l61944;
+    public long l61945;
+    public long l61946;
+    public long l61947;
+    public long l61948;
+    public long l61949;
+    public long l61950;
+    public long l61951;
+    public long l61952;
+    public long l61953;
+    public long l61954;
+    public long l61955;
+    public long l61956;
+    public long l61957;
+    public long l61958;
+    public long l61959;
+    public long l61960;
+    public long l61961;
+    public long l61962;
+    public long l61963;
+    public long l61964;
+    public long l61965;
+    public long l61966;
+    public long l61967;
+    public long l61968;
+    public long l61969;
+    public long l61970;
+    public long l61971;
+    public long l61972;
+    public long l61973;
+    public long l61974;
+    public long l61975;
+    public long l61976;
+    public long l61977;
+    public long l61978;
+    public long l61979;
+    public long l61980;
+    public long l61981;
+    public long l61982;
+    public long l61983;
+    public long l61984;
+    public long l61985;
+    public long l61986;
+    public long l61987;
+    public long l61988;
+    public long l61989;
+    public long l61990;
+    public long l61991;
+    public long l61992;
+    public long l61993;
+    public long l61994;
+    public long l61995;
+    public long l61996;
+    public long l61997;
+    public long l61998;
+    public long l61999;
+    public long l62000;
+    public long l62001;
+    public long l62002;
+    public long l62003;
+    public long l62004;
+    public long l62005;
+    public long l62006;
+    public long l62007;
+    public long l62008;
+    public long l62009;
+    public long l62010;
+    public long l62011;
+    public long l62012;
+    public long l62013;
+    public long l62014;
+    public long l62015;
+    public long l62016;
+    public long l62017;
+    public long l62018;
+    public long l62019;
+    public long l62020;
+    public long l62021;
+    public long l62022;
+    public long l62023;
+    public long l62024;
+    public long l62025;
+    public long l62026;
+    public long l62027;
+    public long l62028;
+    public long l62029;
+    public long l62030;
+    public long l62031;
+    public long l62032;
+    public long l62033;
+    public long l62034;
+    public long l62035;
+    public long l62036;
+    public long l62037;
+    public long l62038;
+    public long l62039;
+    public long l62040;
+    public long l62041;
+    public long l62042;
+    public long l62043;
+    public long l62044;
+    public long l62045;
+    public long l62046;
+    public long l62047;
+    public long l62048;
+    public long l62049;
+    public long l62050;
+    public long l62051;
+    public long l62052;
+    public long l62053;
+    public long l62054;
+    public long l62055;
+    public long l62056;
+    public long l62057;
+    public long l62058;
+    public long l62059;
+    public long l62060;
+    public long l62061;
+    public long l62062;
+    public long l62063;
+    public long l62064;
+    public long l62065;
+    public long l62066;
+    public long l62067;
+    public long l62068;
+    public long l62069;
+    public long l62070;
+    public long l62071;
+    public long l62072;
+    public long l62073;
+    public long l62074;
+    public long l62075;
+    public long l62076;
+    public long l62077;
+    public long l62078;
+    public long l62079;
+    public long l62080;
+    public long l62081;
+    public long l62082;
+    public long l62083;
+    public long l62084;
+    public long l62085;
+    public long l62086;
+    public long l62087;
+    public long l62088;
+    public long l62089;
+    public long l62090;
+    public long l62091;
+    public long l62092;
+    public long l62093;
+    public long l62094;
+    public long l62095;
+    public long l62096;
+    public long l62097;
+    public long l62098;
+    public long l62099;
+    public long l62100;
+    public long l62101;
+    public long l62102;
+    public long l62103;
+    public long l62104;
+    public long l62105;
+    public long l62106;
+    public long l62107;
+    public long l62108;
+    public long l62109;
+    public long l62110;
+    public long l62111;
+    public long l62112;
+    public long l62113;
+    public long l62114;
+    public long l62115;
+    public long l62116;
+    public long l62117;
+    public long l62118;
+    public long l62119;
+    public long l62120;
+    public long l62121;
+    public long l62122;
+    public long l62123;
+    public long l62124;
+    public long l62125;
+    public long l62126;
+    public long l62127;
+    public long l62128;
+    public long l62129;
+    public long l62130;
+    public long l62131;
+    public long l62132;
+    public long l62133;
+    public long l62134;
+    public long l62135;
+    public long l62136;
+    public long l62137;
+    public long l62138;
+    public long l62139;
+    public long l62140;
+    public long l62141;
+    public long l62142;
+    public long l62143;
+    public long l62144;
+    public long l62145;
+    public long l62146;
+    public long l62147;
+    public long l62148;
+    public long l62149;
+    public long l62150;
+    public long l62151;
+    public long l62152;
+    public long l62153;
+    public long l62154;
+    public long l62155;
+    public long l62156;
+    public long l62157;
+    public long l62158;
+    public long l62159;
+    public long l62160;
+    public long l62161;
+    public long l62162;
+    public long l62163;
+    public long l62164;
+    public long l62165;
+    public long l62166;
+    public long l62167;
+    public long l62168;
+    public long l62169;
+    public long l62170;
+    public long l62171;
+    public long l62172;
+    public long l62173;
+    public long l62174;
+    public long l62175;
+    public long l62176;
+    public long l62177;
+    public long l62178;
+    public long l62179;
+    public long l62180;
+    public long l62181;
+    public long l62182;
+    public long l62183;
+    public long l62184;
+    public long l62185;
+    public long l62186;
+    public long l62187;
+    public long l62188;
+    public long l62189;
+    public long l62190;
+    public long l62191;
+    public long l62192;
+    public long l62193;
+    public long l62194;
+    public long l62195;
+    public long l62196;
+    public long l62197;
+    public long l62198;
+    public long l62199;
+    public long l62200;
+    public long l62201;
+    public long l62202;
+    public long l62203;
+    public long l62204;
+    public long l62205;
+    public long l62206;
+    public long l62207;
+    public long l62208;
+    public long l62209;
+    public long l62210;
+    public long l62211;
+    public long l62212;
+    public long l62213;
+    public long l62214;
+    public long l62215;
+    public long l62216;
+    public long l62217;
+    public long l62218;
+    public long l62219;
+    public long l62220;
+    public long l62221;
+    public long l62222;
+    public long l62223;
+    public long l62224;
+    public long l62225;
+    public long l62226;
+    public long l62227;
+    public long l62228;
+    public long l62229;
+    public long l62230;
+    public long l62231;
+    public long l62232;
+    public long l62233;
+    public long l62234;
+    public long l62235;
+    public long l62236;
+    public long l62237;
+    public long l62238;
+    public long l62239;
+    public long l62240;
+    public long l62241;
+    public long l62242;
+    public long l62243;
+    public long l62244;
+    public long l62245;
+    public long l62246;
+    public long l62247;
+    public long l62248;
+    public long l62249;
+    public long l62250;
+    public long l62251;
+    public long l62252;
+    public long l62253;
+    public long l62254;
+    public long l62255;
+    public long l62256;
+    public long l62257;
+    public long l62258;
+    public long l62259;
+    public long l62260;
+    public long l62261;
+    public long l62262;
+    public long l62263;
+    public long l62264;
+    public long l62265;
+    public long l62266;
+    public long l62267;
+    public long l62268;
+    public long l62269;
+    public long l62270;
+    public long l62271;
+    public long l62272;
+    public long l62273;
+    public long l62274;
+    public long l62275;
+    public long l62276;
+    public long l62277;
+    public long l62278;
+    public long l62279;
+    public long l62280;
+    public long l62281;
+    public long l62282;
+    public long l62283;
+    public long l62284;
+    public long l62285;
+    public long l62286;
+    public long l62287;
+    public long l62288;
+    public long l62289;
+    public long l62290;
+    public long l62291;
+    public long l62292;
+    public long l62293;
+    public long l62294;
+    public long l62295;
+    public long l62296;
+    public long l62297;
+    public long l62298;
+    public long l62299;
+    public long l62300;
+    public long l62301;
+    public long l62302;
+    public long l62303;
+    public long l62304;
+    public long l62305;
+    public long l62306;
+    public long l62307;
+    public long l62308;
+    public long l62309;
+    public long l62310;
+    public long l62311;
+    public long l62312;
+    public long l62313;
+    public long l62314;
+    public long l62315;
+    public long l62316;
+    public long l62317;
+    public long l62318;
+    public long l62319;
+    public long l62320;
+    public long l62321;
+    public long l62322;
+    public long l62323;
+    public long l62324;
+    public long l62325;
+    public long l62326;
+    public long l62327;
+    public long l62328;
+    public long l62329;
+    public long l62330;
+    public long l62331;
+    public long l62332;
+    public long l62333;
+    public long l62334;
+    public long l62335;
+    public long l62336;
+    public long l62337;
+    public long l62338;
+    public long l62339;
+    public long l62340;
+    public long l62341;
+    public long l62342;
+    public long l62343;
+    public long l62344;
+    public long l62345;
+    public long l62346;
+    public long l62347;
+    public long l62348;
+    public long l62349;
+    public long l62350;
+    public long l62351;
+    public long l62352;
+    public long l62353;
+    public long l62354;
+    public long l62355;
+    public long l62356;
+    public long l62357;
+    public long l62358;
+    public long l62359;
+    public long l62360;
+    public long l62361;
+    public long l62362;
+    public long l62363;
+    public long l62364;
+    public long l62365;
+    public long l62366;
+    public long l62367;
+    public long l62368;
+    public long l62369;
+    public long l62370;
+    public long l62371;
+    public long l62372;
+    public long l62373;
+    public long l62374;
+    public long l62375;
+    public long l62376;
+    public long l62377;
+    public long l62378;
+    public long l62379;
+    public long l62380;
+    public long l62381;
+    public long l62382;
+    public long l62383;
+    public long l62384;
+    public long l62385;
+    public long l62386;
+    public long l62387;
+    public long l62388;
+    public long l62389;
+    public long l62390;
+    public long l62391;
+    public long l62392;
+    public long l62393;
+    public long l62394;
+    public long l62395;
+    public long l62396;
+    public long l62397;
+    public long l62398;
+    public long l62399;
+    public long l62400;
+    public long l62401;
+    public long l62402;
+    public long l62403;
+    public long l62404;
+    public long l62405;
+    public long l62406;
+    public long l62407;
+    public long l62408;
+    public long l62409;
+    public long l62410;
+    public long l62411;
+    public long l62412;
+    public long l62413;
+    public long l62414;
+    public long l62415;
+    public long l62416;
+    public long l62417;
+    public long l62418;
+    public long l62419;
+    public long l62420;
+    public long l62421;
+    public long l62422;
+    public long l62423;
+    public long l62424;
+    public long l62425;
+    public long l62426;
+    public long l62427;
+    public long l62428;
+    public long l62429;
+    public long l62430;
+    public long l62431;
+    public long l62432;
+    public long l62433;
+    public long l62434;
+    public long l62435;
+    public long l62436;
+    public long l62437;
+    public long l62438;
+    public long l62439;
+    public long l62440;
+    public long l62441;
+    public long l62442;
+    public long l62443;
+    public long l62444;
+    public long l62445;
+    public long l62446;
+    public long l62447;
+    public long l62448;
+    public long l62449;
+    public long l62450;
+    public long l62451;
+    public long l62452;
+    public long l62453;
+    public long l62454;
+    public long l62455;
+    public long l62456;
+    public long l62457;
+    public long l62458;
+    public long l62459;
+    public long l62460;
+    public long l62461;
+    public long l62462;
+    public long l62463;
+    public long l62464;
+    public long l62465;
+    public long l62466;
+    public long l62467;
+    public long l62468;
+    public long l62469;
+    public long l62470;
+    public long l62471;
+    public long l62472;
+    public long l62473;
+    public long l62474;
+    public long l62475;
+    public long l62476;
+    public long l62477;
+    public long l62478;
+    public long l62479;
+    public long l62480;
+    public long l62481;
+    public long l62482;
+    public long l62483;
+    public long l62484;
+    public long l62485;
+    public long l62486;
+    public long l62487;
+    public long l62488;
+    public long l62489;
+    public long l62490;
+    public long l62491;
+    public long l62492;
+    public long l62493;
+    public long l62494;
+    public long l62495;
+    public long l62496;
+    public long l62497;
+    public long l62498;
+    public long l62499;
+    public long l62500;
+    public long l62501;
+    public long l62502;
+    public long l62503;
+    public long l62504;
+    public long l62505;
+    public long l62506;
+    public long l62507;
+    public long l62508;
+    public long l62509;
+    public long l62510;
+    public long l62511;
+    public long l62512;
+    public long l62513;
+    public long l62514;
+    public long l62515;
+    public long l62516;
+    public long l62517;
+    public long l62518;
+    public long l62519;
+    public long l62520;
+    public long l62521;
+    public long l62522;
+    public long l62523;
+    public long l62524;
+    public long l62525;
+    public long l62526;
+    public long l62527;
+    public long l62528;
+    public long l62529;
+    public long l62530;
+    public long l62531;
+    public long l62532;
+    public long l62533;
+    public long l62534;
+    public long l62535;
+    public long l62536;
+    public long l62537;
+    public long l62538;
+    public long l62539;
+    public long l62540;
+    public long l62541;
+    public long l62542;
+    public long l62543;
+    public long l62544;
+    public long l62545;
+    public long l62546;
+    public long l62547;
+    public long l62548;
+    public long l62549;
+    public long l62550;
+    public long l62551;
+    public long l62552;
+    public long l62553;
+    public long l62554;
+    public long l62555;
+    public long l62556;
+    public long l62557;
+    public long l62558;
+    public long l62559;
+    public long l62560;
+    public long l62561;
+    public long l62562;
+    public long l62563;
+    public long l62564;
+    public long l62565;
+    public long l62566;
+    public long l62567;
+    public long l62568;
+    public long l62569;
+    public long l62570;
+    public long l62571;
+    public long l62572;
+    public long l62573;
+    public long l62574;
+    public long l62575;
+    public long l62576;
+    public long l62577;
+    public long l62578;
+    public long l62579;
+    public long l62580;
+    public long l62581;
+    public long l62582;
+    public long l62583;
+    public long l62584;
+    public long l62585;
+    public long l62586;
+    public long l62587;
+    public long l62588;
+    public long l62589;
+    public long l62590;
+    public long l62591;
+    public long l62592;
+    public long l62593;
+    public long l62594;
+    public long l62595;
+    public long l62596;
+    public long l62597;
+    public long l62598;
+    public long l62599;
+    public long l62600;
+    public long l62601;
+    public long l62602;
+    public long l62603;
+    public long l62604;
+    public long l62605;
+    public long l62606;
+    public long l62607;
+    public long l62608;
+    public long l62609;
+    public long l62610;
+    public long l62611;
+    public long l62612;
+    public long l62613;
+    public long l62614;
+    public long l62615;
+    public long l62616;
+    public long l62617;
+    public long l62618;
+    public long l62619;
+    public long l62620;
+    public long l62621;
+    public long l62622;
+    public long l62623;
+    public long l62624;
+    public long l62625;
+    public long l62626;
+    public long l62627;
+    public long l62628;
+    public long l62629;
+    public long l62630;
+    public long l62631;
+    public long l62632;
+    public long l62633;
+    public long l62634;
+    public long l62635;
+    public long l62636;
+    public long l62637;
+    public long l62638;
+    public long l62639;
+    public long l62640;
+    public long l62641;
+    public long l62642;
+    public long l62643;
+    public long l62644;
+    public long l62645;
+    public long l62646;
+    public long l62647;
+    public long l62648;
+    public long l62649;
+    public long l62650;
+    public long l62651;
+    public long l62652;
+    public long l62653;
+    public long l62654;
+    public long l62655;
+    public long l62656;
+    public long l62657;
+    public long l62658;
+    public long l62659;
+    public long l62660;
+    public long l62661;
+    public long l62662;
+    public long l62663;
+    public long l62664;
+    public long l62665;
+    public long l62666;
+    public long l62667;
+    public long l62668;
+    public long l62669;
+    public long l62670;
+    public long l62671;
+    public long l62672;
+    public long l62673;
+    public long l62674;
+    public long l62675;
+    public long l62676;
+    public long l62677;
+    public long l62678;
+    public long l62679;
+    public long l62680;
+    public long l62681;
+    public long l62682;
+    public long l62683;
+    public long l62684;
+    public long l62685;
+    public long l62686;
+    public long l62687;
+    public long l62688;
+    public long l62689;
+    public long l62690;
+    public long l62691;
+    public long l62692;
+    public long l62693;
+    public long l62694;
+    public long l62695;
+    public long l62696;
+    public long l62697;
+    public long l62698;
+    public long l62699;
+    public long l62700;
+    public long l62701;
+    public long l62702;
+    public long l62703;
+    public long l62704;
+    public long l62705;
+    public long l62706;
+    public long l62707;
+    public long l62708;
+    public long l62709;
+    public long l62710;
+    public long l62711;
+    public long l62712;
+    public long l62713;
+    public long l62714;
+    public long l62715;
+    public long l62716;
+    public long l62717;
+    public long l62718;
+    public long l62719;
+    public long l62720;
+    public long l62721;
+    public long l62722;
+    public long l62723;
+    public long l62724;
+    public long l62725;
+    public long l62726;
+    public long l62727;
+    public long l62728;
+    public long l62729;
+    public long l62730;
+    public long l62731;
+    public long l62732;
+    public long l62733;
+    public long l62734;
+    public long l62735;
+    public long l62736;
+    public long l62737;
+    public long l62738;
+    public long l62739;
+    public long l62740;
+    public long l62741;
+    public long l62742;
+    public long l62743;
+    public long l62744;
+    public long l62745;
+    public long l62746;
+    public long l62747;
+    public long l62748;
+    public long l62749;
+    public long l62750;
+    public long l62751;
+    public long l62752;
+    public long l62753;
+    public long l62754;
+    public long l62755;
+    public long l62756;
+    public long l62757;
+    public long l62758;
+    public long l62759;
+    public long l62760;
+    public long l62761;
+    public long l62762;
+    public long l62763;
+    public long l62764;
+    public long l62765;
+    public long l62766;
+    public long l62767;
+    public long l62768;
+    public long l62769;
+    public long l62770;
+    public long l62771;
+    public long l62772;
+    public long l62773;
+    public long l62774;
+    public long l62775;
+    public long l62776;
+    public long l62777;
+    public long l62778;
+    public long l62779;
+    public long l62780;
+    public long l62781;
+    public long l62782;
+    public long l62783;
+    public long l62784;
+    public long l62785;
+    public long l62786;
+    public long l62787;
+    public long l62788;
+    public long l62789;
+    public long l62790;
+    public long l62791;
+    public long l62792;
+    public long l62793;
+    public long l62794;
+    public long l62795;
+    public long l62796;
+    public long l62797;
+    public long l62798;
+    public long l62799;
+    public long l62800;
+    public long l62801;
+    public long l62802;
+    public long l62803;
+    public long l62804;
+    public long l62805;
+    public long l62806;
+    public long l62807;
+    public long l62808;
+    public long l62809;
+    public long l62810;
+    public long l62811;
+    public long l62812;
+    public long l62813;
+    public long l62814;
+    public long l62815;
+    public long l62816;
+    public long l62817;
+    public long l62818;
+    public long l62819;
+    public long l62820;
+    public long l62821;
+    public long l62822;
+    public long l62823;
+    public long l62824;
+    public long l62825;
+    public long l62826;
+    public long l62827;
+    public long l62828;
+    public long l62829;
+    public long l62830;
+    public long l62831;
+    public long l62832;
+    public long l62833;
+    public long l62834;
+    public long l62835;
+    public long l62836;
+    public long l62837;
+    public long l62838;
+    public long l62839;
+    public long l62840;
+    public long l62841;
+    public long l62842;
+    public long l62843;
+    public long l62844;
+    public long l62845;
+    public long l62846;
+    public long l62847;
+    public long l62848;
+    public long l62849;
+    public long l62850;
+    public long l62851;
+    public long l62852;
+    public long l62853;
+    public long l62854;
+    public long l62855;
+    public long l62856;
+    public long l62857;
+    public long l62858;
+    public long l62859;
+    public long l62860;
+    public long l62861;
+    public long l62862;
+    public long l62863;
+    public long l62864;
+    public long l62865;
+    public long l62866;
+    public long l62867;
+    public long l62868;
+    public long l62869;
+    public long l62870;
+    public long l62871;
+    public long l62872;
+    public long l62873;
+    public long l62874;
+    public long l62875;
+    public long l62876;
+    public long l62877;
+    public long l62878;
+    public long l62879;
+    public long l62880;
+    public long l62881;
+    public long l62882;
+    public long l62883;
+    public long l62884;
+    public long l62885;
+    public long l62886;
+    public long l62887;
+    public long l62888;
+    public long l62889;
+    public long l62890;
+    public long l62891;
+    public long l62892;
+    public long l62893;
+    public long l62894;
+    public long l62895;
+    public long l62896;
+    public long l62897;
+    public long l62898;
+    public long l62899;
+    public long l62900;
+    public long l62901;
+    public long l62902;
+    public long l62903;
+    public long l62904;
+    public long l62905;
+    public long l62906;
+    public long l62907;
+    public long l62908;
+    public long l62909;
+    public long l62910;
+    public long l62911;
+    public long l62912;
+    public long l62913;
+    public long l62914;
+    public long l62915;
+    public long l62916;
+    public long l62917;
+    public long l62918;
+    public long l62919;
+    public long l62920;
+    public long l62921;
+    public long l62922;
+    public long l62923;
+    public long l62924;
+    public long l62925;
+    public long l62926;
+    public long l62927;
+    public long l62928;
+    public long l62929;
+    public long l62930;
+    public long l62931;
+    public long l62932;
+    public long l62933;
+    public long l62934;
+    public long l62935;
+    public long l62936;
+    public long l62937;
+    public long l62938;
+    public long l62939;
+    public long l62940;
+    public long l62941;
+    public long l62942;
+    public long l62943;
+    public long l62944;
+    public long l62945;
+    public long l62946;
+    public long l62947;
+    public long l62948;
+    public long l62949;
+    public long l62950;
+    public long l62951;
+    public long l62952;
+    public long l62953;
+    public long l62954;
+    public long l62955;
+    public long l62956;
+    public long l62957;
+    public long l62958;
+    public long l62959;
+    public long l62960;
+    public long l62961;
+    public long l62962;
+    public long l62963;
+    public long l62964;
+    public long l62965;
+    public long l62966;
+    public long l62967;
+    public long l62968;
+    public long l62969;
+    public long l62970;
+    public long l62971;
+    public long l62972;
+    public long l62973;
+    public long l62974;
+    public long l62975;
+    public long l62976;
+    public long l62977;
+    public long l62978;
+    public long l62979;
+    public long l62980;
+    public long l62981;
+    public long l62982;
+    public long l62983;
+    public long l62984;
+    public long l62985;
+    public long l62986;
+    public long l62987;
+    public long l62988;
+    public long l62989;
+    public long l62990;
+    public long l62991;
+    public long l62992;
+    public long l62993;
+    public long l62994;
+    public long l62995;
+    public long l62996;
+    public long l62997;
+    public long l62998;
+    public long l62999;
+    public long l63000;
+    public long l63001;
+    public long l63002;
+    public long l63003;
+    public long l63004;
+    public long l63005;
+    public long l63006;
+    public long l63007;
+    public long l63008;
+    public long l63009;
+    public long l63010;
+    public long l63011;
+    public long l63012;
+    public long l63013;
+    public long l63014;
+    public long l63015;
+    public long l63016;
+    public long l63017;
+    public long l63018;
+    public long l63019;
+    public long l63020;
+    public long l63021;
+    public long l63022;
+    public long l63023;
+    public long l63024;
+    public long l63025;
+    public long l63026;
+    public long l63027;
+    public long l63028;
+    public long l63029;
+    public long l63030;
+    public long l63031;
+    public long l63032;
+    public long l63033;
+    public long l63034;
+    public long l63035;
+    public long l63036;
+    public long l63037;
+    public long l63038;
+    public long l63039;
+    public long l63040;
+    public long l63041;
+    public long l63042;
+    public long l63043;
+    public long l63044;
+    public long l63045;
+    public long l63046;
+    public long l63047;
+    public long l63048;
+    public long l63049;
+    public long l63050;
+    public long l63051;
+    public long l63052;
+    public long l63053;
+    public long l63054;
+    public long l63055;
+    public long l63056;
+    public long l63057;
+    public long l63058;
+    public long l63059;
+    public long l63060;
+    public long l63061;
+    public long l63062;
+    public long l63063;
+    public long l63064;
+    public long l63065;
+    public long l63066;
+    public long l63067;
+    public long l63068;
+    public long l63069;
+    public long l63070;
+    public long l63071;
+    public long l63072;
+    public long l63073;
+    public long l63074;
+    public long l63075;
+    public long l63076;
+    public long l63077;
+    public long l63078;
+    public long l63079;
+    public long l63080;
+    public long l63081;
+    public long l63082;
+    public long l63083;
+    public long l63084;
+    public long l63085;
+    public long l63086;
+    public long l63087;
+    public long l63088;
+    public long l63089;
+    public long l63090;
+    public long l63091;
+    public long l63092;
+    public long l63093;
+    public long l63094;
+    public long l63095;
+    public long l63096;
+    public long l63097;
+    public long l63098;
+    public long l63099;
+    public long l63100;
+    public long l63101;
+    public long l63102;
+    public long l63103;
+    public long l63104;
+    public long l63105;
+    public long l63106;
+    public long l63107;
+    public long l63108;
+    public long l63109;
+    public long l63110;
+    public long l63111;
+    public long l63112;
+    public long l63113;
+    public long l63114;
+    public long l63115;
+    public long l63116;
+    public long l63117;
+    public long l63118;
+    public long l63119;
+    public long l63120;
+    public long l63121;
+    public long l63122;
+    public long l63123;
+    public long l63124;
+    public long l63125;
+    public long l63126;
+    public long l63127;
+    public long l63128;
+    public long l63129;
+    public long l63130;
+    public long l63131;
+    public long l63132;
+    public long l63133;
+    public long l63134;
+    public long l63135;
+    public long l63136;
+    public long l63137;
+    public long l63138;
+    public long l63139;
+    public long l63140;
+    public long l63141;
+    public long l63142;
+    public long l63143;
+    public long l63144;
+    public long l63145;
+    public long l63146;
+    public long l63147;
+    public long l63148;
+    public long l63149;
+    public long l63150;
+    public long l63151;
+    public long l63152;
+    public long l63153;
+    public long l63154;
+    public long l63155;
+    public long l63156;
+    public long l63157;
+    public long l63158;
+    public long l63159;
+    public long l63160;
+    public long l63161;
+    public long l63162;
+    public long l63163;
+    public long l63164;
+    public long l63165;
+    public long l63166;
+    public long l63167;
+    public long l63168;
+    public long l63169;
+    public long l63170;
+    public long l63171;
+    public long l63172;
+    public long l63173;
+    public long l63174;
+    public long l63175;
+    public long l63176;
+    public long l63177;
+    public long l63178;
+    public long l63179;
+    public long l63180;
+    public long l63181;
+    public long l63182;
+    public long l63183;
+    public long l63184;
+    public long l63185;
+    public long l63186;
+    public long l63187;
+    public long l63188;
+    public long l63189;
+    public long l63190;
+    public long l63191;
+    public long l63192;
+    public long l63193;
+    public long l63194;
+    public long l63195;
+    public long l63196;
+    public long l63197;
+    public long l63198;
+    public long l63199;
+    public long l63200;
+    public long l63201;
+    public long l63202;
+    public long l63203;
+    public long l63204;
+    public long l63205;
+    public long l63206;
+    public long l63207;
+    public long l63208;
+    public long l63209;
+    public long l63210;
+    public long l63211;
+    public long l63212;
+    public long l63213;
+    public long l63214;
+    public long l63215;
+    public long l63216;
+    public long l63217;
+    public long l63218;
+    public long l63219;
+    public long l63220;
+    public long l63221;
+    public long l63222;
+    public long l63223;
+    public long l63224;
+    public long l63225;
+    public long l63226;
+    public long l63227;
+    public long l63228;
+    public long l63229;
+    public long l63230;
+    public long l63231;
+    public long l63232;
+    public long l63233;
+    public long l63234;
+    public long l63235;
+    public long l63236;
+    public long l63237;
+    public long l63238;
+    public long l63239;
+    public long l63240;
+    public long l63241;
+    public long l63242;
+    public long l63243;
+    public long l63244;
+    public long l63245;
+    public long l63246;
+    public long l63247;
+    public long l63248;
+    public long l63249;
+    public long l63250;
+    public long l63251;
+    public long l63252;
+    public long l63253;
+    public long l63254;
+    public long l63255;
+    public long l63256;
+    public long l63257;
+    public long l63258;
+    public long l63259;
+    public long l63260;
+    public long l63261;
+    public long l63262;
+    public long l63263;
+    public long l63264;
+    public long l63265;
+    public long l63266;
+    public long l63267;
+    public long l63268;
+    public long l63269;
+    public long l63270;
+    public long l63271;
+    public long l63272;
+    public long l63273;
+    public long l63274;
+    public long l63275;
+    public long l63276;
+    public long l63277;
+    public long l63278;
+    public long l63279;
+    public long l63280;
+    public long l63281;
+    public long l63282;
+    public long l63283;
+    public long l63284;
+    public long l63285;
+    public long l63286;
+    public long l63287;
+    public long l63288;
+    public long l63289;
+    public long l63290;
+    public long l63291;
+    public long l63292;
+    public long l63293;
+    public long l63294;
+    public long l63295;
+    public long l63296;
+    public long l63297;
+    public long l63298;
+    public long l63299;
+    public long l63300;
+    public long l63301;
+    public long l63302;
+    public long l63303;
+    public long l63304;
+    public long l63305;
+    public long l63306;
+    public long l63307;
+    public long l63308;
+    public long l63309;
+    public long l63310;
+    public long l63311;
+    public long l63312;
+    public long l63313;
+    public long l63314;
+    public long l63315;
+    public long l63316;
+    public long l63317;
+    public long l63318;
+    public long l63319;
+    public long l63320;
+    public long l63321;
+    public long l63322;
+    public long l63323;
+    public long l63324;
+    public long l63325;
+    public long l63326;
+    public long l63327;
+    public long l63328;
+    public long l63329;
+    public long l63330;
+    public long l63331;
+    public long l63332;
+    public long l63333;
+    public long l63334;
+    public long l63335;
+    public long l63336;
+    public long l63337;
+    public long l63338;
+    public long l63339;
+    public long l63340;
+    public long l63341;
+    public long l63342;
+    public long l63343;
+    public long l63344;
+    public long l63345;
+    public long l63346;
+    public long l63347;
+    public long l63348;
+    public long l63349;
+    public long l63350;
+    public long l63351;
+    public long l63352;
+    public long l63353;
+    public long l63354;
+    public long l63355;
+    public long l63356;
+    public long l63357;
+    public long l63358;
+    public long l63359;
+    public long l63360;
+    public long l63361;
+    public long l63362;
+    public long l63363;
+    public long l63364;
+    public long l63365;
+    public long l63366;
+    public long l63367;
+    public long l63368;
+    public long l63369;
+    public long l63370;
+    public long l63371;
+    public long l63372;
+    public long l63373;
+    public long l63374;
+    public long l63375;
+    public long l63376;
+    public long l63377;
+    public long l63378;
+    public long l63379;
+    public long l63380;
+    public long l63381;
+    public long l63382;
+    public long l63383;
+    public long l63384;
+    public long l63385;
+    public long l63386;
+    public long l63387;
+    public long l63388;
+    public long l63389;
+    public long l63390;
+    public long l63391;
+    public long l63392;
+    public long l63393;
+    public long l63394;
+    public long l63395;
+    public long l63396;
+    public long l63397;
+    public long l63398;
+    public long l63399;
+    public long l63400;
+    public long l63401;
+    public long l63402;
+    public long l63403;
+    public long l63404;
+    public long l63405;
+    public long l63406;
+    public long l63407;
+    public long l63408;
+    public long l63409;
+    public long l63410;
+    public long l63411;
+    public long l63412;
+    public long l63413;
+    public long l63414;
+    public long l63415;
+    public long l63416;
+    public long l63417;
+    public long l63418;
+    public long l63419;
+    public long l63420;
+    public long l63421;
+    public long l63422;
+    public long l63423;
+    public long l63424;
+    public long l63425;
+    public long l63426;
+    public long l63427;
+    public long l63428;
+    public long l63429;
+    public long l63430;
+    public long l63431;
+    public long l63432;
+    public long l63433;
+    public long l63434;
+    public long l63435;
+    public long l63436;
+    public long l63437;
+    public long l63438;
+    public long l63439;
+    public long l63440;
+    public long l63441;
+    public long l63442;
+    public long l63443;
+    public long l63444;
+    public long l63445;
+    public long l63446;
+    public long l63447;
+    public long l63448;
+    public long l63449;
+    public long l63450;
+    public long l63451;
+    public long l63452;
+    public long l63453;
+    public long l63454;
+    public long l63455;
+    public long l63456;
+    public long l63457;
+    public long l63458;
+    public long l63459;
+    public long l63460;
+    public long l63461;
+    public long l63462;
+    public long l63463;
+    public long l63464;
+    public long l63465;
+    public long l63466;
+    public long l63467;
+    public long l63468;
+    public long l63469;
+    public long l63470;
+    public long l63471;
+    public long l63472;
+    public long l63473;
+    public long l63474;
+    public long l63475;
+    public long l63476;
+    public long l63477;
+    public long l63478;
+    public long l63479;
+    public long l63480;
+    public long l63481;
+    public long l63482;
+    public long l63483;
+    public long l63484;
+    public long l63485;
+    public long l63486;
+    public long l63487;
+    public long l63488;
+    public long l63489;
+    public long l63490;
+    public long l63491;
+    public long l63492;
+    public long l63493;
+    public long l63494;
+    public long l63495;
+    public long l63496;
+    public long l63497;
+    public long l63498;
+    public long l63499;
+    public long l63500;
+    public long l63501;
+    public long l63502;
+    public long l63503;
+    public long l63504;
+    public long l63505;
+    public long l63506;
+    public long l63507;
+    public long l63508;
+    public long l63509;
+    public long l63510;
+    public long l63511;
+    public long l63512;
+    public long l63513;
+    public long l63514;
+    public long l63515;
+    public long l63516;
+    public long l63517;
+    public long l63518;
+    public long l63519;
+    public long l63520;
+    public long l63521;
+    public long l63522;
+    public long l63523;
+    public long l63524;
+    public long l63525;
+    public long l63526;
+    public long l63527;
+    public long l63528;
+    public long l63529;
+    public long l63530;
+    public long l63531;
+    public long l63532;
+    public long l63533;
+    public long l63534;
+    public long l63535;
+    public long l63536;
+    public long l63537;
+    public long l63538;
+    public long l63539;
+    public long l63540;
+    public long l63541;
+    public long l63542;
+    public long l63543;
+    public long l63544;
+    public long l63545;
+    public long l63546;
+    public long l63547;
+    public long l63548;
+    public long l63549;
+    public long l63550;
+    public long l63551;
+    public long l63552;
+    public long l63553;
+    public long l63554;
+    public long l63555;
+    public long l63556;
+    public long l63557;
+    public long l63558;
+    public long l63559;
+    public long l63560;
+    public long l63561;
+    public long l63562;
+    public long l63563;
+    public long l63564;
+    public long l63565;
+    public long l63566;
+    public long l63567;
+    public long l63568;
+    public long l63569;
+    public long l63570;
+    public long l63571;
+    public long l63572;
+    public long l63573;
+    public long l63574;
+    public long l63575;
+    public long l63576;
+    public long l63577;
+    public long l63578;
+    public long l63579;
+    public long l63580;
+    public long l63581;
+    public long l63582;
+    public long l63583;
+    public long l63584;
+    public long l63585;
+    public long l63586;
+    public long l63587;
+    public long l63588;
+    public long l63589;
+    public long l63590;
+    public long l63591;
+    public long l63592;
+    public long l63593;
+    public long l63594;
+    public long l63595;
+    public long l63596;
+    public long l63597;
+    public long l63598;
+    public long l63599;
+    public long l63600;
+    public long l63601;
+    public long l63602;
+    public long l63603;
+    public long l63604;
+    public long l63605;
+    public long l63606;
+    public long l63607;
+    public long l63608;
+    public long l63609;
+    public long l63610;
+    public long l63611;
+    public long l63612;
+    public long l63613;
+    public long l63614;
+    public long l63615;
+    public long l63616;
+    public long l63617;
+    public long l63618;
+    public long l63619;
+    public long l63620;
+    public long l63621;
+    public long l63622;
+    public long l63623;
+    public long l63624;
+    public long l63625;
+    public long l63626;
+    public long l63627;
+    public long l63628;
+    public long l63629;
+    public long l63630;
+    public long l63631;
+    public long l63632;
+    public long l63633;
+    public long l63634;
+    public long l63635;
+    public long l63636;
+    public long l63637;
+    public long l63638;
+    public long l63639;
+    public long l63640;
+    public long l63641;
+    public long l63642;
+    public long l63643;
+    public long l63644;
+    public long l63645;
+    public long l63646;
+    public long l63647;
+    public long l63648;
+    public long l63649;
+    public long l63650;
+    public long l63651;
+    public long l63652;
+    public long l63653;
+    public long l63654;
+    public long l63655;
+    public long l63656;
+    public long l63657;
+    public long l63658;
+    public long l63659;
+    public long l63660;
+    public long l63661;
+    public long l63662;
+    public long l63663;
+    public long l63664;
+    public long l63665;
+    public long l63666;
+    public long l63667;
+    public long l63668;
+    public long l63669;
+    public long l63670;
+    public long l63671;
+    public long l63672;
+    public long l63673;
+    public long l63674;
+    public long l63675;
+    public long l63676;
+    public long l63677;
+    public long l63678;
+    public long l63679;
+    public long l63680;
+    public long l63681;
+    public long l63682;
+    public long l63683;
+    public long l63684;
+    public long l63685;
+    public long l63686;
+    public long l63687;
+    public long l63688;
+    public long l63689;
+    public long l63690;
+    public long l63691;
+    public long l63692;
+    public long l63693;
+    public long l63694;
+    public long l63695;
+    public long l63696;
+    public long l63697;
+    public long l63698;
+    public long l63699;
+    public long l63700;
+    public long l63701;
+    public long l63702;
+    public long l63703;
+    public long l63704;
+    public long l63705;
+    public long l63706;
+    public long l63707;
+    public long l63708;
+    public long l63709;
+    public long l63710;
+    public long l63711;
+    public long l63712;
+    public long l63713;
+    public long l63714;
+    public long l63715;
+    public long l63716;
+    public long l63717;
+    public long l63718;
+    public long l63719;
+    public long l63720;
+    public long l63721;
+    public long l63722;
+    public long l63723;
+    public long l63724;
+    public long l63725;
+    public long l63726;
+    public long l63727;
+    public long l63728;
+    public long l63729;
+    public long l63730;
+    public long l63731;
+    public long l63732;
+    public long l63733;
+    public long l63734;
+    public long l63735;
+    public long l63736;
+    public long l63737;
+    public long l63738;
+    public long l63739;
+    public long l63740;
+    public long l63741;
+    public long l63742;
+    public long l63743;
+    public long l63744;
+    public long l63745;
+    public long l63746;
+    public long l63747;
+    public long l63748;
+    public long l63749;
+    public long l63750;
+    public long l63751;
+    public long l63752;
+    public long l63753;
+    public long l63754;
+    public long l63755;
+    public long l63756;
+    public long l63757;
+    public long l63758;
+    public long l63759;
+    public long l63760;
+    public long l63761;
+    public long l63762;
+    public long l63763;
+    public long l63764;
+    public long l63765;
+    public long l63766;
+    public long l63767;
+    public long l63768;
+    public long l63769;
+    public long l63770;
+    public long l63771;
+    public long l63772;
+    public long l63773;
+    public long l63774;
+    public long l63775;
+    public long l63776;
+    public long l63777;
+    public long l63778;
+    public long l63779;
+    public long l63780;
+    public long l63781;
+    public long l63782;
+    public long l63783;
+    public long l63784;
+    public long l63785;
+    public long l63786;
+    public long l63787;
+    public long l63788;
+    public long l63789;
+    public long l63790;
+    public long l63791;
+    public long l63792;
+    public long l63793;
+    public long l63794;
+    public long l63795;
+    public long l63796;
+    public long l63797;
+    public long l63798;
+    public long l63799;
+    public long l63800;
+    public long l63801;
+    public long l63802;
+    public long l63803;
+    public long l63804;
+    public long l63805;
+    public long l63806;
+    public long l63807;
+    public long l63808;
+    public long l63809;
+    public long l63810;
+    public long l63811;
+    public long l63812;
+    public long l63813;
+    public long l63814;
+    public long l63815;
+    public long l63816;
+    public long l63817;
+    public long l63818;
+    public long l63819;
+    public long l63820;
+    public long l63821;
+    public long l63822;
+    public long l63823;
+    public long l63824;
+    public long l63825;
+    public long l63826;
+    public long l63827;
+    public long l63828;
+    public long l63829;
+    public long l63830;
+    public long l63831;
+    public long l63832;
+    public long l63833;
+    public long l63834;
+    public long l63835;
+    public long l63836;
+    public long l63837;
+    public long l63838;
+    public long l63839;
+    public long l63840;
+    public long l63841;
+    public long l63842;
+    public long l63843;
+    public long l63844;
+    public long l63845;
+    public long l63846;
+    public long l63847;
+    public long l63848;
+    public long l63849;
+    public long l63850;
+    public long l63851;
+    public long l63852;
+    public long l63853;
+    public long l63854;
+    public long l63855;
+    public long l63856;
+    public long l63857;
+    public long l63858;
+    public long l63859;
+    public long l63860;
+    public long l63861;
+    public long l63862;
+    public long l63863;
+    public long l63864;
+    public long l63865;
+    public long l63866;
+    public long l63867;
+    public long l63868;
+    public long l63869;
+    public long l63870;
+    public long l63871;
+    public long l63872;
+    public long l63873;
+    public long l63874;
+    public long l63875;
+    public long l63876;
+    public long l63877;
+    public long l63878;
+    public long l63879;
+    public long l63880;
+    public long l63881;
+    public long l63882;
+    public long l63883;
+    public long l63884;
+    public long l63885;
+    public long l63886;
+    public long l63887;
+    public long l63888;
+    public long l63889;
+    public long l63890;
+    public long l63891;
+    public long l63892;
+    public long l63893;
+    public long l63894;
+    public long l63895;
+    public long l63896;
+    public long l63897;
+    public long l63898;
+    public long l63899;
+    public long l63900;
+    public long l63901;
+    public long l63902;
+    public long l63903;
+    public long l63904;
+    public long l63905;
+    public long l63906;
+    public long l63907;
+    public long l63908;
+    public long l63909;
+    public long l63910;
+    public long l63911;
+    public long l63912;
+    public long l63913;
+    public long l63914;
+    public long l63915;
+    public long l63916;
+    public long l63917;
+    public long l63918;
+    public long l63919;
+    public long l63920;
+    public long l63921;
+    public long l63922;
+    public long l63923;
+    public long l63924;
+    public long l63925;
+    public long l63926;
+    public long l63927;
+    public long l63928;
+    public long l63929;
+    public long l63930;
+    public long l63931;
+    public long l63932;
+    public long l63933;
+    public long l63934;
+    public long l63935;
+    public long l63936;
+    public long l63937;
+    public long l63938;
+    public long l63939;
+    public long l63940;
+    public long l63941;
+    public long l63942;
+    public long l63943;
+    public long l63944;
+    public long l63945;
+    public long l63946;
+    public long l63947;
+    public long l63948;
+    public long l63949;
+    public long l63950;
+    public long l63951;
+    public long l63952;
+    public long l63953;
+    public long l63954;
+    public long l63955;
+    public long l63956;
+    public long l63957;
+    public long l63958;
+    public long l63959;
+    public long l63960;
+    public long l63961;
+    public long l63962;
+    public long l63963;
+    public long l63964;
+    public long l63965;
+    public long l63966;
+    public long l63967;
+    public long l63968;
+    public long l63969;
+    public long l63970;
+    public long l63971;
+    public long l63972;
+    public long l63973;
+    public long l63974;
+    public long l63975;
+    public long l63976;
+    public long l63977;
+    public long l63978;
+    public long l63979;
+    public long l63980;
+    public long l63981;
+    public long l63982;
+    public long l63983;
+    public long l63984;
+    public long l63985;
+    public long l63986;
+    public long l63987;
+    public long l63988;
+    public long l63989;
+    public long l63990;
+    public long l63991;
+    public long l63992;
+    public long l63993;
+    public long l63994;
+    public long l63995;
+    public long l63996;
+    public long l63997;
+    public long l63998;
+    public long l63999;
+    public long l64000;
+    public long l64001;
+    public long l64002;
+    public long l64003;
+    public long l64004;
+    public long l64005;
+    public long l64006;
+    public long l64007;
+    public long l64008;
+    public long l64009;
+    public long l64010;
+    public long l64011;
+    public long l64012;
+    public long l64013;
+    public long l64014;
+    public long l64015;
+    public long l64016;
+    public long l64017;
+    public long l64018;
+    public long l64019;
+    public long l64020;
+    public long l64021;
+    public long l64022;
+    public long l64023;
+    public long l64024;
+    public long l64025;
+    public long l64026;
+    public long l64027;
+    public long l64028;
+    public long l64029;
+    public long l64030;
+    public long l64031;
+    public long l64032;
+    public long l64033;
+    public long l64034;
+    public long l64035;
+    public long l64036;
+    public long l64037;
+    public long l64038;
+    public long l64039;
+    public long l64040;
+    public long l64041;
+    public long l64042;
+    public long l64043;
+    public long l64044;
+    public long l64045;
+    public long l64046;
+    public long l64047;
+    public long l64048;
+    public long l64049;
+    public long l64050;
+    public long l64051;
+    public long l64052;
+    public long l64053;
+    public long l64054;
+    public long l64055;
+    public long l64056;
+    public long l64057;
+    public long l64058;
+    public long l64059;
+    public long l64060;
+    public long l64061;
+    public long l64062;
+    public long l64063;
+    public long l64064;
+    public long l64065;
+    public long l64066;
+    public long l64067;
+    public long l64068;
+    public long l64069;
+    public long l64070;
+    public long l64071;
+    public long l64072;
+    public long l64073;
+    public long l64074;
+    public long l64075;
+    public long l64076;
+    public long l64077;
+    public long l64078;
+    public long l64079;
+    public long l64080;
+    public long l64081;
+    public long l64082;
+    public long l64083;
+    public long l64084;
+    public long l64085;
+    public long l64086;
+    public long l64087;
+    public long l64088;
+    public long l64089;
+    public long l64090;
+    public long l64091;
+    public long l64092;
+    public long l64093;
+    public long l64094;
+    public long l64095;
+    public long l64096;
+    public long l64097;
+    public long l64098;
+    public long l64099;
+    public long l64100;
+    public long l64101;
+    public long l64102;
+    public long l64103;
+    public long l64104;
+    public long l64105;
+    public long l64106;
+    public long l64107;
+    public long l64108;
+    public long l64109;
+    public long l64110;
+    public long l64111;
+    public long l64112;
+    public long l64113;
+    public long l64114;
+    public long l64115;
+    public long l64116;
+    public long l64117;
+    public long l64118;
+    public long l64119;
+    public long l64120;
+    public long l64121;
+    public long l64122;
+    public long l64123;
+    public long l64124;
+    public long l64125;
+    public long l64126;
+    public long l64127;
+    public long l64128;
+    public long l64129;
+    public long l64130;
+    public long l64131;
+    public long l64132;
+    public long l64133;
+    public long l64134;
+    public long l64135;
+    public long l64136;
+    public long l64137;
+    public long l64138;
+    public long l64139;
+    public long l64140;
+    public long l64141;
+    public long l64142;
+    public long l64143;
+    public long l64144;
+    public long l64145;
+    public long l64146;
+    public long l64147;
+    public long l64148;
+    public long l64149;
+    public long l64150;
+    public long l64151;
+    public long l64152;
+    public long l64153;
+    public long l64154;
+    public long l64155;
+    public long l64156;
+    public long l64157;
+    public long l64158;
+    public long l64159;
+    public long l64160;
+    public long l64161;
+    public long l64162;
+    public long l64163;
+    public long l64164;
+    public long l64165;
+    public long l64166;
+    public long l64167;
+    public long l64168;
+    public long l64169;
+    public long l64170;
+    public long l64171;
+    public long l64172;
+    public long l64173;
+    public long l64174;
+    public long l64175;
+    public long l64176;
+    public long l64177;
+    public long l64178;
+    public long l64179;
+    public long l64180;
+    public long l64181;
+    public long l64182;
+    public long l64183;
+    public long l64184;
+    public long l64185;
+    public long l64186;
+    public long l64187;
+    public long l64188;
+    public long l64189;
+    public long l64190;
+    public long l64191;
+    public long l64192;
+    public long l64193;
+    public long l64194;
+    public long l64195;
+    public long l64196;
+    public long l64197;
+    public long l64198;
+    public long l64199;
+    public long l64200;
+    public long l64201;
+    public long l64202;
+    public long l64203;
+    public long l64204;
+    public long l64205;
+    public long l64206;
+    public long l64207;
+    public long l64208;
+    public long l64209;
+    public long l64210;
+    public long l64211;
+    public long l64212;
+    public long l64213;
+    public long l64214;
+    public long l64215;
+    public long l64216;
+    public long l64217;
+    public long l64218;
+    public long l64219;
+    public long l64220;
+    public long l64221;
+    public long l64222;
+    public long l64223;
+    public long l64224;
+    public long l64225;
+    public long l64226;
+    public long l64227;
+    public long l64228;
+    public long l64229;
+    public long l64230;
+    public long l64231;
+    public long l64232;
+    public long l64233;
+    public long l64234;
+    public long l64235;
+    public long l64236;
+    public long l64237;
+    public long l64238;
+    public long l64239;
+    public long l64240;
+    public long l64241;
+    public long l64242;
+    public long l64243;
+    public long l64244;
+    public long l64245;
+    public long l64246;
+    public long l64247;
+    public long l64248;
+    public long l64249;
+    public long l64250;
+    public long l64251;
+    public long l64252;
+    public long l64253;
+    public long l64254;
+    public long l64255;
+    public long l64256;
+    public long l64257;
+    public long l64258;
+    public long l64259;
+    public long l64260;
+    public long l64261;
+    public long l64262;
+    public long l64263;
+    public long l64264;
+    public long l64265;
+    public long l64266;
+    public long l64267;
+    public long l64268;
+    public long l64269;
+    public long l64270;
+    public long l64271;
+    public long l64272;
+    public long l64273;
+    public long l64274;
+    public long l64275;
+    public long l64276;
+    public long l64277;
+    public long l64278;
+    public long l64279;
+    public long l64280;
+    public long l64281;
+    public long l64282;
+    public long l64283;
+    public long l64284;
+    public long l64285;
+    public long l64286;
+    public long l64287;
+    public long l64288;
+    public long l64289;
+    public long l64290;
+    public long l64291;
+    public long l64292;
+    public long l64293;
+    public long l64294;
+    public long l64295;
+    public long l64296;
+    public long l64297;
+    public long l64298;
+    public long l64299;
+    public long l64300;
+    public long l64301;
+    public long l64302;
+    public long l64303;
+    public long l64304;
+    public long l64305;
+    public long l64306;
+    public long l64307;
+    public long l64308;
+    public long l64309;
+    public long l64310;
+    public long l64311;
+    public long l64312;
+    public long l64313;
+    public long l64314;
+    public long l64315;
+    public long l64316;
+    public long l64317;
+    public long l64318;
+    public long l64319;
+    public long l64320;
+    public long l64321;
+    public long l64322;
+    public long l64323;
+    public long l64324;
+    public long l64325;
+    public long l64326;
+    public long l64327;
+    public long l64328;
+    public long l64329;
+    public long l64330;
+    public long l64331;
+    public long l64332;
+    public long l64333;
+    public long l64334;
+    public long l64335;
+    public long l64336;
+    public long l64337;
+    public long l64338;
+    public long l64339;
+    public long l64340;
+    public long l64341;
+    public long l64342;
+    public long l64343;
+    public long l64344;
+    public long l64345;
+    public long l64346;
+    public long l64347;
+    public long l64348;
+    public long l64349;
+    public long l64350;
+    public long l64351;
+    public long l64352;
+    public long l64353;
+    public long l64354;
+    public long l64355;
+    public long l64356;
+    public long l64357;
+    public long l64358;
+    public long l64359;
+    public long l64360;
+    public long l64361;
+    public long l64362;
+    public long l64363;
+    public long l64364;
+    public long l64365;
+    public long l64366;
+    public long l64367;
+    public long l64368;
+    public long l64369;
+    public long l64370;
+    public long l64371;
+    public long l64372;
+    public long l64373;
+    public long l64374;
+    public long l64375;
+    public long l64376;
+    public long l64377;
+    public long l64378;
+    public long l64379;
+    public long l64380;
+    public long l64381;
+    public long l64382;
+    public long l64383;
+    public long l64384;
+    public long l64385;
+    public long l64386;
+    public long l64387;
+    public long l64388;
+    public long l64389;
+    public long l64390;
+    public long l64391;
+    public long l64392;
+    public long l64393;
+    public long l64394;
+    public long l64395;
+    public long l64396;
+    public long l64397;
+    public long l64398;
+    public long l64399;
+    public long l64400;
+    public long l64401;
+    public long l64402;
+    public long l64403;
+    public long l64404;
+    public long l64405;
+    public long l64406;
+    public long l64407;
+    public long l64408;
+    public long l64409;
+    public long l64410;
+    public long l64411;
+    public long l64412;
+    public long l64413;
+    public long l64414;
+    public long l64415;
+    public long l64416;
+    public long l64417;
+    public long l64418;
+    public long l64419;
+    public long l64420;
+    public long l64421;
+    public long l64422;
+    public long l64423;
+    public long l64424;
+    public long l64425;
+    public long l64426;
+    public long l64427;
+    public long l64428;
+    public long l64429;
+    public long l64430;
+    public long l64431;
+    public long l64432;
+    public long l64433;
+    public long l64434;
+    public long l64435;
+    public long l64436;
+    public long l64437;
+    public long l64438;
+    public long l64439;
+    public long l64440;
+    public long l64441;
+    public long l64442;
+    public long l64443;
+    public long l64444;
+    public long l64445;
+    public long l64446;
+    public long l64447;
+    public long l64448;
+    public long l64449;
+    public long l64450;
+    public long l64451;
+    public long l64452;
+    public long l64453;
+    public long l64454;
+    public long l64455;
+    public long l64456;
+    public long l64457;
+    public long l64458;
+    public long l64459;
+    public long l64460;
+    public long l64461;
+    public long l64462;
+    public long l64463;
+    public long l64464;
+    public long l64465;
+    public long l64466;
+    public long l64467;
+    public long l64468;
+    public long l64469;
+    public long l64470;
+    public long l64471;
+    public long l64472;
+    public long l64473;
+    public long l64474;
+    public long l64475;
+    public long l64476;
+    public long l64477;
+    public long l64478;
+    public long l64479;
+    public long l64480;
+    public long l64481;
+    public long l64482;
+    public long l64483;
+    public long l64484;
+    public long l64485;
+    public long l64486;
+    public long l64487;
+    public long l64488;
+    public long l64489;
+    public long l64490;
+    public long l64491;
+    public long l64492;
+    public long l64493;
+    public long l64494;
+    public long l64495;
+    public long l64496;
+    public long l64497;
+    public long l64498;
+    public long l64499;
+    public long l64500;
+    public long l64501;
+    public long l64502;
+    public long l64503;
+    public long l64504;
+    public long l64505;
+    public long l64506;
+    public long l64507;
+    public long l64508;
+    public long l64509;
+    public long l64510;
+    public long l64511;
+    public long l64512;
+    public long l64513;
+    public long l64514;
+    public long l64515;
+    public long l64516;
+    public long l64517;
+    public long l64518;
+    public long l64519;
+    public long l64520;
+    public long l64521;
+    public long l64522;
+    public long l64523;
+    public long l64524;
+    public long l64525;
+    public long l64526;
+    public long l64527;
+    public long l64528;
+    public long l64529;
+    public long l64530;
+    public long l64531;
+    public long l64532;
+    public long l64533;
+    public long l64534;
+    public long l64535;
+    public long l64536;
+    public long l64537;
+    public long l64538;
+    public long l64539;
+    public long l64540;
+    public long l64541;
+    public long l64542;
+    public long l64543;
+    public long l64544;
+    public long l64545;
+    public long l64546;
+    public long l64547;
+    public long l64548;
+    public long l64549;
+    public long l64550;
+    public long l64551;
+    public long l64552;
+    public long l64553;
+    public long l64554;
+    public long l64555;
+    public long l64556;
+    public long l64557;
+    public long l64558;
+    public long l64559;
+    public long l64560;
+    public long l64561;
+    public long l64562;
+    public long l64563;
+    public long l64564;
+    public long l64565;
+    public long l64566;
+    public long l64567;
+    public long l64568;
+    public long l64569;
+    public long l64570;
+    public long l64571;
+    public long l64572;
+    public long l64573;
+    public long l64574;
+    public long l64575;
+    public long l64576;
+    public long l64577;
+    public long l64578;
+    public long l64579;
+    public long l64580;
+    public long l64581;
+    public long l64582;
+    public long l64583;
+    public long l64584;
+    public long l64585;
+    public long l64586;
+    public long l64587;
+    public long l64588;
+    public long l64589;
+    public long l64590;
+    public long l64591;
+    public long l64592;
+    public long l64593;
+    public long l64594;
+    public long l64595;
+    public long l64596;
+    public long l64597;
+    public long l64598;
+    public long l64599;
+    public long l64600;
+    public long l64601;
+    public long l64602;
+    public long l64603;
+    public long l64604;
+    public long l64605;
+    public long l64606;
+    public long l64607;
+    public long l64608;
+    public long l64609;
+    public long l64610;
+    public long l64611;
+    public long l64612;
+    public long l64613;
+    public long l64614;
+    public long l64615;
+    public long l64616;
+    public long l64617;
+    public long l64618;
+    public long l64619;
+    public long l64620;
+    public long l64621;
+    public long l64622;
+    public long l64623;
+    public long l64624;
+    public long l64625;
+    public long l64626;
+    public long l64627;
+    public long l64628;
+    public long l64629;
+    public long l64630;
+    public long l64631;
+    public long l64632;
+    public long l64633;
+    public long l64634;
+    public long l64635;
+    public long l64636;
+    public long l64637;
+    public long l64638;
+    public long l64639;
+    public long l64640;
+    public long l64641;
+    public long l64642;
+    public long l64643;
+    public long l64644;
+    public long l64645;
+    public long l64646;
+    public long l64647;
+    public long l64648;
+    public long l64649;
+    public long l64650;
+    public long l64651;
+    public long l64652;
+    public long l64653;
+    public long l64654;
+    public long l64655;
+    public long l64656;
+    public long l64657;
+    public long l64658;
+    public long l64659;
+    public long l64660;
+    public long l64661;
+    public long l64662;
+    public long l64663;
+    public long l64664;
+    public long l64665;
+    public long l64666;
+    public long l64667;
+    public long l64668;
+    public long l64669;
+    public long l64670;
+    public long l64671;
+    public long l64672;
+    public long l64673;
+    public long l64674;
+    public long l64675;
+    public long l64676;
+    public long l64677;
+    public long l64678;
+    public long l64679;
+    public long l64680;
+    public long l64681;
+    public long l64682;
+    public long l64683;
+    public long l64684;
+    public long l64685;
+    public long l64686;
+    public long l64687;
+    public long l64688;
+    public long l64689;
+    public long l64690;
+    public long l64691;
+    public long l64692;
+    public long l64693;
+    public long l64694;
+    public long l64695;
+    public long l64696;
+    public long l64697;
+    public long l64698;
+    public long l64699;
+    public long l64700;
+    public long l64701;
+    public long l64702;
+    public long l64703;
+    public long l64704;
+    public long l64705;
+    public long l64706;
+    public long l64707;
+    public long l64708;
+    public long l64709;
+    public long l64710;
+    public long l64711;
+    public long l64712;
+    public long l64713;
+    public long l64714;
+    public long l64715;
+    public long l64716;
+    public long l64717;
+    public long l64718;
+    public long l64719;
+    public long l64720;
+    public long l64721;
+    public long l64722;
+    public long l64723;
+    public long l64724;
+    public long l64725;
+    public long l64726;
+    public long l64727;
+    public long l64728;
+    public long l64729;
+    public long l64730;
+    public long l64731;
+    public long l64732;
+    public long l64733;
+    public long l64734;
+    public long l64735;
+    public long l64736;
+    public long l64737;
+    public long l64738;
+    public long l64739;
+    public long l64740;
+    public long l64741;
+    public long l64742;
+    public long l64743;
+    public long l64744;
+    public long l64745;
+    public long l64746;
+    public long l64747;
+    public long l64748;
+    public long l64749;
+    public long l64750;
+    public long l64751;
+    public long l64752;
+    public long l64753;
+    public long l64754;
+    public long l64755;
+    public long l64756;
+    public long l64757;
+    public long l64758;
+    public long l64759;
+    public long l64760;
+    public long l64761;
+    public long l64762;
+    public long l64763;
+    public long l64764;
+    public long l64765;
+    public long l64766;
+    public long l64767;
+    public long l64768;
+    public long l64769;
+    public long l64770;
+    public long l64771;
+    public long l64772;
+    public long l64773;
+    public long l64774;
+    public long l64775;
+    public long l64776;
+    public long l64777;
+    public long l64778;
+    public long l64779;
+    public long l64780;
+    public long l64781;
+    public long l64782;
+    public long l64783;
+    public long l64784;
+    public long l64785;
+    public long l64786;
+    public long l64787;
+    public long l64788;
+    public long l64789;
+    public long l64790;
+    public long l64791;
+    public long l64792;
+    public long l64793;
+    public long l64794;
+    public long l64795;
+    public long l64796;
+    public long l64797;
+    public long l64798;
+    public long l64799;
+    public long l64800;
+    public long l64801;
+    public long l64802;
+    public long l64803;
+    public long l64804;
+    public long l64805;
+    public long l64806;
+    public long l64807;
+    public long l64808;
+    public long l64809;
+    public long l64810;
+    public long l64811;
+    public long l64812;
+    public long l64813;
+    public long l64814;
+    public long l64815;
+    public long l64816;
+    public long l64817;
+    public long l64818;
+    public long l64819;
+    public long l64820;
+    public long l64821;
+    public long l64822;
+    public long l64823;
+    public long l64824;
+    public long l64825;
+    public long l64826;
+    public long l64827;
+    public long l64828;
+    public long l64829;
+    public long l64830;
+    public long l64831;
+    public long l64832;
+    public long l64833;
+    public long l64834;
+    public long l64835;
+    public long l64836;
+    public long l64837;
+    public long l64838;
+    public long l64839;
+    public long l64840;
+    public long l64841;
+    public long l64842;
+    public long l64843;
+    public long l64844;
+    public long l64845;
+    public long l64846;
+    public long l64847;
+    public long l64848;
+    public long l64849;
+    public long l64850;
+    public long l64851;
+    public long l64852;
+    public long l64853;
+    public long l64854;
+    public long l64855;
+    public long l64856;
+    public long l64857;
+    public long l64858;
+    public long l64859;
+    public long l64860;
+    public long l64861;
+    public long l64862;
+    public long l64863;
+    public long l64864;
+    public long l64865;
+    public long l64866;
+    public long l64867;
+    public long l64868;
+    public long l64869;
+    public long l64870;
+    public long l64871;
+    public long l64872;
+    public long l64873;
+    public long l64874;
+    public long l64875;
+    public long l64876;
+    public long l64877;
+    public long l64878;
+    public long l64879;
+    public long l64880;
+    public long l64881;
+    public long l64882;
+    public long l64883;
+    public long l64884;
+    public long l64885;
+    public long l64886;
+    public long l64887;
+    public long l64888;
+    public long l64889;
+    public long l64890;
+    public long l64891;
+    public long l64892;
+    public long l64893;
+    public long l64894;
+    public long l64895;
+    public long l64896;
+    public long l64897;
+    public long l64898;
+    public long l64899;
+    public long l64900;
+    public long l64901;
+    public long l64902;
+    public long l64903;
+    public long l64904;
+    public long l64905;
+    public long l64906;
+    public long l64907;
+    public long l64908;
+    public long l64909;
+    public long l64910;
+    public long l64911;
+    public long l64912;
+    public long l64913;
+    public long l64914;
+    public long l64915;
+    public long l64916;
+    public long l64917;
+    public long l64918;
+    public long l64919;
+    public long l64920;
+    public long l64921;
+    public long l64922;
+    public long l64923;
+    public long l64924;
+    public long l64925;
+    public long l64926;
+    public long l64927;
+    public long l64928;
+    public long l64929;
+    public long l64930;
+    public long l64931;
+    public long l64932;
+    public long l64933;
+    public long l64934;
+    public long l64935;
+    public long l64936;
+    public long l64937;
+    public long l64938;
+    public long l64939;
+    public long l64940;
+    public long l64941;
+    public long l64942;
+    public long l64943;
+    public long l64944;
+    public long l64945;
+    public long l64946;
+    public long l64947;
+    public long l64948;
+    public long l64949;
+    public long l64950;
+    public long l64951;
+    public long l64952;
+    public long l64953;
+    public long l64954;
+    public long l64955;
+    public long l64956;
+    public long l64957;
+    public long l64958;
+    public long l64959;
+    public long l64960;
+    public long l64961;
+    public long l64962;
+    public long l64963;
+    public long l64964;
+    public long l64965;
+    public long l64966;
+    public long l64967;
+    public long l64968;
+    public long l64969;
+    public long l64970;
+    public long l64971;
+    public long l64972;
+    public long l64973;
+    public long l64974;
+    public long l64975;
+    public long l64976;
+    public long l64977;
+    public long l64978;
+    public long l64979;
+    public long l64980;
+    public long l64981;
+    public long l64982;
+    public long l64983;
+    public long l64984;
+    public long l64985;
+    public long l64986;
+    public long l64987;
+    public long l64988;
+    public long l64989;
+    public long l64990;
+    public long l64991;
+    public long l64992;
+    public long l64993;
+    public long l64994;
+    public long l64995;
+    public long l64996;
+    public long l64997;
+    public long l64998;
+    public long l64999;
+    public long l65000;
+    public long l65001;
+    public long l65002;
+    public long l65003;
+    public long l65004;
+    public long l65005;
+    public long l65006;
+    public long l65007;
+    public long l65008;
+    public long l65009;
+    public long l65010;
+    public long l65011;
+    public long l65012;
+    public long l65013;
+    public long l65014;
+    public long l65015;
+    public long l65016;
+    public long l65017;
+    public long l65018;
+    public long l65019;
+    public long l65020;
+    public long l65021;
+    public long l65022;
+    public long l65023;
+    public long l65024;
+    public long l65025;
+    public long l65026;
+    public long l65027;
+    public long l65028;
+    public long l65029;
+    public long l65030;
+    public long l65031;
+    public long l65032;
+    public long l65033;
+    public long l65034;
+    public long l65035;
+    public long l65036;
+    public long l65037;
+    public long l65038;
+    public long l65039;
+    public long l65040;
+    public long l65041;
+    public long l65042;
+    public long l65043;
+    public long l65044;
+    public long l65045;
+    public long l65046;
+    public long l65047;
+    public long l65048;
+    public long l65049;
+    public long l65050;
+    public long l65051;
+    public long l65052;
+    public long l65053;
+    public long l65054;
+    public long l65055;
+    public long l65056;
+    public long l65057;
+    public long l65058;
+    public long l65059;
+    public long l65060;
+    public long l65061;
+    public long l65062;
+    public long l65063;
+    public long l65064;
+    public long l65065;
+    public long l65066;
+    public long l65067;
+    public long l65068;
+    public long l65069;
+    public long l65070;
+    public long l65071;
+    public long l65072;
+    public long l65073;
+    public long l65074;
+    public long l65075;
+    public long l65076;
+    public long l65077;
+    public long l65078;
+    public long l65079;
+    public long l65080;
+    public long l65081;
+    public long l65082;
+    public long l65083;
+    public long l65084;
+    public long l65085;
+    public long l65086;
+    public long l65087;
+    public long l65088;
+    public long l65089;
+    public long l65090;
+    public long l65091;
+    public long l65092;
+    public long l65093;
+    public long l65094;
+    public long l65095;
+    public long l65096;
+    public long l65097;
+    public long l65098;
+    public long l65099;
+    public long l65100;
+    public long l65101;
+    public long l65102;
+    public long l65103;
+    public long l65104;
+    public long l65105;
+    public long l65106;
+    public long l65107;
+    public long l65108;
+    public long l65109;
+    public long l65110;
+    public long l65111;
+    public long l65112;
+    public long l65113;
+    public long l65114;
+    public long l65115;
+    public long l65116;
+    public long l65117;
+    public long l65118;
+    public long l65119;
+    public long l65120;
+    public long l65121;
+    public long l65122;
+    public long l65123;
+    public long l65124;
+    public long l65125;
+    public long l65126;
+    public long l65127;
+    public long l65128;
+    public long l65129;
+    public long l65130;
+    public long l65131;
+    public long l65132;
+    public long l65133;
+    public long l65134;
+    public long l65135;
+    public long l65136;
+    public long l65137;
+    public long l65138;
+    public long l65139;
+    public long l65140;
+    public long l65141;
+    public long l65142;
+    public long l65143;
+    public long l65144;
+    public long l65145;
+    public long l65146;
+    public long l65147;
+    public long l65148;
+    public long l65149;
+    public long l65150;
+    public long l65151;
+    public long l65152;
+    public long l65153;
+    public long l65154;
+    public long l65155;
+    public long l65156;
+    public long l65157;
+    public long l65158;
+    public long l65159;
+    public long l65160;
+    public long l65161;
+    public long l65162;
+    public long l65163;
+    public long l65164;
+    public long l65165;
+    public long l65166;
+    public long l65167;
+    public long l65168;
+    public long l65169;
+    public long l65170;
+    public long l65171;
+    public long l65172;
+    public long l65173;
+    public long l65174;
+    public long l65175;
+    public long l65176;
+    public long l65177;
+    public long l65178;
+    public long l65179;
+    public long l65180;
+    public long l65181;
+    public long l65182;
+    public long l65183;
+    public long l65184;
+    public long l65185;
+    public long l65186;
+    public long l65187;
+    public long l65188;
+    public long l65189;
+    public long l65190;
+    public long l65191;
+    public long l65192;
+    public long l65193;
+    public long l65194;
+    public long l65195;
+    public long l65196;
+    public long l65197;
+    public long l65198;
+    public long l65199;
+    public long l65200;
+    public long l65201;
+    public long l65202;
+    public long l65203;
+    public long l65204;
+    public long l65205;
+    public long l65206;
+    public long l65207;
+    public long l65208;
+    public long l65209;
+    public long l65210;
+    public long l65211;
+    public long l65212;
+    public long l65213;
+    public long l65214;
+    public long l65215;
+    public long l65216;
+    public long l65217;
+    public long l65218;
+    public long l65219;
+    public long l65220;
+    public long l65221;
+    public long l65222;
+    public long l65223;
+    public long l65224;
+    public long l65225;
+    public long l65226;
+    public long l65227;
+    public long l65228;
+    public long l65229;
+    public long l65230;
+    public long l65231;
+    public long l65232;
+    public long l65233;
+    public long l65234;
+    public long l65235;
+    public long l65236;
+    public long l65237;
+    public long l65238;
+    public long l65239;
+    public long l65240;
+    public long l65241;
+    public long l65242;
+    public long l65243;
+    public long l65244;
+    public long l65245;
+    public long l65246;
+    public long l65247;
+    public long l65248;
+    public long l65249;
+    public long l65250;
+    public long l65251;
+    public long l65252;
+    public long l65253;
+    public long l65254;
+    public long l65255;
+    public long l65256;
+    public long l65257;
+    public long l65258;
+    public long l65259;
+    public long l65260;
+    public long l65261;
+    public long l65262;
+    public long l65263;
+    public long l65264;
+    public long l65265;
+    public long l65266;
+    public long l65267;
+    public long l65268;
+    public long l65269;
+    public long l65270;
+    public long l65271;
+    public long l65272;
+    public long l65273;
+    public long l65274;
+    public long l65275;
+    public long l65276;
+    public long l65277;
+    public long l65278;
+    public long l65279;
+    public long l65280;
+    public long l65281;
+    public long l65282;
+    public long l65283;
+    public long l65284;
+    public long l65285;
+    public long l65286;
+    public long l65287;
+    public long l65288;
+    public long l65289;
+    public long l65290;
+    public long l65291;
+    public long l65292;
+    public long l65293;
+    public long l65294;
+    public long l65295;
+    public long l65296;
+    public long l65297;
+    public long l65298;
+    public long l65299;
+    public long l65300;
+    public long l65301;
+    public long l65302;
+    public long l65303;
+    public long l65304;
+    public long l65305;
+    public long l65306;
+    public long l65307;
+    public long l65308;
+    public long l65309;
+    public long l65310;
+    public long l65311;
+    public long l65312;
+    public long l65313;
+    public long l65314;
+    public long l65315;
+    public long l65316;
+    public long l65317;
+    public long l65318;
+    public long l65319;
+    public long l65320;
+    public long l65321;
+    public long l65322;
+    public long l65323;
+    public long l65324;
+    public long l65325;
+    public long l65326;
+    public long l65327;
+    public long l65328;
+    public long l65329;
+    public long l65330;
+    public long l65331;
+    public long l65332;
+    public long l65333;
+    public long l65334;
+    public long l65335;
+    public long l65336;
+    public long l65337;
+    public long l65338;
+    public long l65339;
+    public long l65340;
+    public long l65341;
+    public long l65342;
+    public long l65343;
+    public long l65344;
+    public long l65345;
+    public long l65346;
+    public long l65347;
+    public long l65348;
+    public long l65349;
+    public long l65350;
+    public long l65351;
+    public long l65352;
+    public long l65353;
+    public long l65354;
+    public long l65355;
+    public long l65356;
+    public long l65357;
+    public long l65358;
+    public long l65359;
+    public long l65360;
+    public long l65361;
+    public long l65362;
+    public long l65363;
+    public long l65364;
+    public long l65365;
+    public long l65366;
+    public long l65367;
+    public long l65368;
+    public long l65369;
+    public long l65370;
+    public long l65371;
+    public long l65372;
+    public long l65373;
+    public long l65374;
+    public long l65375;
+    public long l65376;
+    public long l65377;
+    public long l65378;
+    public long l65379;
+    public long l65380;
+    public long l65381;
+    public long l65382;
+    public long l65383;
+    public long l65384;
+    public long l65385;
+    public long l65386;
+    public long l65387;
+    public long l65388;
+    public long l65389;
+    public long l65390;
+    public long l65391;
+    public long l65392;
+    public long l65393;
+    public long l65394;
+    public long l65395;
+    public long l65396;
+    public long l65397;
+    public long l65398;
+    public long l65399;
+    public long l65400;
+    public long l65401;
+    public long l65402;
+    public long l65403;
+    public long l65404;
+    public long l65405;
+    public long l65406;
+    public long l65407;
+    public long l65408;
+    public long l65409;
+    public long l65410;
+    public long l65411;
+    public long l65412;
+    public long l65413;
+    public long l65414;
+    public long l65415;
+    public long l65416;
+    public long l65417;
+    public long l65418;
+    public long l65419;
+    public long l65420;
+    public long l65421;
+    public long l65422;
+    public long l65423;
+    public long l65424;
+    public long l65425;
+    public long l65426;
+    public long l65427;
+    public long l65428;
+    public long l65429;
+    public long l65430;
+    public long l65431;
+    public long l65432;
+    public long l65433;
+    public long l65434;
+    public long l65435;
+    public long l65436;
+    public long l65437;
+    public long l65438;
+    public long l65439;
+    public long l65440;
+    public long l65441;
+    public long l65442;
+    public long l65443;
+    public long l65444;
+    public long l65445;
+    public long l65446;
+    public long l65447;
+    public long l65448;
+    public long l65449;
+    public long l65450;
+    public long l65451;
+    public long l65452;
+    public long l65453;
+    public long l65454;
+    public long l65455;
+    public long l65456;
+    public long l65457;
+    public long l65458;
+    public long l65459;
+    public long l65460;
+    public long l65461;
+    public long l65462;
+    public long l65463;
+    public long l65464;
+    public long l65465;
+    public long l65466;
+    public long l65467;
+    public long l65468;
+    public long l65469;
+    public long l65470;
+    public long l65471;
+    public long l65472;
+    public long l65473;
+    public long l65474;
+    public long l65475;
+    public long l65476;
+    public long l65477;
+    public long l65478;
+    public long l65479;
+    public long l65480;
+    public long l65481;
+    public long l65482;
+    public long l65483;
+    public long l65484;
+    public long l65485;
+    public long l65486;
+    public long l65487;
+    public long l65488;
+    public long l65489;
+    public long l65490;
+    public long l65491;
+    public long l65492;
+    public long l65493;
+    public long l65494;
+    public long l65495;
+    public long l65496;
+    public long l65497;
+    public long l65498;
+    public long l65499;
+    public long l65500;
+    public long l65501;
+    public long l65502;
+    public long l65503;
+    public long l65504;
+    public long l65505;
+    public long l65506;
+    public long l65507;
+    public long l65508;
+    public long l65509;
+    public long l65510;
+    public long l65511;
+    public long l65512;
+    public long l65513;
+    public long l65514;
+    public long l65515;
+    public long l65516;
+    public long l65517;
+    public long l65518;
+    public long l65519;
+    public long l65520;
+    public long l65521;
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/runtime/6929067/T.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/6929067/T.java	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,12 @@
+public class T
+{
+  public static boolean foo(boolean bar)
+  {
+    return bar;
+  }
+
+  public static void printIt()
+  {
+    System.out.println("Hello");
+  }
+}
diff -r 39e409a664b3 -r 84043c7507b9 test/runtime/6929067/Test6929067.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/6929067/Test6929067.sh	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+##
+## @test Test6929067.sh
+## @bug 6929067
+## @summary Stack guard pages should be removed when thread is detached
+## @run shell Test6929067.sh
+##
+
+if [ "${TESTSRC}" = "" ]
+then TESTSRC=.
+fi
+
+if [ "${TESTJAVA}" = "" ]
+then
+  PARENT=`dirname \`which java\``
+  TESTJAVA=`dirname ${PARENT}`
+  echo "TESTJAVA not set, selecting " ${TESTJAVA}
+  echo "If this is incorrect, try setting the variable manually."
+fi
+
+BIT_FLAG=""
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+  Linux)
+    NULL=/dev/null
+    PS=":"
+    FS="/"
+    ;;
+  SunOS | Windows_* )
+    NULL=NUL
+    PS=";"
+    FS="\\"
+    echo "Test passed; only valid for Linux"
+    exit 0;
+    ;;
+  * )
+    echo "Unrecognized system!"
+    exit 1;
+    ;;
+esac
+
+LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/i386/client:/usr/openwin/lib:/usr/dt/lib:/usr/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+
+THIS_DIR=`pwd`
+
+cp ${TESTSRC}${FS}invoke.c ${THIS_DIR}
+cp ${TESTSRC}${FS}T.java ${THIS_DIR}
+
+
+${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -fullversion
+
+${TESTJAVA}${FS}bin${FS}javac T.java
+
+gcc -o invoke -I${TESTJAVA}/include -I${TESTJAVA}/include/linux invoke.c ${TESTJAVA}/jre/lib/i386/client/libjvm.so
+./invoke
+exit $?
diff -r 39e409a664b3 -r 84043c7507b9 test/runtime/6929067/invoke.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/6929067/invoke.c	Thu Mar 25 16:54:59 2010 -0700
@@ -0,0 +1,90 @@
+#include <assert.h>
+#include <jni.h>
+#include <alloca.h>
+
+#include <pthread.h>
+
+union env_union
+{
+  void *void_env;
+  JNIEnv *jni_env;
+};
+
+union env_union tmp;
+JNIEnv* env;
+JavaVM* jvm;
+JavaVMInitArgs vm_args;
+JavaVMOption options[1];
+jclass class_id;
+jmethodID method_id;
+jint result;
+
+long product(unsigned long n, unsigned long m) {
+    if (m == 1) {
+      return n;
+    } else {
+      int *p = alloca(sizeof (int));
+      *p = n;
+      return product (n, m-1) + *p;
+    }
+}
+
+void *
+floobydust (void *p)
+{
+  (*jvm)->AttachCurrentThread(jvm, &tmp.void_env, NULL);
+  env = tmp.jni_env;
+
+  class_id = (*env)->FindClass (env, "T");
+  assert (class_id);
+
+  method_id = (*env)->GetStaticMethodID (env, class_id, "printIt", "()V");
+  assert (method_id);
+
+  (*env)->CallStaticVoidMethod (env, class_id, method_id, NULL);
+
+  (*jvm)->DetachCurrentThread(jvm);
+
+  printf("%ld\n", product(5000,5000));
+
+  (*jvm)->AttachCurrentThread(jvm, &tmp.void_env, NULL);
+  env = tmp.jni_env;
+
+  class_id = (*env)->FindClass (env, "T");
+  assert (class_id);
+
+  method_id = (*env)->GetStaticMethodID (env, class_id, "printIt", "()V");
+  assert (method_id);
+
+  (*env)->CallStaticVoidMethod (env, class_id, method_id, NULL);
+
+  (*jvm)->DetachCurrentThread(jvm);
+
+  printf("%ld\n", product(5000,5000));
+
+  return NULL;
+}
+
+int
+main (int argc, const char** argv)
+{
+  options[0].optionString = "-Xss320k";
+
+  vm_args.version = JNI_VERSION_1_2;
+  vm_args.ignoreUnrecognized = JNI_TRUE;
+  vm_args.options = options;
+  vm_args.nOptions = 1;
+
+  result = JNI_CreateJavaVM (&jvm, &tmp.void_env, &vm_args);
+  assert (result >= 0);
+
+  env = tmp.jni_env;
+
+  floobydust (NULL);
+
+  pthread_t thr;
+  pthread_create (&thr, NULL, floobydust, NULL);
+  pthread_join (thr, NULL);
+
+  return 0;
+}