From nicolas.geoffray at gmail.com  Thu Dec  1 13:15:43 2011
From: nicolas.geoffray at gmail.com (Nicolas Geoffray)
Date: Thu, 1 Dec 2011 22:15:43 +0100
Subject: [vmkit-commits] Breaking change for openjdk
Message-ID: <CAPYwfiqiZBPb4F2_QnJmcbODkqpgpw5b0d=tYP61iwGmGp1NAw@mail.gmail.com>

Will,

I plan on submitting this patch that I know will break openjdk. Basically,
I'm changing the way we intern strings to call a Java method defined in the
classlib. For GNU Classpath, it's easy, it just calls VMString::intern. I
don't know if OpenJDK has a Java implementation that can be called
directly. Note that calling VMString::intern comes pretty early in the
game: the first time a string is created in J3, it will call it.

An easy fix for the openjdk port is to set JavaUpcalls::internString to
NULL. The Jnjvm::constructString method will then not attempt to intern the
string and call a Java  method. Of course that is not spec compliant,
because some strings must be interned, but at least it should not crash on
you.

The rationale behind that change is that the current implementation did not
really work and was adding unneeded complexity on top of vmkit (more or
less adding C++ weak references). It was also storing Java objects into a
std::map, and I'd like to avoid that.

Will, let me know if the change and my intermediate fix proposal is ok with
you.

Cheers,
Nicolas
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111201/1e863299/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: intern.patch
Type: text/x-patch
Size: 13921 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111201/1e863299/attachment.bin>

From nicolas.geoffray at gmail.com  Thu Dec  1 13:19:43 2011
From: nicolas.geoffray at gmail.com (Nicolas Geoffray)
Date: Thu, 1 Dec 2011 22:19:43 +0100
Subject: [vmkit-commits] FatLock assertion failure?
In-Reply-To: <CAKGWAO-9c73qBxPQH4gbrcFm+b30HPW1zAU-3TeiRB-O0Ho8gg@mail.gmail.com>
References: <CAKGWAO9YXa6ehFk4_dX7v++518joWhWZjDFFXthWccxwCKwQuA@mail.gmail.com>
	<CAPYwfirVfUNUNEiMdCYbjUGNtP-n_tvL3zbarzjq1o2hM=ZHEw@mail.gmail.com>
	<CAKGWAO-9c73qBxPQH4gbrcFm+b30HPW1zAU-3TeiRB-O0Ho8gg@mail.gmail.com>
Message-ID: <CAPYwfirRWAiZze-4VuBRGF3iMPVnyRZ7wDWO-WTFLHh=i301QA@mail.gmail.com>

Thanks Will for debugging the problem! Indeed, I commented the releasing of
the fat lock and it worked without any crashes. That's great news because
it looks like we nailed it. The bad news though is that if we don't release
a fat lock, it will never be able to get used again. Even worst is if we
need to keep a pointer to the associated object. The lock will just keep
that object alive forever.

If it helps, I'm ok with submitting a change that basically comments out
the release of a FatLock. When I'll have time, I'll investigate more at
which point do we have a race.

Cheers,
Nicolas

On Thu, Dec 1, 2011 at 12:49 AM, Will Dietz <wdietz2 at illinois.edu> wrote:

> On Tue, Nov 29, 2011 at 10:01 AM, Nicolas Geoffray
> <nicolas.geoffray at gmail.com> wrote:
> > Hi Will,
> >
> > On Tue, Nov 29, 2011 at 3:59 PM, Will Dietz <wdietz2 at illinois.edu>
> wrote:
> >>
> >> Hi,
> >>
> >> On both runtimes, I'm seeing the following assertion occur
> >> periodically (unpredictably, same code sometimes tickles it other
> >> times not)
> >>
> >> j3: /home/will/vmkit-svn/lib/vmkit/CommonThread/ObjectLocks.cpp:305:
> >> bool vmkit::FatLock::acquire(gc *): Assertion `obj->header &
> >> ThinLock::FatMask' failed.
> >
> > That's because you have too many cores :).... That's a lame answer. The
> real
> > answer is that there is a bug somewhere in the locking implementation. I
> > also experience in on my desktop machine (8 cores), but never on my
> laptop
> > (2 cores).
> > Nicolas
> >
>
> Thanks!
>
> Inspired by your response, I looked into this a bit and seem to have a
> bit more on the issue:
>
> The problem occurs when we try to deflate a fat lock back to a thin
> lock--there's a race on the object headers that makes the guard (that
> wants to be "does anyone have a pointer to this lock anywhere") unsafe
> (ObjectLocks.cpp:278-279).  Indeed (from my limited understanding of
> the literature, gulp) this seems to be a tricky problem in general and
> not just a bug of this implementation.
>
> Given this, and that we probably want locks to work on SMP machines
> (well, I sure do! :D), it seems we have at least two solutions:
>
> * Implement a more complicated locking solution ("tasuki" locks?).
> * Disallow deflating of fat locks altogether.  I've done this locally
> to great success--a lot of mysterious crashes/assertion failures are
> now gone.  Downside is potential performance hit in terms of locking
> overhead and lock resource utilization.
>
> I'm inclined to suggest we just go with the latter, and put the former
> on the TODO list... but of course it's up to you, and I'm curious what
> your thoughts on all this are :).
>
> Thanks!
>
> ~Will
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111201/92e27ec8/attachment.html>

From nicolas.geoffray at lip6.fr  Thu Dec  1 14:00:42 2011
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Thu, 01 Dec 2011 22:00:42 -0000
Subject: [vmkit-commits] [vmkit] r145637 -
	/vmkit/trunk/www/releases/index.html
Message-ID: <20111201220042.4DFAE2A6C12D@llvm.org>

Author: geoffray
Date: Thu Dec  1 16:00:42 2011
New Revision: 145637

URL: http://llvm.org/viewvc/llvm-project?rev=145637&view=rev
Log:
vmkit release 0.30.


Modified:
    vmkit/trunk/www/releases/index.html

Modified: vmkit/trunk/www/releases/index.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/releases/index.html?rev=145637&r1=145636&r2=145637&view=diff
==============================================================================
--- vmkit/trunk/www/releases/index.html (original)
+++ vmkit/trunk/www/releases/index.html Thu Dec  1 16:00:42 2011
@@ -27,6 +27,10 @@
   <!--=====================================================================-->
   
   <ul>
+    <li><a href="http://llvm.org/viewvc/llvm-project/vmkit/branches/release_030/www/releases/vmkit-0.30.tar.bz2?revision=145123">
+      VMKit release 0.30 </a> (
+        <a href="http://llvm.org/releases/3.0/docs/ReleaseNotes.html#vmkit">
+              Release notes </a>)
     <li><a href="http://llvm.org/viewvc/llvm-project/vmkit/branches/release_029/www/releases/vmkit-0.29.tar.bz2?revision=129228">
       VMKit release 0.29 </a> (
         <a href="http://llvm.org/releases/2.9/docs/ReleaseNotes.html#vmkit">




From wdietz2 at illinois.edu  Thu Dec  1 14:30:33 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Thu, 1 Dec 2011 16:30:33 -0600
Subject: [vmkit-commits] Breaking change for openjdk
In-Reply-To: <CAPYwfiqiZBPb4F2_QnJmcbODkqpgpw5b0d=tYP61iwGmGp1NAw@mail.gmail.com>
References: <CAPYwfiqiZBPb4F2_QnJmcbODkqpgpw5b0d=tYP61iwGmGp1NAw@mail.gmail.com>
Message-ID: <CAKGWAO_0-0yMekx=xDAhiNKCgO_5JGjBRSNnRa+rehJ5uQkBWg@mail.gmail.com>

Thanks for the heads-up and description.

Looking at classpath's implementation (String.java, VMString.java) I
don't see why we couldn't do exactly the same thing for the OpenJDK
port.

Only issue is that there is no equivalent of VMString.java in OpenJDK,
perhaps we could just pull it in (the file I mean) and use it in both
ports?  That would be the simplest and fine with me.

An alternative is to basically duplicate the equivalent code into
VMKit somewhere?  The code would create a WeakHashMap early on and
would have a method that does exactly what VMString::intern does in
VMString.java, which would be straightforward.

Engineering details aside your change sounds fine and if the above
ideas don't immediately sound good then just do what you were going to
do and I'll sort out the OpenJDK version when I get a chance :).

In related news, last night I successfully got eclipse running! :D
Was a nice milestone, and wanted to share.  Still can't run all the
dacapo codes yet, though :).

~Will

On Thu, Dec 1, 2011 at 3:15 PM, Nicolas Geoffray
<nicolas.geoffray at gmail.com> wrote:
> Will,
> I plan on submitting this patch that I know will break openjdk. Basically,
> I'm changing the way we intern strings to call a Java method defined in the
> classlib. For GNU Classpath, it's easy, it just calls VMString::intern. I
> don't know if OpenJDK has a Java implementation that can be called directly.
> Note that calling VMString::intern comes pretty early in the game: the first
> time a string is created in J3, it will call it.
> An easy fix for the openjdk port is to set JavaUpcalls::internString to
> NULL. The Jnjvm::constructString method will then not attempt to intern the
> string and call a Java  method. Of course that is not spec compliant,
> because some strings must be interned, but at least it should not crash on
> you.
> The rationale behind that change is that the current implementation did not
> really work and was adding unneeded complexity on top of vmkit (more or less
> adding C++ weak references). It was also storing Java objects into a
> std::map, and I'd like to avoid that.
> Will, let me know if the change and my intermediate fix proposal is ok with
> you.
> Cheers,
> Nicolas



From wdietz2 at illinois.edu  Thu Dec  1 14:50:33 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Thu, 1 Dec 2011 16:50:33 -0600
Subject: [vmkit-commits] FatLock assertion failure?
In-Reply-To: <CAPYwfirRWAiZze-4VuBRGF3iMPVnyRZ7wDWO-WTFLHh=i301QA@mail.gmail.com>
References: <CAKGWAO9YXa6ehFk4_dX7v++518joWhWZjDFFXthWccxwCKwQuA@mail.gmail.com>
	<CAPYwfirVfUNUNEiMdCYbjUGNtP-n_tvL3zbarzjq1o2hM=ZHEw@mail.gmail.com>
	<CAKGWAO-9c73qBxPQH4gbrcFm+b30HPW1zAU-3TeiRB-O0Ho8gg@mail.gmail.com>
	<CAPYwfirRWAiZze-4VuBRGF3iMPVnyRZ7wDWO-WTFLHh=i301QA@mail.gmail.com>
Message-ID: <CAKGWAO9X-79ax8zBZ5pGEZuOZn--6TcPpb9PgnASGDRydj9iig@mail.gmail.com>

On Thu, Dec 1, 2011 at 3:19 PM, Nicolas Geoffray
<nicolas.geoffray at gmail.com> wrote:
> Thanks Will for debugging the problem! Indeed, I commented the releasing of
> the fat lock and it worked without any crashes. That's great news because it
> looks like we nailed it. The bad news though is that if we don't release a
> fat lock, it will never be able to get used again. Even worst is if we need
> to keep a pointer to the associated object. The lock will just keep that
> object alive forever.
> If it helps, I'm ok with submitting a change that basically comments out the
> release of a FatLock. When I'll have time, I'll investigate more at which
> point do we have a race.
> Cheers,
> Nicolas
>

Welcome, I was very glad at how well that fixes it myself :).

There are two issues you mention--one is worrying about consuming Lock
resources, and I think that's not really a concern.  Looking at this:

http://www.research.ibm.com/people/d/dfb/thinlocks-publications.html#Bacon03Retrospective

They claim it never happens in practice, and only theoretically
happens in pathological cases.  They also describe the difficulty of
deflation a tad (but not as well as others) including brief mentions
of solutions that might be of interest to VMKit.  Anyway I don't think
we should worry about running out of space for locks.

The other issue you mention is miscalculating the liveness of an
object through its lock.  I agree this is something we should fix but
I'm okay postponing it for now.

FWIW inlined below is a sample patch that's been working for me.  If
you prefer we can comment out the code instead of removing it, I'm
fine either way.  Removing the spinlocks/thread counts is a nice
bonus.

~Will

>From f4bf1be53feaa8b419fea8654c34fb04f735f61d Mon Sep 17 00:00:00 2001
From: Will Dietz <w at wdtz.org>
Date: Tue, 29 Nov 2011 14:24:44 -0600
Subject: [PATCH] Remove code that deflates fat locks, due to races it doesn't
 work on SMP.

Fixes bug where multithreaded code would occasionally assert out with:
j3: /home/will/vmkit-svn/lib/vmkit/CommonThread/ObjectLocks.cpp:305:
bool vmkit::FatLock::acquire(gc *): Assertion `obj->header &
ThinLock::FatMask' failed.
---
 include/vmkit/ObjectLocks.h            |    9 +------
 lib/vmkit/CommonThread/ObjectLocks.cpp |   43 +------------------------------
 2 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/include/vmkit/ObjectLocks.h b/include/vmkit/ObjectLocks.h
index 1b0b4d3..7409e80 100644
--- a/include/vmkit/ObjectLocks.h
+++ b/include/vmkit/ObjectLocks.h
@@ -68,9 +68,6 @@ public:
 class FatLock : public vmkit::PermanentObject {
 private:
   vmkit::LockRecursive internalLock;
-  vmkit::SpinLock spinLock;
-  uint32_t waitingThreads;
-  uint32_t lockingThreads;
   LockingThread* firstThread;
   gc* associatedObject;
   uint32_t index;
@@ -171,14 +168,10 @@ public:
   static const uint64_t ThinCountShift = NonLockBits;
   static const uint64_t ThinCountAdd = 1LL << NonLockBits;

-  /// initialise - Initialise the value of the lock.
-  ///
-  static void removeFatLock(FatLock* fatLock, LockSystem& table);
-
   /// overflowThinlock - Change the lock of this object to a fat lock because
   /// we have reached the maximum number of locks.
   static void overflowThinLock(gc* object, LockSystem& table);
-
+
   /// changeToFatlock - Change the lock of this object to a fat lock. The lock
   /// may be in a thin lock or fat lock state.
   static FatLock* changeToFatlock(gc* object, LockSystem& table);
diff --git a/lib/vmkit/CommonThread/ObjectLocks.cpp
b/lib/vmkit/CommonThread/ObjectLocks.cpp
index 9456045..cd99492 100644
--- a/lib/vmkit/CommonThread/ObjectLocks.cpp
+++ b/lib/vmkit/CommonThread/ObjectLocks.cpp
@@ -39,27 +39,7 @@ void ThinLock::overflowThinLock(gc* object,
LockSystem& table) {
   } while (((object->header) & ~NonLockBitsMask) != ID);
   assert(obj->associatedObject == object);
 }
-
-/// initialise - Initialise the value of the lock.
-///
-void ThinLock::removeFatLock(FatLock* fatLock, LockSystem& table) {
-  gc* object = fatLock->associatedObject;
-  llvm_gcroot(object, 0);
-  word_t ID;
-  word_t oldValue = 0;
-  word_t newValue = 0;
-  word_t yieldedValue = 0;

-  ID = fatLock->getID();
-  do {
-    oldValue = object->header;
-    newValue = oldValue & NonLockBitsMask;
-    yieldedValue = __sync_val_compare_and_swap(&object->header,
oldValue, newValue);
-  } while (oldValue != yieldedValue);
-  assert((oldValue & NonLockBitsMask) != ID);
-  fatLock->associatedObject = NULL;
-}
-
 FatLock* ThinLock::changeToFatlock(gc* object, LockSystem& table) {
   llvm_gcroot(object, 0);
   if (!(object->header & FatMask)) {
@@ -262,8 +242,6 @@ FatLock::FatLock(uint32_t i, gc* a) {
   firstThread = NULL;
   index = i;
   setAssociatedObject(a);
-  waitingThreads = 0;
-  lockingThreads = 0;
   nextFreeLock = NULL;
 }

@@ -275,11 +253,6 @@ void FatLock::release(gc* obj, LockSystem& table) {
   llvm_gcroot(obj, 0);
   assert(associatedObject && "No associated object when releasing");
   assert(associatedObject == obj && "Mismatch object in lock");
-  if (!waitingThreads && !lockingThreads &&
-      internalLock.recursionCount() == 1) {
-    vmkit::ThinLock::removeFatLock(this, table);
-    table.deallocate(this);
-  }
   internalLock.unlock();
 }

@@ -287,16 +260,8 @@ void FatLock::release(gc* obj, LockSystem& table) {
 ///
 bool FatLock::acquire(gc* obj) {
   llvm_gcroot(obj, 0);
-
-  spinLock.lock();
-  lockingThreads++;
-  spinLock.unlock();
-
+
   internalLock.lock();
-
-  spinLock.lock();
-  lockingThreads--;
-  spinLock.unlock();

   if (associatedObject != obj) {
     internalLock.unlock();
@@ -421,8 +386,6 @@ bool LockingThread::wait(

   bool timeout = false;

-  l->waitingThreads++;
-
   while (!this->interruptFlag && this->nextWaiting) {
     if (timed) {
       timeout = varcondThread.timedWait(&l->internalLock, info);
@@ -432,9 +395,7 @@ bool LockingThread::wait(
     }
   }
   assert(vmkit::ThinLock::owner(self, table) && "Not owner after wait");
-
-  l->waitingThreads--;
-
+
   assert((!l->firstThread || (l->firstThread->prevWaiting &&
          l->firstThread->nextWaiting)) && "Inconsistent list");

-- 
1.7.5.1


From nicolas.geoffray at gmail.com  Fri Dec  2 09:54:21 2011
From: nicolas.geoffray at gmail.com (Nicolas Geoffray)
Date: Fri, 2 Dec 2011 18:54:21 +0100
Subject: [vmkit-commits] Breaking change for openjdk
In-Reply-To: <CAKGWAO_0-0yMekx=xDAhiNKCgO_5JGjBRSNnRa+rehJ5uQkBWg@mail.gmail.com>
References: <CAPYwfiqiZBPb4F2_QnJmcbODkqpgpw5b0d=tYP61iwGmGp1NAw@mail.gmail.com>
	<CAKGWAO_0-0yMekx=xDAhiNKCgO_5JGjBRSNnRa+rehJ5uQkBWg@mail.gmail.com>
Message-ID: <CAPYwfionA8-dARbEsTOjvLQLK5C+cz=_L426tb7GHQAxUuYcEg@mail.gmail.com>

Hi Will,

On Thu, Dec 1, 2011 at 11:30 PM, Will Dietz <wdietz2 at illinois.edu> wrote:

> Thanks for the heads-up and description.
>
> Looking at classpath's implementation (String.java, VMString.java) I
> don't see why we couldn't do exactly the same thing for the OpenJDK
> port.
>
> Only issue is that there is no equivalent of VMString.java in OpenJDK,
> perhaps we could just pull it in (the file I mean) and use it in both
> ports?  That would be the simplest and fine with me.
>
> An alternative is to basically duplicate the equivalent code into
> VMKit somewhere?  The code would create a WeakHashMap early on and
> would have a method that does exactly what VMString::intern does in
> VMString.java, which would be straightforward.
>

Yes, I believe that's possible. Depends if openjdk needs fancy things when
creating a WeakHashMap.

>
> Engineering details aside your change sounds fine and if the above
> ideas don't immediately sound good then just do what you were going to
> do and I'll sort out the OpenJDK version when I get a chance :).
>

Great! I'll submit the change then, and let you deal with the breakage :)

>
> In related news, last night I successfully got eclipse running! :D
> Was a nice milestone, and wanted to share.  Still can't run all the
> dacapo codes yet, though :).
>

This is great news! Does that mean precompilation and GC work on the
openjdk port? That's awesome. Can't wait to try it out!

Nicolas


> ~Will
>
> On Thu, Dec 1, 2011 at 3:15 PM, Nicolas Geoffray
> <nicolas.geoffray at gmail.com> wrote:
> > Will,
> > I plan on submitting this patch that I know will break openjdk.
> Basically,
> > I'm changing the way we intern strings to call a Java method defined in
> the
> > classlib. For GNU Classpath, it's easy, it just calls VMString::intern. I
> > don't know if OpenJDK has a Java implementation that can be called
> directly.
> > Note that calling VMString::intern comes pretty early in the game: the
> first
> > time a string is created in J3, it will call it.
> > An easy fix for the openjdk port is to set JavaUpcalls::internString to
> > NULL. The Jnjvm::constructString method will then not attempt to intern
> the
> > string and call a Java  method. Of course that is not spec compliant,
> > because some strings must be interned, but at least it should not crash
> on
> > you.
> > The rationale behind that change is that the current implementation did
> not
> > really work and was adding unneeded complexity on top of vmkit (more or
> less
> > adding C++ weak references). It was also storing Java objects into a
> > std::map, and I'd like to avoid that.
> > Will, let me know if the change and my intermediate fix proposal is ok
> with
> > you.
> > Cheers,
> > Nicolas
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111202/a69514b6/attachment.html>

From nicolas.geoffray at lip6.fr  Fri Dec  2 09:52:24 2011
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Fri, 02 Dec 2011 17:52:24 -0000
Subject: [vmkit-commits] [vmkit] r145687 - in /vmkit/trunk/lib/j3:
 ClassLib/GNUClasspath/JavaUpcalls.cpp ClassLib/GNUClasspath/JavaUpcalls.h
 Compiler/JavaAOTCompiler.cpp VMCore/JavaString.cpp VMCore/JavaString.h
 VMCore/Jnjvm.cpp VMCore/Jnjvm.h VMCore/LockedMap.cpp VMCore/LockedMap.h
 VMCore/VirtualTables.cpp
Message-ID: <20111202175224.658772A6C12C@llvm.org>

Author: geoffray
Date: Fri Dec  2 11:52:23 2011
New Revision: 145687

URL: http://llvm.org/viewvc/llvm-project?rev=145687&view=rev
Log:
Use VMString.intern to intern strings, instead of using our own ad-hoc c++ weak reference.


Removed:
    vmkit/trunk/lib/j3/VMCore/LockedMap.cpp
Modified:
    vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.cpp
    vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.h
    vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/j3/VMCore/JavaString.cpp
    vmkit/trunk/lib/j3/VMCore/JavaString.h
    vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp
    vmkit/trunk/lib/j3/VMCore/Jnjvm.h
    vmkit/trunk/lib/j3/VMCore/LockedMap.h
    vmkit/trunk/lib/j3/VMCore/VirtualTables.cpp

Modified: vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.cpp?rev=145687&r1=145686&r2=145687&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.cpp Fri Dec  2 11:52:23 2011
@@ -94,6 +94,7 @@
 JavaMethod* Classpath::InitDirectByteBuffer;
 Class*      Classpath::newClassLoader;
 Class*      Classpath::cloneableClass;
+JavaMethod* Classpath::internString;
 
 
 JavaField*  Classpath::boolValue;
@@ -377,27 +378,6 @@
   END_NATIVE_EXCEPTION
 }
 
-extern "C" JavaString* Java_java_lang_VMString_intern__Ljava_lang_String_2(
-    JavaString* obj) {
-  const ArrayUInt16* array = 0;
-  JavaString* res = 0;
-  llvm_gcroot(obj, 0);
-  llvm_gcroot(array, 0);
-  llvm_gcroot(res, 0);
-  // If the string is already interned, just return.
-  if (obj->getVirtualTable() == JavaString::internStringVT) return obj;
-  
-  BEGIN_NATIVE_EXCEPTION(0)
-  
-  Jnjvm* vm = JavaThread::get()->getJVM();
-  array = JavaString::strToArray(obj, vm);
-  res = vm->constructString(array);
-  
-  END_NATIVE_EXCEPTION
-
-  return res;
-}
-
 extern "C" uint8 Java_java_lang_Class_isArray__(JavaObjectClass* klass) {
   llvm_gcroot(klass, 0);
   UserCommonClass* cl = 0;
@@ -742,10 +722,9 @@
     UPCALL_METHOD(loader, "java/lang/ClassLoader", "loadClass",
                   "(Ljava/lang/String;)Ljava/lang/Class;", ACC_VIRTUAL);
 
-  JavaMethod* internString =
+  internString =
     UPCALL_METHOD(loader, "java/lang/VMString", "intern",
                   "(Ljava/lang/String;)Ljava/lang/String;", ACC_STATIC); 
-  internString->setNative();
   
   JavaMethod* isArray =
     UPCALL_METHOD(loader, "java/lang/Class", "isArray", "()Z", ACC_VIRTUAL);

Modified: vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.h?rev=145687&r1=145686&r2=145687&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.h (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.h Fri Dec  2 11:52:23 2011
@@ -155,6 +155,7 @@
   ISOLATE_STATIC JavaMethod* getUncaughtExceptionHandler;
   ISOLATE_STATIC JavaMethod* uncaughtException;
   ISOLATE_STATIC UserClass*  inheritableThreadLocal;
+  ISOLATE_STATIC JavaMethod* internString;
   
 
   ISOLATE_STATIC UserClass* InvocationTargetException;

Modified: vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp?rev=145687&r1=145686&r2=145687&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp Fri Dec  2 11:52:23 2011
@@ -2210,6 +2210,10 @@
       }
       bootstrapLoader->setCompiler(M);
     }
+
+    // We don't want strings to be interned when AOT'ing, otherwise
+    // we would call Java code.
+    bootstrapLoader->upcalls->internString = NULL;
    
     // Set the thread as the owner of the classes, so that it knows it
     // has to compile them. 

Modified: vmkit/trunk/lib/j3/VMCore/JavaString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaString.cpp?rev=145687&r1=145686&r2=145687&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaString.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaString.cpp Fri Dec  2 11:52:23 2011
@@ -13,27 +13,18 @@
 #include "JavaThread.h"
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
-#include "LockedMap.h"
 
-using namespace j3;
+namespace j3 {
 
-JavaVirtualTable* JavaString::internStringVT = 0;
-
-JavaString* JavaString::stringDup(const ArrayUInt16 *const& _array, Jnjvm* vm) {
+JavaString* JavaString::create(const ArrayUInt16 * array, Jnjvm* vm) {
   
   JavaString* res = 0;
-  const ArrayUInt16* array = _array;
   llvm_gcroot(array, 0);
   llvm_gcroot(res, 0);
 
   UserClass* cl = vm->upcalls->newString;
   res = (JavaString*)cl->doNew(vm);
   
-  // It's a hashed string, set the destructor so that the string
-  // removes itself from the vm string map. Do this only if
-  // internStringVT exists (in case of AOT).
-  if (internStringVT) res->setVirtualTable(internStringVT);
-
   // No need to call the Java function: both the Java function and
   // this function do the same thing.
   JavaString::setValue(res, array);
@@ -91,17 +82,6 @@
   }
 }
 
-void JavaString::stringDestructor(JavaString* str) {
-  const ArrayUInt16* value = NULL;
-  llvm_gcroot(str, 0);
-  llvm_gcroot(value, 0);
-  value = JavaString::getValue(str);
-  
-  Jnjvm* vm = JavaThread::get()->getJVM();
-  assert(vm && "No vm when destroying a string");
-  if (value != NULL) vm->hashStr.removeUnlocked(value, str);
-}
-
 JavaString* JavaString::internalToJava(const UTF8* name, Jnjvm* vm) {
   
   ArrayUInt16* array = 0;
@@ -139,3 +119,5 @@
   const UTF8* res = map->lookupOrCreateReader(java, self->count);
   return res;
 }
+
+}

Modified: vmkit/trunk/lib/j3/VMCore/JavaString.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaString.h?rev=145687&r1=145686&r2=145687&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaString.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaString.h Fri Dec  2 11:52:23 2011
@@ -47,7 +47,7 @@
     return self->value;
   }
   
-  static JavaString* stringDup(const ArrayUInt16 *const & array, Jnjvm* vm);
+  static JavaString* create(const ArrayUInt16 * array, Jnjvm* vm);
 
   /// internalToJava - Creates a copy of the UTF8 at its given offset and size
   /// with all its '.' replaced by '/'. The JVM bytecode reference classes in
@@ -56,15 +56,12 @@
   ///
   static JavaString* internalToJava(const UTF8* utf8, Jnjvm* vm);
 
-  static void stringDestructor(JavaString*);
   static char* strToAsciiz(JavaString* self);
   static char* strToAsciiz(JavaString* self, vmkit::ThreadAllocator* allocator);
   static const ArrayUInt16* strToArray(JavaString* self, Jnjvm* vm);
 
   /// javaToInternal - Replaces all '/' into '.'.
   static const UTF8* javaToInternal(const JavaString* self, UTF8Map* map);
-
-  static JavaVirtualTable* internStringVT;
 };
 
 } // end namespace j3

Modified: vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp?rev=145687&r1=145686&r2=145687&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp Fri Dec  2 11:52:23 2011
@@ -733,17 +733,21 @@
   for (uint32 i = 0; i < size; i++) {
     ArrayUInt16::setElement(tmp, utf8->elements[i], i);
   }
-  
-  return hashStr.lookupOrCreate(const_cast<const ArrayUInt16*&>(tmp), this,
-                                JavaString::stringDup);
+
+  return constructString(tmp);
 }
 
 JavaString* Jnjvm::constructString(const ArrayUInt16* array) { 
-  JavaString* res = NULL;
+  JavaString* key = NULL;
   llvm_gcroot(array, 0);
-  llvm_gcroot(res, 0);
-  res = hashStr.lookupOrCreate(array, this, JavaString::stringDup);
-  return res;
+  llvm_gcroot(key, 0);
+  key = JavaString::create(array, this);
+  if (upcalls->internString) {
+    return (JavaString*)upcalls->internString->invokeJavaObjectStatic(
+        this, upcalls->internString->classDef, &key);
+  } else {
+    return key;
+  }
 }
 
 JavaString* Jnjvm::asciizToStr(const char* asciiz) {
@@ -1085,28 +1089,7 @@
   cl->resolveClass(); \
   cl->initialiseClass(this);
   
-  // If a string belongs to the vm hashmap, we must remove it when
-  // it's destroyed. So we define a new VT for strings that will be
-  // placed in the hashmap. This VT will have its destructor set so
-  // that the string is removed when deallocated.
-  upcalls->newString->resolveClass();
-  if (JavaString::internStringVT == NULL) {
-    JavaVirtualTable* stringVT = upcalls->newString->getVirtualVT();
-    uint32 size = upcalls->newString->virtualTableSize * sizeof(word_t);
-    
-    JavaString::internStringVT = 
-      (JavaVirtualTable*)bootstrapLoader->allocator.Allocate(size, "String VT");
-
-    memcpy(JavaString::internStringVT, stringVT, size);
-    
-    JavaString::internStringVT->destructor = 
-      (word_t)JavaString::stringDestructor;
-
-    // Tell the finalizer that this is a native destructor.
-    JavaString::internStringVT->operatorDelete = 
-      (word_t)JavaString::stringDestructor;
-  }
-  upcalls->newString->initialiseClass(this);
+  LOAD_CLASS(upcalls->newString);
 
   // The initialization code of the classes initialized below may require
   // to get the Java thread, so we create the Java thread object first.

Modified: vmkit/trunk/lib/j3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jnjvm.h?rev=145687&r1=145686&r2=145687&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/j3/VMCore/Jnjvm.h Fri Dec  2 11:52:23 2011
@@ -28,6 +28,7 @@
 namespace j3 {
 
 class ArrayObject;
+class ArrayUInt16;
 class Classpath;
 class CommonClass;
 class FinalizerThread;
@@ -243,10 +244,6 @@
   ///
   JnjvmClassLoader* appClassLoader;
 
-  /// hashStr - Hash map of java/lang/String objects allocated by this JVM.
-  ///
-  StringMap hashStr;
- 
 public:
   
   /// CreateExceptions - These are the runtime exceptions thrown by Java code

Removed: vmkit/trunk/lib/j3/VMCore/LockedMap.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/LockedMap.cpp?rev=145686&view=auto
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/LockedMap.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/LockedMap.cpp (removed)
@@ -1,40 +0,0 @@
-//===------- LockedMap.cpp - Implementation of the UTF8 map ---------------===//
-//
-//                            The VMKit project
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include <map>
-
-#include "JavaArray.h"
-#include "JavaString.h"
-#include "LockedMap.h"
-
-namespace j3 {
-
-bool ltarray16::operator()(const ArrayUInt16* s1, const ArrayUInt16* s2) const {
-  llvm_gcroot(s1, 0);
-  llvm_gcroot(s2, 0);
-  if (ArrayUInt16::getSize(s1) < ArrayUInt16::getSize(s2)) return true;
-  else if (ArrayUInt16::getSize(s1) > ArrayUInt16::getSize(s2)) return false;
-  else return memcmp((const char*)ArrayUInt16::getElements(s1),
-                     (const char*)ArrayUInt16::getElements(s2),
-                     ArrayUInt16::getSize(s1) * sizeof(uint16)) < 0;
-}
-
-void StringMap::insert(JavaString* str) {
-  const ArrayUInt16* array = NULL;
-  llvm_gcroot(str, 0);
-  llvm_gcroot(array, 0);
-  array = JavaString::getValue(str);
-  StringMap::iterator it = map.insert(std::make_pair(array, str)).first;
-  assert(map.find(array)->second == str);
-  assert(map.find(array)->first == array);
-  assert(&(map.find(array)->second) == &(it->second));
-  assert(&(map.find(array)->first) == &(it->first));
-}
-
-}

Modified: vmkit/trunk/lib/j3/VMCore/LockedMap.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/LockedMap.h?rev=145687&r1=145686&r2=145687&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/LockedMap.h (original)
+++ vmkit/trunk/lib/j3/VMCore/LockedMap.h Fri Dec  2 11:52:23 2011
@@ -30,83 +30,9 @@
 
 namespace j3 {
 
-class ArrayUInt16;
-class JavaString;
-class JnjvmClassLoader;
 class Signdef;
 class Typedef;
 class UserCommonClass;
-class UserClassArray;
-
-struct ltarray16 {
-  bool operator()(const ArrayUInt16 *const s1, const ArrayUInt16 *const s2) const;
-};
-
-class StringMap : public vmkit::PermanentObject {
-public:
-  typedef std::map<const ArrayUInt16 *const, JavaString*, ltarray16>::iterator iterator;
-  typedef JavaString* (*funcCreate)(const ArrayUInt16 *const& V, Jnjvm* vm);
-
-  vmkit::LockNormal lock;
-  std::map<const ArrayUInt16 *const, JavaString*, ltarray16,
-           std::allocator<std::pair<const ArrayUInt16 *const, JavaString*> > > map;
-  
-  inline JavaString* lookupOrCreate(const ArrayUInt16 *const array, Jnjvm* vm, funcCreate func) {
-    JavaString* res = 0;
-    llvm_gcroot(res, 0);
-    llvm_gcroot(array, 0);
-    lock.lock();
-    iterator End = map.end();
-    iterator I = map.find(array);
-    if (I == End) {
-      res = func(array, vm);
-      map.insert(std::make_pair(array, res));
-      lock.unlock();
-      return res;
-    } else {
-      lock.unlock();
-      return ((JavaString*)(I->second));
-    }
-  }
-  
-  inline void remove(const ArrayUInt16 *const array) {
-    llvm_gcroot(array, 0);
-    lock.lock();
-    map.erase(array);
-    lock.unlock();
-  }
-
-  inline JavaString* lookup(const ArrayUInt16 *const array) {
-    llvm_gcroot(array, 0);
-    lock.lock();
-    iterator End = map.end();
-    iterator I = map.find(array);
-    lock.unlock();
-    return I != End ? ((JavaString*)(I->second)) : 0; 
-  }
-
-  inline void hash(const ArrayUInt16 *const array, JavaString* str) {
-    llvm_gcroot(array, 0);
-    llvm_gcroot(str, 0);
-    lock.lock();
-    map.insert(std::make_pair(array, str));
-    lock.unlock();
-  }
-
-  inline void removeUnlocked(const ArrayUInt16 *const array, JavaString* str) {
-    llvm_gcroot(str, 0);
-    llvm_gcroot(array, 0);
-    iterator End = map.end();
-    iterator I = map.find(array);
-
-    if (I != End && I->second == str) map.erase(I); 
-  }
-
-  ~StringMap() {}
-
-  void insert(JavaString* str);
-};
-
 
 class ClassMap : public vmkit::PermanentObject {
 public:

Modified: vmkit/trunk/lib/j3/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/VirtualTables.cpp?rev=145687&r1=145686&r2=145687&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/VirtualTables.cpp Fri Dec  2 11:52:23 2011
@@ -284,26 +284,17 @@
     start = start->next;
   }
   
-  // (4) Trace the interned strings.
-  for (StringMap::iterator i = hashStr.map.begin(), e = hashStr.map.end();
-       i!= e; ++i) {
-    JavaString** str = &(i->second);
-    vmkit::Collector::markAndTraceRoot(str, closure);
-    ArrayUInt16** key = const_cast<ArrayUInt16**>(&(i->first));
-    vmkit::Collector::markAndTraceRoot(key, closure);
-  }
-
-  // (5) Trace the finalization queue.
+  // (4) Trace the finalization queue.
   for (uint32 i = 0; i < finalizerThread->CurrentFinalizedIndex; ++i) {
     vmkit::Collector::markAndTraceRoot(finalizerThread->ToBeFinalized + i, closure);
   }
   
-  // (6) Trace the reference queue
+  // (5) Trace the reference queue
   for (uint32 i = 0; i < referenceThread->ToEnqueueIndex; ++i) {
     vmkit::Collector::markAndTraceRoot(referenceThread->ToEnqueue + i, closure);
   }
  
-  // (7) Trace the locks and their associated object.
+  // (6) Trace the locks and their associated object.
   uint32 i = 0;
   for (; i < vmkit::LockSystem::GlobalSize; i++) {
     vmkit::FatLock** array = lockSystem.LockTable[i];




From nicolas.geoffray at gmail.com  Fri Dec  2 09:58:35 2011
From: nicolas.geoffray at gmail.com (Nicolas Geoffray)
Date: Fri, 2 Dec 2011 18:58:35 +0100
Subject: [vmkit-commits] FatLock assertion failure?
In-Reply-To: <CAKGWAO9X-79ax8zBZ5pGEZuOZn--6TcPpb9PgnASGDRydj9iig@mail.gmail.com>
References: <CAKGWAO9YXa6ehFk4_dX7v++518joWhWZjDFFXthWccxwCKwQuA@mail.gmail.com>
	<CAPYwfirVfUNUNEiMdCYbjUGNtP-n_tvL3zbarzjq1o2hM=ZHEw@mail.gmail.com>
	<CAKGWAO-9c73qBxPQH4gbrcFm+b30HPW1zAU-3TeiRB-O0Ho8gg@mail.gmail.com>
	<CAPYwfirRWAiZze-4VuBRGF3iMPVnyRZ7wDWO-WTFLHh=i301QA@mail.gmail.com>
	<CAKGWAO9X-79ax8zBZ5pGEZuOZn--6TcPpb9PgnASGDRydj9iig@mail.gmail.com>
Message-ID: <CAPYwfipB0FVZ=5SyTEdf9YAiuBxLjWHtf2J+b=V_+C1p_LCsPg@mail.gmail.com>

Hi Will,

On Thu, Dec 1, 2011 at 11:50 PM, Will Dietz <wdietz2 at illinois.edu> wrote:

> On Thu, Dec 1, 2011 at 3:19 PM, Nicolas Geoffray
> <nicolas.geoffray at gmail.com> wrote:
> > Thanks Will for debugging the problem! Indeed, I commented the releasing
> of
> > the fat lock and it worked without any crashes. That's great news
> because it
> > looks like we nailed it. The bad news though is that if we don't release
> a
> > fat lock, it will never be able to get used again. Even worst is if we
> need
> > to keep a pointer to the associated object. The lock will just keep that
> > object alive forever.
> > If it helps, I'm ok with submitting a change that basically comments out
> the
> > release of a FatLock. When I'll have time, I'll investigate more at which
> > point do we have a race.
> > Cheers,
> > Nicolas
> >
>
> Welcome, I was very glad at how well that fixes it myself :).
>
> There are two issues you mention--one is worrying about consuming Lock
> resources, and I think that's not really a concern.  Looking at this:
>
>
> http://www.research.ibm.com/people/d/dfb/thinlocks-publications.html#Bacon03Retrospective
>
> They claim it never happens in practice, and only theoretically
> happens in pathological cases.  They also describe the difficulty of
> deflation a tad (but not as well as others) including brief mentions
> of solutions that might be of interest to VMKit.  Anyway I don't think
> we should worry about running out of space for locks.
>

I need to read the paper, but inflating a lock in a multi-threaded
environment does not look pathological to me.


>
> The other issue you mention is miscalculating the liveness of an
> object through its lock.  I agree this is something we should fix but
> I'm okay postponing it for now.
>

Yes, that's a bigger issue. I'd be fine not reallocating the lock, if I was
assured the associated object could be GC'ed.


>
> FWIW inlined below is a sample patch that's been working for me.  If
> you prefer we can comment out the code instead of removing it, I'm
> fine either way.  Removing the spinlocks/thread counts is a nice
> bonus.
>

I'd rather comment it out. It's been a long time I haven't touched that
code, and these fields were needed for a proper (modulo the bugs we're
currently seeing :)) implementation.

Nicolas


>
> ~Will
>
> From f4bf1be53feaa8b419fea8654c34fb04f735f61d Mon Sep 17 00:00:00 2001
> From: Will Dietz <w at wdtz.org>
> Date: Tue, 29 Nov 2011 14:24:44 -0600
> Subject: [PATCH] Remove code that deflates fat locks, due to races it
> doesn't
>  work on SMP.
>
> Fixes bug where multithreaded code would occasionally assert out with:
> j3: /home/will/vmkit-svn/lib/vmkit/CommonThread/ObjectLocks.cpp:305:
> bool vmkit::FatLock::acquire(gc *): Assertion `obj->header &
> ThinLock::FatMask' failed.
> ---
>  include/vmkit/ObjectLocks.h            |    9 +------
>  lib/vmkit/CommonThread/ObjectLocks.cpp |   43
> +------------------------------
>  2 files changed, 3 insertions(+), 49 deletions(-)
>
> diff --git a/include/vmkit/ObjectLocks.h b/include/vmkit/ObjectLocks.h
> index 1b0b4d3..7409e80 100644
> --- a/include/vmkit/ObjectLocks.h
> +++ b/include/vmkit/ObjectLocks.h
> @@ -68,9 +68,6 @@ public:
>  class FatLock : public vmkit::PermanentObject {
>  private:
>   vmkit::LockRecursive internalLock;
> -  vmkit::SpinLock spinLock;
> -  uint32_t waitingThreads;
> -  uint32_t lockingThreads;
>   LockingThread* firstThread;
>   gc* associatedObject;
>   uint32_t index;
> @@ -171,14 +168,10 @@ public:
>   static const uint64_t ThinCountShift = NonLockBits;
>   static const uint64_t ThinCountAdd = 1LL << NonLockBits;
>
> -  /// initialise - Initialise the value of the lock.
> -  ///
> -  static void removeFatLock(FatLock* fatLock, LockSystem& table);
> -
>   /// overflowThinlock - Change the lock of this object to a fat lock
> because
>   /// we have reached the maximum number of locks.
>   static void overflowThinLock(gc* object, LockSystem& table);
> -
> +
>   /// changeToFatlock - Change the lock of this object to a fat lock. The
> lock
>   /// may be in a thin lock or fat lock state.
>   static FatLock* changeToFatlock(gc* object, LockSystem& table);
> diff --git a/lib/vmkit/CommonThread/ObjectLocks.cpp
> b/lib/vmkit/CommonThread/ObjectLocks.cpp
> index 9456045..cd99492 100644
> --- a/lib/vmkit/CommonThread/ObjectLocks.cpp
> +++ b/lib/vmkit/CommonThread/ObjectLocks.cpp
> @@ -39,27 +39,7 @@ void ThinLock::overflowThinLock(gc* object,
> LockSystem& table) {
>   } while (((object->header) & ~NonLockBitsMask) != ID);
>   assert(obj->associatedObject == object);
>  }
> -
> -/// initialise - Initialise the value of the lock.
> -///
> -void ThinLock::removeFatLock(FatLock* fatLock, LockSystem& table) {
> -  gc* object = fatLock->associatedObject;
> -  llvm_gcroot(object, 0);
> -  word_t ID;
> -  word_t oldValue = 0;
> -  word_t newValue = 0;
> -  word_t yieldedValue = 0;
>
> -  ID = fatLock->getID();
> -  do {
> -    oldValue = object->header;
> -    newValue = oldValue & NonLockBitsMask;
> -    yieldedValue = __sync_val_compare_and_swap(&object->header,
> oldValue, newValue);
> -  } while (oldValue != yieldedValue);
> -  assert((oldValue & NonLockBitsMask) != ID);
> -  fatLock->associatedObject = NULL;
> -}
> -
>  FatLock* ThinLock::changeToFatlock(gc* object, LockSystem& table) {
>   llvm_gcroot(object, 0);
>   if (!(object->header & FatMask)) {
> @@ -262,8 +242,6 @@ FatLock::FatLock(uint32_t i, gc* a) {
>   firstThread = NULL;
>   index = i;
>   setAssociatedObject(a);
> -  waitingThreads = 0;
> -  lockingThreads = 0;
>   nextFreeLock = NULL;
>  }
>
> @@ -275,11 +253,6 @@ void FatLock::release(gc* obj, LockSystem& table) {
>   llvm_gcroot(obj, 0);
>   assert(associatedObject && "No associated object when releasing");
>   assert(associatedObject == obj && "Mismatch object in lock");
> -  if (!waitingThreads && !lockingThreads &&
> -      internalLock.recursionCount() == 1) {
> -    vmkit::ThinLock::removeFatLock(this, table);
> -    table.deallocate(this);
> -  }
>   internalLock.unlock();
>  }
>
> @@ -287,16 +260,8 @@ void FatLock::release(gc* obj, LockSystem& table) {
>  ///
>  bool FatLock::acquire(gc* obj) {
>   llvm_gcroot(obj, 0);
> -
> -  spinLock.lock();
> -  lockingThreads++;
> -  spinLock.unlock();
> -
> +
>   internalLock.lock();
> -
> -  spinLock.lock();
> -  lockingThreads--;
> -  spinLock.unlock();
>
>   if (associatedObject != obj) {
>     internalLock.unlock();
> @@ -421,8 +386,6 @@ bool LockingThread::wait(
>
>   bool timeout = false;
>
> -  l->waitingThreads++;
> -
>   while (!this->interruptFlag && this->nextWaiting) {
>     if (timed) {
>       timeout = varcondThread.timedWait(&l->internalLock, info);
> @@ -432,9 +395,7 @@ bool LockingThread::wait(
>     }
>   }
>   assert(vmkit::ThinLock::owner(self, table) && "Not owner after wait");
> -
> -  l->waitingThreads--;
> -
> +
>   assert((!l->firstThread || (l->firstThread->prevWaiting &&
>          l->firstThread->nextWaiting)) && "Inconsistent list");
>
> --
> 1.7.5.1
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111202/15442cf5/attachment.html>

From wdietz2 at illinois.edu  Fri Dec  2 21:57:13 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sat, 03 Dec 2011 05:57:13 -0000
Subject: [vmkit-commits] [vmkit] r145760 -
	/vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp
Message-ID: <20111203055713.1CC6E2A6C12C@llvm.org>

Author: wdietz2
Date: Fri Dec  2 23:57:12 2011
New Revision: 145760

URL: http://llvm.org/viewvc/llvm-project?rev=145760&view=rev
Log:
Disable fat lock deflation code in ObjectLocks.cpp

Fixes occasional assertion failure when running on multi-core machine.

Modified:
    vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp

Modified: vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp?rev=145760&r1=145759&r2=145760&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp (original)
+++ vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp Fri Dec  2 23:57:12 2011
@@ -42,6 +42,7 @@
  
 /// initialise - Initialise the value of the lock.
 ///
+#if 0
 void ThinLock::removeFatLock(FatLock* fatLock, LockSystem& table) {
   gc* object = fatLock->associatedObject;
   llvm_gcroot(object, 0);
@@ -59,6 +60,7 @@
   assert((oldValue & NonLockBitsMask) != ID);
   fatLock->associatedObject = NULL;
 }
+#endif
   
 FatLock* ThinLock::changeToFatlock(gc* object, LockSystem& table) {
   llvm_gcroot(object, 0);
@@ -275,11 +277,13 @@
   llvm_gcroot(obj, 0);
   assert(associatedObject && "No associated object when releasing");
   assert(associatedObject == obj && "Mismatch object in lock");
+#if 0
   if (!waitingThreads && !lockingThreads &&
       internalLock.recursionCount() == 1) {
     vmkit::ThinLock::removeFatLock(this, table);
     table.deallocate(this);
   }
+#endif
   internalLock.unlock();
 }
 




From wdietz2 at illinois.edu  Sat Dec  3 01:01:30 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sat, 03 Dec 2011 09:01:30 -0000
Subject: [vmkit-commits] [vmkit] r145761 - in
 /vmkit/trunk/lib/j3/ClassLib/OpenJDK: JavaUpcalls.cpp JavaUpcalls.h
Message-ID: <20111203090130.1DCAF2A6C12C@llvm.org>

Author: wdietz2
Date: Sat Dec  3 03:01:29 2011
New Revision: 145761

URL: http://llvm.org/viewvc/llvm-project?rev=145761&view=rev
Log:
Override j.l.Reference's clinit--it wants to spawn a thread too early on.

This lays groundwork for using References earlier in the bootstrap sequence,
in particular to let us use a a Classpath-based WeakHashMap String intern
implementation.

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp?rev=145761&r1=145760&r2=145761&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp Sat Dec  3 03:01:29 2011
@@ -221,6 +221,12 @@
 JavaMethod* Classpath::EnqueueReference;
 Class*      Classpath::newReference;
 JavaField*  Classpath::NullRefQueue;
+JavaField*  Classpath::RefLock;
+Class*      Classpath::newRefLock;
+JavaField*  Classpath::RefPending;
+Class*      Classpath::RefHandlerClass;
+JavaMethod* Classpath::initRefHandler;
+JavaMethod* Classpath::threadStart;
 
 void Classpath::CreateJavaThread(Jnjvm* vm, JavaThread* myth,
                                  const char* thName, JavaObject* Group) {
@@ -259,11 +265,20 @@
   JavaObject* systemName = 0;
   JavaObject* MainGroup = 0;
   JavaObject* mainName = 0;
+  JavaObject* RefHandler = 0;
+  JavaObject* RefHandlerName = 0;
   llvm_gcroot(RG, 0);
   llvm_gcroot(SystemGroup, 0);
   llvm_gcroot(systemName, 0);
   llvm_gcroot(MainGroup, 0);
   llvm_gcroot(mainName, 0);
+  llvm_gcroot(RefHandler, 0);
+  llvm_gcroot(RefHandlerName, 0);
+
+  newRefLock->resolveClass();
+  newRefLock->initialiseClass(vm);
+  RefHandlerClass->resolveClass();
+  RefHandlerClass->initialiseClass(vm);
 
   // Resolve and initialize classes first.
   newThread->resolveClass();
@@ -292,6 +307,15 @@
   // Create the enqueue thread.
   assert(vm->getReferenceThread() && "VM did not set its enqueue thread");
   CreateJavaThread(vm, vm->getReferenceThread(), "Reference", SystemGroup);
+
+  // Create the ReferenceHandler thread.
+  RefHandler = RefHandlerClass->doNew(vm);
+  RefHandlerName = vm->asciizToStr("Reference Handler");
+  initRefHandler->invokeIntSpecial(vm, RefHandlerClass, RefHandler,
+      &SystemGroup, &RefHandlerName);
+  priority->setInstanceInt32Field(RefHandler, 10); // MAX_PRIORITY
+  daemon->setInstanceInt8Field(RefHandler, (uint32)true);
+  threadStart->invokeIntVirtual(vm, RefHandlerClass, RefHandler);
 }
 
 extern "C" void Java_java_lang_ref_WeakReference__0003Cinit_0003E__Ljava_lang_Object_2(
@@ -410,6 +434,23 @@
   return res;
 }
 
+// The OpenJDK Reference clinit spawns a Thread!
+// We split that functionality out until we have threading working.
+extern "C" void Java_java_lang_ref_Reference__0003Cclinit_0003E() {
+  JavaObject* lock = 0;
+  llvm_gcroot(lock, 0);
+  BEGIN_NATIVE_EXCEPTION(0)
+  Jnjvm* vm = JavaThread::get()->getJVM();
+
+  // Initialize the static fields of this class, skip
+  // the spawning of the reference queue thread.
+  lock = vm->upcalls->newRefLock->doNew(vm);
+  vm->upcalls->RefLock->setStaticObjectField(lock);
+  vm->upcalls->RefPending->setStaticObjectField(NULL);
+
+  END_NATIVE_EXCEPTION
+}
+
 extern "C" void nativeJavaObjectClassTracer(
     JavaObjectClass* obj, word_t closure) {
   JavaObjectClass::staticTracer(obj, closure);
@@ -847,6 +888,23 @@
 
   newReference = UPCALL_CLASS(loader, "java/lang/ref/Reference");
 
+  RefLock = UPCALL_FIELD(loader, "java/lang/ref/Reference",
+      "lock", "Ljava/lang/ref/Reference$Lock;", ACC_STATIC);
+  RefPending = UPCALL_FIELD(loader, "java/lang/ref/Reference",
+      "pending", "Ljava/lang/ref/Reference;", ACC_STATIC);
+
+  newRefLock = UPCALL_CLASS(loader, "java/lang/ref/Reference$Lock");
+
+  RefHandlerClass =
+    UPCALL_CLASS(loader, "java/lang/ref/Reference$ReferenceHandler");
+  initRefHandler =
+    UPCALL_METHOD(loader, "java/lang/ref/Reference$ReferenceHandler", "<init>",
+        "(Ljava/lang/ThreadGroup;Ljava/lang/String;)V", ACC_VIRTUAL);
+
+  threadStart =
+    UPCALL_METHOD(loader, "java/lang/Thread", "start",
+        "()V", ACC_VIRTUAL);
+
   EnqueueReference =
     UPCALL_METHOD(loader, "java/lang/ref/Reference",  "enqueue", "()Z",
                   ACC_VIRTUAL);
@@ -884,6 +942,11 @@
                   "(Ljava/lang/Object;Ljava/lang/ref/ReferenceQueue;)V",
                   ACC_VIRTUAL);
   initPhantomReference->setNative();
+
+  JavaMethod * ReferenceClassInit =
+    UPCALL_METHOD(loader, "java/lang/ref/Reference", "<clinit>",
+                  "()V", ACC_STATIC);
+  ReferenceClassInit->setNative();
 }
 
 void Classpath::InitializeSystem(Jnjvm * jvm) {

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h?rev=145761&r1=145760&r2=145761&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h Sat Dec  3 03:01:29 2011
@@ -257,8 +257,14 @@
   ISOLATE_STATIC JavaField* constructorClass;
 
   ISOLATE_STATIC JavaMethod* EnqueueReference;
-  ISOLATE_STATIC Class*      newReference;
+  ISOLATE_STATIC UserClass*  newReference;
   ISOLATE_STATIC JavaField*  NullRefQueue;
+  ISOLATE_STATIC JavaField*  RefLock;
+  ISOLATE_STATIC UserClass*  newRefLock;
+  ISOLATE_STATIC JavaField*  RefPending;
+  ISOLATE_STATIC UserClass*  RefHandlerClass;
+  ISOLATE_STATIC JavaMethod* initRefHandler;
+  ISOLATE_STATIC JavaMethod* threadStart;
 
   ISOLATE_STATIC UserClass*  EnumClass;
 




From wdietz2 at illinois.edu  Sat Dec  3 01:01:32 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sat, 03 Dec 2011 09:01:32 -0000
Subject: [vmkit-commits] [vmkit] r145762 - in /vmkit/trunk: LICENSE.TXT
 lib/j3/ClassLib/OpenJDK/java/ lib/j3/ClassLib/OpenJDK/java/lang/
 lib/j3/ClassLib/OpenJDK/java/lang/VMString.java
Message-ID: <20111203090132.862F32A6C12C@llvm.org>

Author: wdietz2
Date: Sat Dec  3 03:01:32 2011
New Revision: 145762

URL: http://llvm.org/viewvc/llvm-project?rev=145762&view=rev
Log:
Import VMString.java from GNU Classpath 0-97.2 for string interning in OpenJDK

Updated LICENSE.txt accordingly.

Added:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/java/
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/java/lang/
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/java/lang/VMString.java
Modified:
    vmkit/trunk/LICENSE.TXT

Modified: vmkit/trunk/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/LICENSE.TXT?rev=145762&r1=145761&r2=145762&view=diff
==============================================================================
--- vmkit/trunk/LICENSE.TXT (original)
+++ vmkit/trunk/LICENSE.TXT Sat Dec  3 03:01:32 2011
@@ -64,3 +64,4 @@
 MMTk                vmkit/mmtk/
 JNI                 vmkit/include/j3/
 OpenJDK             vmkit/include/j3/openjdk
+GNU Classpath       vmkit/lib/j3/ClassLib/OpenJDK/java

Added: vmkit/trunk/lib/j3/ClassLib/OpenJDK/java/lang/VMString.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/java/lang/VMString.java?rev=145762&view=auto
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/java/lang/VMString.java (added)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/java/lang/VMString.java Sat Dec  3 03:01:32 2011
@@ -0,0 +1,91 @@
+/* VMString.java -- VM Specific String methods
+   Copyright (C) 2003 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.lang;
+
+import java.lang.ref.WeakReference;
+import java.util.WeakHashMap;
+
+/*
+ * This class is a reference version, mainly for compiling a class library
+ * jar.  It is likely that VM implementers replace this with their own
+ * version that can communicate effectively with the VM.
+ */
+
+/**
+ * Code relocated from java.lang.String by 
+ * @author Dave Grove <groved at us.ibm.com>
+ */
+final class VMString
+{
+
+  /**
+   * Holds the references for each intern()'d String. If all references to
+   * the string disappear, and the VM properly supports weak references,
+   * the String will be GC'd.
+   */
+  private static final WeakHashMap internTable = new WeakHashMap();
+
+  /**
+   * Fetches this String from the intern hashtable. If two Strings are
+   * considered equal, by the equals() method, then intern() will return the
+   * same String instance. ie. if (s1.equals(s2)) then
+   * (s1.intern() == s2.intern()). All string literals and string-valued
+   * constant expressions are already interned.
+   *
+   * @param str the String to intern
+   * @return the interned String
+   */
+  static String intern(String str)
+  {
+    synchronized (internTable)
+      {
+        WeakReference ref = (WeakReference) internTable.get(str);
+        if (ref != null)
+          {
+            String s = (String) ref.get();
+            // If s is null, then no strong references exist to the String;
+            // the weak hash map will soon delete the key.
+            if (s != null)
+              return s;
+          }
+        internTable.put(str, new WeakReference(str));
+      }
+    return str;
+  }
+
+} // class VMString




From wdietz2 at illinois.edu  Sat Dec  3 01:01:35 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sat, 03 Dec 2011 09:01:35 -0000
Subject: [vmkit-commits] [vmkit] r145763 - in /vmkit/trunk:
 Makefile.config.in Makefile.rules autoconf/configure.ac
 lib/j3/ClassLib/Classpath.h.in lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
 lib/j3/ClassLib/OpenJDK/JavaUpcalls.h lib/j3/ClassLib/OpenJDK/Makefile
 lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111203090135.4FE562A6C12C@llvm.org>

Author: wdietz2
Date: Sat Dec  3 03:01:34 2011
New Revision: 145763

URL: http://llvm.org/viewvc/llvm-project?rev=145763&view=rev
Log:
Build VMString into zip, pull into OpenJDK build for string interning.

(OpenJDK now builds again, seems to work as well as before)

Modified:
    vmkit/trunk/Makefile.config.in
    vmkit/trunk/Makefile.rules
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/lib/j3/ClassLib/Classpath.h.in
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/Makefile
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=145763&r1=145762&r2=145763&view=diff
==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Sat Dec  3 03:01:34 2011
@@ -17,6 +17,8 @@
 MMTK_PLAN_HEADER = @MMTK_PLAN_HEADER@
 WITH_64 = @WITH_64@
 ANT = @ANT@
+JAVAC= @JAVAC@
+ZIP =@ZIP@
 
 CLASSPATH_IMPL = @classpathimpl@
 

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=145763&r1=145762&r2=145763&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Sat Dec  3 03:01:34 2011
@@ -145,3 +145,26 @@
 	-$(Verb) $(RM) -f FrametablesExterns.inc FrametablesSymbols.inc
 	
 endif
+
+###############################################################################
+# COMPILE_OPENJDK_ZIP: Build the specified java sources and zip them up
+###############################################################################
+ifeq ($(COMPILE_OPENJDK_ZIP), 1)
+
+# Some variables
+VMKIT_OPENJDK_ZIP=$(PROJ_OBJ_DIR)/vmkit-openjdk.zip
+CLASSES_DIR=$(PROJ_OBJ_DIR)/classes
+
+all-local:: $(VMKIT_OPENJDK_ZIP)
+clean-local::
+	-$(Verb) $(RM) -f $(CLASSES_DIR) $(VMKIT_OPENJDK_ZIP)
+
+
+$(VMKIT_OPENJDK_ZIP): $(addprefix $(PROJ_SRC_DIR)/,$(OPENJDK_JAVA_SOURCES))
+	$(Echo) "Building OpenJDK java sources into zip"
+	-$(Verb) $(RM) -rf $@ $(CLASSES_DIR)
+	$(Verb) $(MKDIR) $(CLASSES_DIR)
+	$(Verb) $(JAVAC) $^ -d $(CLASSES_DIR)
+	cd $(CLASSES_DIR) && $(ZIP) -qr $(VMKIT_OPENJDK_ZIP) .
+
+endif

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=145763&r1=145762&r2=145763&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Sat Dec  3 03:01:34 2011
@@ -304,6 +304,8 @@
 AC_PATH_PROG(LLVMAS, [llvm-as],  [llvm-as])
 AC_PATH_PROG(LLC, [llc],  [llc])
 AC_PATH_PROG(ANT, [ant])
+AC_PATH_PROG(JAVAC, [javac], [javac])
+AC_PATH_PROG(ZIP, [zip], [zip])
 
 dnl Find the install program
 AC_PROG_INSTALL

Modified: vmkit/trunk/lib/j3/ClassLib/Classpath.h.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/Classpath.h.in?rev=145763&r1=145762&r2=145763&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/Classpath.h.in (original)
+++ vmkit/trunk/lib/j3/ClassLib/Classpath.h.in Sat Dec  3 03:01:34 2011
@@ -27,12 +27,7 @@
 #define OpenJDKArch "@openjdkarchdir@"
 
 // OpenJDK Bootstrap classpath
-#define OpenJDKBootPath \
-      OpenJDKJRE "/lib/rt.jar" \
-  ":" OpenJDKJRE "/lib/resources.jar" \
-  ":" OpenJDKJRE "/lib/jsse.jar" \
-  ":" OpenJDKJRE "/lib/jce.jar" \
-  ":" OpenJDKJRE "/lib/charsets.jar"
+extern const char * OpenJDKBootPath;
 
 // Location of OpenJDK's libjava.so
 #define OpenJDKLibJava OpenJDKArch "/libjava.so"

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp?rev=145763&r1=145762&r2=145763&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp Sat Dec  3 03:01:34 2011
@@ -47,6 +47,7 @@
 Class*      Classpath::threadGroup;
 JavaMethod* Classpath::getUncaughtExceptionHandler;
 JavaMethod* Classpath::uncaughtException;
+JavaMethod* Classpath::internString;
 
 JavaMethod* Classpath::setContextClassLoader;
 JavaMethod* Classpath::getSystemClassLoader;
@@ -228,6 +229,14 @@
 JavaMethod* Classpath::initRefHandler;
 JavaMethod* Classpath::threadStart;
 
+const char * OpenJDKBootPath =
+      OpenJDKJRE "/lib/rt.jar"
+  ":" OpenJDKJRE "/lib/resources.jar"
+  ":" OpenJDKJRE "/lib/jsse.jar"
+  ":" OpenJDKJRE "/lib/jce.jar"
+  ":" OpenJDKJRE "/lib/charsets.jar"
+  ":" VMKitOpenJDKZip ;
+
 void Classpath::CreateJavaThread(Jnjvm* vm, JavaThread* myth,
                                  const char* thName, JavaObject* Group) {
   JavaObject* th = NULL;
@@ -947,6 +956,12 @@
     UPCALL_METHOD(loader, "java/lang/ref/Reference", "<clinit>",
                   "()V", ACC_STATIC);
   ReferenceClassInit->setNative();
+
+  // String support
+
+  internString =
+    UPCALL_METHOD(loader, "java/lang/VMString", "intern",
+        "(Ljava/lang/String;)Ljava/lang/String;", ACC_STATIC);
 }
 
 void Classpath::InitializeSystem(Jnjvm * jvm) {

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h?rev=145763&r1=145762&r2=145763&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h Sat Dec  3 03:01:34 2011
@@ -144,6 +144,7 @@
   ISOLATE_STATIC UserClass* threadGroup;
   ISOLATE_STATIC JavaMethod* getUncaughtExceptionHandler;
   ISOLATE_STATIC JavaMethod* uncaughtException;
+  ISOLATE_STATIC JavaMethod* internString;
 
 
   ISOLATE_STATIC UserClass* InvocationTargetException;

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/Makefile?rev=145763&r1=145762&r2=145763&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/Makefile (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/Makefile Sat Dec  3 03:01:34 2011
@@ -14,9 +14,13 @@
 
 MODULE_WITH_GC = Classpath
 
+COMPILE_OPENJDK_ZIP=1
+OPENJDK_JAVA_SOURCES=java/lang/VMString.java
+
 include $(LEVEL)/Makefile.common
 
 CXX.Flags += -I$(PROJ_SRC_DIR)/../../VMCore
 CXX.Flags += -I$(PROJ_SRC_ROOT)/include/j3
 CXX.Flags += -I$(PROJ_SRC_DIR)/.. -I$(PROJ_OBJ_DIR)/..
 CXX.Flags += -I$(PROJ_SRC_ROOT)/include/j3/openjdk
+CXX.Flags += -DVMKitOpenJDKZip=\"$(VMKIT_OPENJDK_ZIP)\"

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=145763&r1=145762&r2=145763&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Sat Dec  3 03:01:34 2011
@@ -175,10 +175,6 @@
   llvm_gcroot(array, 0);
   llvm_gcroot(res, 0);
 
-  // If already intern'd, just return.
-  if(str->getVirtualTable() == JavaString::internStringVT)
-    return _str;
-
   BEGIN_JNI_EXCEPTION
 
   Jnjvm* vm = JavaThread::get()->getJVM();




From wdietz2 at illinois.edu  Sat Dec  3 01:01:36 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sat, 03 Dec 2011 09:01:36 -0000
Subject: [vmkit-commits] [vmkit] r145764 - /vmkit/trunk/configure
Message-ID: <20111203090136.8EF122A6C12C@llvm.org>

Author: wdietz2
Date: Sat Dec  3 03:01:36 2011
New Revision: 145764

URL: http://llvm.org/viewvc/llvm-project?rev=145764&view=rev
Log:
Regenerate configure for updated configure.ac in previous commit.

Modified:
    vmkit/trunk/configure

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=145764&r1=145763&r2=145764&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Sat Dec  3 03:01:36 2011
@@ -611,6 +611,8 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+ZIP
+JAVAC
 ANT
 LLC
 LLVMAS
@@ -5248,6 +5250,88 @@
 fi
 
 
+# Extract the first word of "javac", so it can be a program name with args.
+set dummy javac; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_JAVAC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $JAVAC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_JAVAC" && ac_cv_path_JAVAC="javac"
+  ;;
+esac
+fi
+JAVAC=$ac_cv_path_JAVAC
+if test -n "$JAVAC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
+$as_echo "$JAVAC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "zip", so it can be a program name with args.
+set dummy zip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ZIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ZIP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="zip"
+  ;;
+esac
+fi
+ZIP=$ac_cv_path_ZIP
+if test -n "$ZIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5
+$as_echo "$ZIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or




From wdietz2 at illinois.edu  Sat Dec  3 01:50:07 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sat, 03 Dec 2011 09:50:07 -0000
Subject: [vmkit-commits] [vmkit] r145767 - /vmkit/trunk/tests/LockThread.java
Message-ID: <20111203095007.507522A6C12C@llvm.org>

Author: wdietz2
Date: Sat Dec  3 03:50:07 2011
New Revision: 145767

URL: http://llvm.org/viewvc/llvm-project?rev=145767&view=rev
Log:
Add Lock and Thread test that presently causes VMKit to crash.

Added:
    vmkit/trunk/tests/LockThread.java

Added: vmkit/trunk/tests/LockThread.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/LockThread.java?rev=145767&view=auto
==============================================================================
--- vmkit/trunk/tests/LockThread.java (added)
+++ vmkit/trunk/tests/LockThread.java Sat Dec  3 03:50:07 2011
@@ -0,0 +1,29 @@
+// Some madness with threads and locks.  Shouldn't cause VM to crash!
+public class LockThread extends Thread {
+  static Object Lock;
+  static long x = 0;
+  static final long max = 1000000;
+  public void run() {
+    while(x < max)
+      synchronized(Lock) {
+        ++x;
+        if (x % 100 == 0)
+          ++x;
+      }
+  }
+
+  public static void main(String[] args) {
+    Lock = new Object();
+    for(int iter = 0; iter < 100; ++iter) {
+      x = 0;
+      for(int i = 0; i < 100; ++i) {
+        new LockThread().start();
+      }
+      while(x < max)
+        Lock = new Object();
+      try {
+        sleep(100);
+      } catch(InterruptedException ignored);
+    }
+  }
+}




From wdietz2 at illinois.edu  Sat Dec  3 02:44:47 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sat, 03 Dec 2011 10:44:47 -0000
Subject: [vmkit-commits] [vmkit] r145768 - /vmkit/trunk/tests/LockThread.java
Message-ID: <20111203104447.2C4122A6C12C@llvm.org>

Author: wdietz2
Date: Sat Dec  3 04:44:46 2011
New Revision: 145768

URL: http://llvm.org/viewvc/llvm-project?rev=145768&view=rev
Log:
Simplify LockThread test: force too many fatlocks to be alloc'd, VM segfaults.

Modified:
    vmkit/trunk/tests/LockThread.java

Modified: vmkit/trunk/tests/LockThread.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/LockThread.java?rev=145768&r1=145767&r2=145768&view=diff
==============================================================================
--- vmkit/trunk/tests/LockThread.java (original)
+++ vmkit/trunk/tests/LockThread.java Sat Dec  3 04:44:46 2011
@@ -1,29 +1,26 @@
-// Some madness with threads and locks.  Shouldn't cause VM to crash!
+// Allocate too many fat locks, crash VM
 public class LockThread extends Thread {
   static Object Lock;
   static long x = 0;
-  static final long max = 1000000;
+  static final long max = 1000;
   public void run() {
     while(x < max)
       synchronized(Lock) {
         ++x;
-        if (x % 100 == 0)
-          ++x;
       }
   }
 
   public static void main(String[] args) {
-    Lock = new Object();
-    for(int iter = 0; iter < 100; ++iter) {
-      x = 0;
-      for(int i = 0; i < 100; ++i) {
-        new LockThread().start();
-      }
-      while(x < max)
-        Lock = new Object();
-      try {
-        sleep(100);
-      } catch(InterruptedException ignored);
+    for(int i = 0; i < 2048; ++i) {
+      Lock = new Object();
+
+      Thread t1 = new LockThread();
+      Thread t2 = new LockThread();
+      t1.start();
+      t2.start();
+
+      try { t1.join(); } catch (InterruptedException ignore){}
+      try { t2.join(); } catch (InterruptedException ignore){}
     }
   }
 }




From wdietz2 at illinois.edu  Sun Dec  4 20:35:16 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Mon, 05 Dec 2011 04:35:16 -0000
Subject: [vmkit-commits] [vmkit] r145796 -
	/vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp
Message-ID: <20111205043516.B6F661BE003@llvm.org>

Author: wdietz2
Date: Sun Dec  4 22:35:16 2011
New Revision: 145796

URL: http://llvm.org/viewvc/llvm-project?rev=145796&view=rev
Log:
Small locking fix when allocating new portion of lock table.

Modified:
    vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp

Modified: vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp?rev=145796&r1=145795&r2=145796&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp (original)
+++ vmkit/trunk/lib/vmkit/CommonThread/ObjectLocks.cpp Sun Dec  4 22:35:16 2011
@@ -351,7 +351,7 @@
       abort();
     }
   
-    FatLock** tab = LockTable[index >> BitIndex];
+    FatLock** &tab = LockTable[index >> BitIndex];
   
     VirtualMachine* vm = vmkit::Thread::get()->MyVM;
     if (tab == NULL) {




From wdietz2 at illinois.edu  Sun Dec  4 21:10:45 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Mon, 05 Dec 2011 05:10:45 -0000
Subject: [vmkit-commits] [vmkit] r145798 - in /vmkit/trunk/tests:
	LockThread.java ThreadTest.java
Message-ID: <20111205051045.EF2371BE003@llvm.org>

Author: wdietz2
Date: Sun Dec  4 23:10:45 2011
New Revision: 145798

URL: http://llvm.org/viewvc/llvm-project?rev=145798&view=rev
Log:
Drop weak LockThread test, add Thread spawning stress test to replace.

LockThread's primary issue was fixed in r145796, and remaining issue only
occurred occasionally.  ThreadTest exercises this more directly.

Added:
    vmkit/trunk/tests/ThreadTest.java
Removed:
    vmkit/trunk/tests/LockThread.java

Removed: vmkit/trunk/tests/LockThread.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/LockThread.java?rev=145797&view=auto
==============================================================================
--- vmkit/trunk/tests/LockThread.java (original)
+++ vmkit/trunk/tests/LockThread.java (removed)
@@ -1,26 +0,0 @@
-// Allocate too many fat locks, crash VM
-public class LockThread extends Thread {
-  static Object Lock;
-  static long x = 0;
-  static final long max = 1000;
-  public void run() {
-    while(x < max)
-      synchronized(Lock) {
-        ++x;
-      }
-  }
-
-  public static void main(String[] args) {
-    for(int i = 0; i < 2048; ++i) {
-      Lock = new Object();
-
-      Thread t1 = new LockThread();
-      Thread t2 = new LockThread();
-      t1.start();
-      t2.start();
-
-      try { t1.join(); } catch (InterruptedException ignore){}
-      try { t2.join(); } catch (InterruptedException ignore){}
-    }
-  }
-}

Added: vmkit/trunk/tests/ThreadTest.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/ThreadTest.java?rev=145798&view=auto
==============================================================================
--- vmkit/trunk/tests/ThreadTest.java (added)
+++ vmkit/trunk/tests/ThreadTest.java Sun Dec  4 23:10:45 2011
@@ -0,0 +1,17 @@
+public class ThreadTest extends Thread {
+  public void run() {
+    // Nothing
+  }
+
+  public static void main(String[] args) throws InterruptedException {
+    for(int i = 0; i < 10000; ++i) {
+      Thread t1 = new ThreadTest();
+      Thread t2 = new ThreadTest();
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+    }
+  }
+}




From wdietz2 at illinois.edu  Mon Dec  5 03:08:31 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Mon, 05 Dec 2011 11:08:31 -0000
Subject: [vmkit-commits] [vmkit] r145806 -
	/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111205110831.AAC661BE003@llvm.org>

Author: wdietz2
Date: Mon Dec  5 05:08:31 2011
New Revision: 145806

URL: http://llvm.org/viewvc/llvm-project?rev=145806&view=rev
Log:
Fix bugs in OpenJDK.inc that misused RETURN_FROM_JNI's evaluation of its param

RETURN_FROM_JNI evaluates the argument /after/ going back to uncooperative code
mode.  This is particularly damaging if evaluation of the argument can do
something like triggering a GC (common example: pushJNIRef).

Anyway, fixed this througout OpenJDK.inc, and introduced a new helper macro
RETURN_REF_FROM_JNI to make the common task of returning an object easier.

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=145806&r1=145805&r2=145806&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Mon Dec  5 05:08:31 2011
@@ -29,6 +29,12 @@
 #define NYI() \
   do{ assert(0 && "Not yet implemented!"); abort(); } while(0)
 
+// Convenience wrapper for returning a JNI ref to something
+#define RETURN_REF_FROM_JNI(a,type) {\
+  type __jni_ret_val = (type)th->pushJNIRef(a); \
+  RETURN_FROM_JNI(__jni_ret_val); \
+  }
+
 JavaObject* internalFillInStackTrace(JavaObject* throwable) {
 
   ArrayPtr* result = 0;
@@ -156,7 +162,7 @@
   BEGIN_JNI_EXCEPTION
 
   clone = JavaObject::clone(*(JavaObject**)obj);
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(clone));
+  RETURN_REF_FROM_JNI(clone, jobject);
 
   END_JNI_EXCEPTION
 
@@ -181,7 +187,7 @@
   array = JavaString::strToArray(str, vm);
   res = vm->constructString(array);
 
-  RETURN_FROM_JNI((jstring)th->pushJNIRef(res))
+  RETURN_REF_FROM_JNI(res, jstring);
 
   END_JNI_EXCEPTION
 
@@ -338,7 +344,8 @@
 JVM_LoadLibrary(const char *name) {
   BEGIN_JNI_EXCEPTION
   Jnjvm* vm = JavaThread::get()->getJVM();
-  RETURN_FROM_JNI(vm->bootstrapLoader->loadLib(name));
+  void * res = (void*)vm->bootstrapLoader->loadLib(name);
+  RETURN_FROM_JNI(res);
 
   END_JNI_EXCEPTION
 
@@ -354,7 +361,8 @@
 JVM_FindLibraryEntry(void *handle, const char *name) {
   BEGIN_JNI_EXCEPTION
   Jnjvm* vm = JavaThread::get()->getJVM();
-  RETURN_FROM_JNI((void *)vm->bootstrapLoader->loadInLib(name, handle));
+  void* res = (void *)vm->bootstrapLoader->loadInLib(name, handle);
+  RETURN_FROM_JNI(res);
   END_JNI_EXCEPTION
 
   return 0;
@@ -450,7 +458,7 @@
   }
 
   assert(result && "No stack element found");
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(result));
+  RETURN_REF_FROM_JNI(result, jobject);
 
   END_JNI_EXCEPTION
 
@@ -706,7 +714,7 @@
 JVM_CurrentThread(JNIEnv *env, jclass threadClass) {
   BEGIN_JNI_EXCEPTION
   JavaThread* th = JavaThread::get();
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(th->currentThread()));
+  RETURN_REF_FROM_JNI(th->currentThread(), jobject);
   END_JNI_EXCEPTION
 
   return 0;
@@ -792,7 +800,8 @@
 JNIEXPORT jboolean JNICALL
 JVM_HoldsLock(JNIEnv *env, jclass threadClass, jobject obj) {
   BEGIN_JNI_EXCEPTION
-  RETURN_FROM_JNI(JavaObject::owner(*(JavaObject**)obj));
+  jboolean res = JavaObject::owner(*(JavaObject**)obj);
+  RETURN_FROM_JNI(res);
   END_JNI_EXCEPTION
   return false;
 }
@@ -834,7 +843,7 @@
 
   res = GetClassContext(1);
 
-  RETURN_FROM_JNI((jobjectArray)th->pushJNIRef(res));
+  RETURN_REF_FROM_JNI(res, jobjectArray);
   END_JNI_EXCEPTION
 
   return 0;
@@ -890,7 +899,7 @@
   JavaThread* th = JavaThread::get();
   res = th->getNonNullClassLoader();
 
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(res));
+  RETURN_REF_FROM_JNI(res, jobject);
   END_JNI_EXCEPTION
 
   return 0;
@@ -916,7 +925,8 @@
 
   BEGIN_JNI_EXCEPTION
   array = *(ArrayObject**)arr;
-  RETURN_FROM_JNI(ArrayObject::getSize(array));
+  jint size = ArrayObject::getSize(array);
+  RETURN_FROM_JNI(size);
 
   END_JNI_EXCEPTION
 
@@ -934,7 +944,7 @@
   array = *(ArrayObject**)arr;
   element = ArrayObject::getElement(array, index);
 
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(element));
+  RETURN_REF_FROM_JNI(element, jobject);
 
   END_JNI_EXCEPTION
 
@@ -1032,8 +1042,7 @@
     res = (JavaObject*)array->doNew(length, vm);
   }
 
-  jobject ret = (jobject)th->pushJNIRef(res);
-  RETURN_FROM_JNI(ret);
+  RETURN_REF_FROM_JNI(res, jobject);
 
   END_JNI_EXCEPTION
 
@@ -1120,7 +1129,7 @@
   // Invoke recursive helper to create this array
   array = multiCallNewIntern(arrayCl, dim_len, dims, vm);
 
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(array));
+  RETURN_REF_FROM_JNI(array, jobject);
 
   END_JNI_EXCEPTION
 
@@ -1399,7 +1408,7 @@
   const UTF8* iname = cl->getName();
   result = JavaString::internalToJava(iname, vm);
 
-  RETURN_FROM_JNI((jstring)th->pushJNIRef(result));
+  RETURN_REF_FROM_JNI(result, jstring);
 
   END_JNI_EXCEPTION
 
@@ -1415,7 +1424,7 @@
 
   ret = JavaObjectClass::getInterfaces(*(JavaObjectClass**)cls);
 
-  RETURN_FROM_JNI((jobjectArray)th->pushJNIRef(ret));
+  RETURN_REF_FROM_JNI(ret, jobjectArray);
 
   END_JNI_EXCEPTION
 
@@ -1433,7 +1442,7 @@
   Jnjvm* vm = JavaThread::get()->getJVM();
   UserCommonClass* cl = UserCommonClass::resolvedImplClass(vm, Cl, false);
   res = cl->classLoader->getJavaClassLoader();
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(res));
+  RETURN_REF_FROM_JNI(res, jobject);
 
   END_JNI_EXCEPTION
 
@@ -1485,7 +1494,7 @@
   JOC = *(JavaObjectClass**)cls;
   pd = JavaObjectClass::getProtectionDomain(JOC);
 
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(pd));
+  RETURN_REF_FROM_JNI(pd, jobject);
 
   END_JNI_EXCEPTION
 
@@ -1508,7 +1517,8 @@
   Jnjvm* vm = JavaThread::get()->getJVM();
   UserCommonClass* cl = UserCommonClass::resolvedImplClass(vm, Cl, false);
 
-  RETURN_FROM_JNI(cl->isArray());
+  jboolean ret = cl->isArray();
+  RETURN_FROM_JNI(ret);
 
   END_JNI_EXCEPTION
 
@@ -1526,7 +1536,8 @@
   Jnjvm* vm = JavaThread::get()->getJVM();
   UserCommonClass* cl = UserCommonClass::resolvedImplClass(vm, Cl, false);
 
-  RETURN_FROM_JNI(cl->isPrimitive());
+  jboolean ret = cl->isPrimitive();
+  RETURN_FROM_JNI(ret);
 
   END_JNI_EXCEPTION
 
@@ -1567,7 +1578,8 @@
 
   Cl = *(JavaObjectClass**)cls;
 
-  RETURN_FROM_JNI(JavaObjectClass::getModifiers(Cl));
+  jint res = JavaObjectClass::getModifiers(Cl);
+  RETURN_FROM_JNI(res);
 
   END_JNI_EXCEPTION
 
@@ -1584,7 +1596,7 @@
   // TODO: Verify boolean parameter here, assuming should default to true.
   ret = JavaObjectClass::getDeclaredClasses(*(JavaObjectClass**)ofClass, false);
 
-  RETURN_FROM_JNI((jobjectArray)th->pushJNIRef(ret));
+  RETURN_REF_FROM_JNI(ret, jobjectArray);
 
   END_JNI_EXCEPTION
 
@@ -1600,7 +1612,7 @@
 
   ret = JavaObjectClass::getDeclaringClass(*(JavaObjectClass**)ofClass);
 
-  RETURN_FROM_JNI((jclass)th->pushJNIRef(ret));
+  RETURN_REF_FROM_JNI(ret, jclass);
 
   END_JNI_EXCEPTION
 
@@ -1623,7 +1635,7 @@
 
   ret = JavaObjectClass::getDeclaredAnnotations(*(JavaObjectClass**)cls);
 
-  RETURN_FROM_JNI((jbyteArray)th->pushJNIRef(ret));
+  RETURN_REF_FROM_JNI(ret, jbyteArray);
 
   END_JNI_EXCEPTION
 
@@ -1643,7 +1655,7 @@
 
   ret = JavaObjectClass::getDeclaredMethods(*(JavaObjectClass**)ofClass, publicOnly);
 
-  RETURN_FROM_JNI((jobjectArray)th->pushJNIRef(ret));
+  RETURN_REF_FROM_JNI(ret, jobjectArray);
 
   END_JNI_EXCEPTION
 
@@ -1659,7 +1671,7 @@
 
   ret = JavaObjectClass::getDeclaredFields(*(JavaObjectClass**)ofClass, publicOnly);
 
-  RETURN_FROM_JNI((jobjectArray)th->pushJNIRef(ret));
+  RETURN_REF_FROM_JNI(ret, jobjectArray);
 
   END_JNI_EXCEPTION
 
@@ -1675,7 +1687,7 @@
 
   ret = JavaObjectClass::getDeclaredConstructors(*(JavaObjectClass**)ofClass, publicOnly);
 
-  RETURN_FROM_JNI((jobjectArray)th->pushJNIRef(ret));
+  RETURN_REF_FROM_JNI(ret, jobjectArray);
 
   END_JNI_EXCEPTION
 
@@ -1702,7 +1714,8 @@
 
   // TODO: Verify this is doing what this function is supposed to do
   // (In particular regarding the comment block above)
-  RETURN_FROM_JNI(cl->asClass()->access);
+  jint res = cl->asClass()->access;
+  RETURN_FROM_JNI(res);
 
   END_JNI_EXCEPTION
 
@@ -1731,7 +1744,7 @@
     JavaObjectMethod::getClass(m)->getDelegatee(),
     0 /* unused */ );
 
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(ret));
+  RETURN_REF_FROM_JNI(ret, jobject);
   END_JNI_EXCEPTION
 
   return 0;
@@ -1757,7 +1770,7 @@
     JavaObjectConstructor::getClass(c)->getDelegatee(),
     0 /* unused */ );
 
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(ret));
+  RETURN_REF_FROM_JNI(ret, jobject);
   END_JNI_EXCEPTION
 
   return 0;
@@ -1873,7 +1886,7 @@
 
   res = meth->invokeJavaObjectVirtual(vm, cl, obj);
 
-  RETURN_FROM_JNI((jobject)th->pushJNIRef(res));
+  RETURN_REF_FROM_JNI(res, jobject);
 
   END_JNI_EXCEPTION
 
@@ -2310,7 +2323,8 @@
   if (err != buf)
     strncpy(buf, err, len);
 
-  RETURN_FROM_JNI(strlen(buf));
+  jint len = strlen(buf);
+  RETURN_FROM_JNI(len);
 
   END_JNI_EXCEPTION
 




From wdietz2 at illinois.edu  Mon Dec  5 03:08:33 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Mon, 05 Dec 2011 11:08:33 -0000
Subject: [vmkit-commits] [vmkit] r145807 -
	/vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp
Message-ID: <20111205110833.408CA1BE003@llvm.org>

Author: wdietz2
Date: Mon Dec  5 05:08:33 2011
New Revision: 145807

URL: http://llvm.org/viewvc/llvm-project?rev=145807&view=rev
Log:
Make StackWalker more friendly to being called from JNI code.

This is important for OpenJDK's JVM_FillInStackTrace.

Modified:
    vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp

Modified: vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp?rev=145807&r1=145806&r2=145807&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp (original)
+++ vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp Mon Dec  5 05:08:33 2011
@@ -164,6 +164,10 @@
     }
     if (frame && (addr == frame->currentFP)) {
       frame = frame->previousFrame;
+      // Let this be called from JNI, as in
+      // OpenJDK's JVM_FillInStackTrace:
+      if (frame && frame->currentIP != 0)
+        frame = frame->previousFrame;
       assert((frame == NULL) || (frame->currentIP == 0));
     }
   }




From wdietz2 at illinois.edu  Mon Dec  5 18:24:22 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Tue, 06 Dec 2011 02:24:22 -0000
Subject: [vmkit-commits] [vmkit] r145900 - in /vmkit/trunk:
 lib/j3/Compiler/JavaAOTCompiler.cpp mmtk/mmtk-j3/MMTkObject.h
Message-ID: <20111206022422.187922A6C12C@llvm.org>

Author: wdietz2
Date: Mon Dec  5 20:24:21 2011
New Revision: 145900

URL: http://llvm.org/viewvc/llvm-project?rev=145900&view=rev
Log:
Fix String field layout for OpenJDK in AOT and MMTK.

Modified:
    vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h

Modified: vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp?rev=145900&r1=145899&r2=145900&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp Mon Dec  5 20:24:21 2011
@@ -787,12 +787,23 @@
 	Array = ConstantExpr::getBitCast(varGV, JavaIntrinsics.JavaObjectType);
 
   Elmts.push_back(Array);
+#ifndef USE_OPENJDK
+  // Classpath fields
   Elmts.push_back(ConstantInt::get(Type::getInt32Ty(getLLVMContext()),
                                    str->count));
   Elmts.push_back(ConstantInt::get(Type::getInt32Ty(getLLVMContext()),
                                    str->cachedHashCode));
   Elmts.push_back(ConstantInt::get(Type::getInt32Ty(getLLVMContext()),
                                    str->offset));
+#else
+  // OpenJDK fields
+  Elmts.push_back(ConstantInt::get(Type::getInt32Ty(getLLVMContext()),
+                                   str->offset));
+  Elmts.push_back(ConstantInt::get(Type::getInt32Ty(getLLVMContext()),
+                                   str->count));
+  Elmts.push_back(ConstantInt::get(Type::getInt32Ty(getLLVMContext()),
+                                   str->cachedHashCode));
+#endif
  
   return ConstantStruct::get(STy, Elmts);
 }

Modified: vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h?rev=145900&r1=145899&r2=145900&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h (original)
+++ vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h Mon Dec  5 20:24:21 2011
@@ -43,9 +43,17 @@
 
 struct MMTkString : public MMTkObject {
   MMTkArray* value;
+#ifndef USE_OPENJDK
+  // Classpath fields
   int32_t count;
   int32_t cachedHashCode;
   int32_t offset;
+#else
+  // OpenJDK fields
+  int32_t offset;
+  int32_t count;
+  int32_t cachedHashCode;
+#endif
 };
 
 struct MMTkLock : public MMTkObject {




From wdietz2 at illinois.edu  Mon Dec  5 18:24:23 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Tue, 06 Dec 2011 02:24:23 -0000
Subject: [vmkit-commits] [vmkit] r145901 -
	/vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp
Message-ID: <20111206022423.C40722A6C12C@llvm.org>

Author: wdietz2
Date: Mon Dec  5 20:24:23 2011
New Revision: 145901

URL: http://llvm.org/viewvc/llvm-project?rev=145901&view=rev
Log:
Add isAssignableFrom check when scanning bytecode for inline potential.

Brings behavior up to line with change made earlier in JavaJIT.

Modified:
    vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp

Modified: vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp?rev=145901&r1=145900&r2=145901&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp Mon Dec  5 20:24:23 2011
@@ -3339,6 +3339,7 @@
         bool customized = false;
         if (!(isFinal(cl->access) || isFinal(meth->access))) {
           if (customizeFor == NULL) return false;
+          if (!cl->isAssignableFrom(customizeFor)) return false;
           meth = customizeFor->lookupMethodDontThrow(
               meth->name, meth->type, false, true, NULL);
           assert(meth);




From wdietz2 at illinois.edu  Mon Dec  5 18:24:25 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Tue, 06 Dec 2011 02:24:25 -0000
Subject: [vmkit-commits] [vmkit] r145902 - in /vmkit/trunk/lib/j3/Compiler:
 JavaJIT.cpp JavaJITOpcodes.cpp
Message-ID: <20111206022425.90F142A6C12C@llvm.org>

Author: wdietz2
Date: Mon Dec  5 20:24:25 2011
New Revision: 145902

URL: http://llvm.org/viewvc/llvm-project?rev=145902&view=rev
Log:
Flip inlining assignable checks, they were backwards.

A->isAssignableFrom(B) checks "is 'A a; B b = a;' legal?" not other way around.
(In other words it checks if A is a subtype of B, not B subtype of A)

Modified:
    vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp

Modified: vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp?rev=145902&r1=145901&r2=145902&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp Mon Dec  5 20:24:25 2011
@@ -141,7 +141,7 @@
   if (thisReference && meth) {
     isCustomizable = true;
     if ((customizeFor != NULL)
-        && cl->isAssignableFrom(customizeFor)) {
+        && customizeFor->isAssignableFrom(cl)) {
       meth = customizeFor->lookupMethodDontThrow(
           meth->name, meth->type, false, true, NULL);
       assert(meth);

Modified: vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp?rev=145902&r1=145901&r2=145902&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp Mon Dec  5 20:24:25 2011
@@ -3339,7 +3339,7 @@
         bool customized = false;
         if (!(isFinal(cl->access) || isFinal(meth->access))) {
           if (customizeFor == NULL) return false;
-          if (!cl->isAssignableFrom(customizeFor)) return false;
+          if (!customizeFor->isAssignableFrom(cl)) return false;
           meth = customizeFor->lookupMethodDontThrow(
               meth->name, meth->type, false, true, NULL);
           assert(meth);




From nicolas.geoffray at lip6.fr  Wed Dec  7 12:28:37 2011
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 07 Dec 2011 20:28:37 -0000
Subject: [vmkit-commits] [vmkit] r146065 - in /vmkit/trunk: include/j3/
 lib/j3/ClassLib/ lib/j3/ClassLib/GNUClasspath/ lib/j3/ClassLib/OpenJDK/
 lib/j3/Compiler/ lib/j3/LLVMRuntime/ lib/j3/VMCore/
Message-ID: <20111207202838.3264D2A6C12C@llvm.org>

Author: geoffray
Date: Wed Dec  7 14:28:37 2011
New Revision: 146065

URL: http://llvm.org/viewvc/llvm-project?rev=146065&view=rev
Log:
isAssignableFrom -> isSubclassOf. The first one is just too confusing.


Modified:
    vmkit/trunk/include/j3/J3Intrinsics.h
    vmkit/trunk/include/j3/jni.h
    vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc
    vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc
    vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc
    vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc
    vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMThrowable.inc
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp
    vmkit/trunk/lib/j3/Compiler/J3Intrinsics.cpp
    vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp
    vmkit/trunk/lib/j3/Compiler/LowerConstantCalls.cpp
    vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
    vmkit/trunk/lib/j3/VMCore/JavaClass.h
    vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp
    vmkit/trunk/lib/j3/VMCore/JavaObject.cpp
    vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp
    vmkit/trunk/lib/j3/VMCore/Jni.cpp
    vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp

Modified: vmkit/trunk/include/j3/J3Intrinsics.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/J3Intrinsics.h?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/include/j3/J3Intrinsics.h (original)
+++ vmkit/trunk/include/j3/J3Intrinsics.h Wed Dec  7 14:28:37 2011
@@ -69,7 +69,7 @@
   llvm::Function* ResolveInterfaceFunction;
 
   llvm::Function* VirtualLookupFunction;
-  llvm::Function* IsAssignableFromFunction;
+  llvm::Function* IsSubclassOfFunction;
   llvm::Function* IsSecondaryClassFunction;
   llvm::Function* GetDepthFunction;
   llvm::Function* GetDisplayFunction;

Modified: vmkit/trunk/include/j3/jni.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/jni.h?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/include/j3/jni.h (original)
+++ vmkit/trunk/include/j3/jni.h Wed Dec  7 14:28:37 2011
@@ -233,7 +233,7 @@
 						    jmethodID, jboolean);
 
   jclass   (JNICALL *GetSuperclass)                (JNIEnv *, jclass);
-  jboolean (JNICALL *IsAssignableFrom)             (JNIEnv *, jclass, jclass);
+  jboolean (JNICALL *IsSubclassOf)             (JNIEnv *, jclass, jclass);
 
   jobject  (JNICALL *ToReflectedField)		   (JNIEnv *, jclass, jfieldID,
                                                     jboolean);
@@ -686,8 +686,8 @@
   jclass GetSuperclass (jclass cl0)
   { return p->GetSuperclass (this, cl0); }
 
-  jboolean IsAssignableFrom (jclass cl0, jclass cl1)
-  { return p->IsAssignableFrom (this, cl0, cl1); }
+  jboolean IsSubclassOf (jclass cl0, jclass cl1)
+  { return p->IsSubclassOf (this, cl0, cl1); }
 
   jobject ToReflectedField (jclass cl0, jfieldID fld1, jboolean val2)
   { return p->ToReflectedField (this, cl0, fld1, val2); }

Modified: vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/ArrayCopy.inc Wed Dec  7 14:28:37 2011
@@ -71,7 +71,7 @@
     for (int i = 0; i < len; i++) {
       cur = ArrayObject::getElement((ArrayObject*)src, i + sstart);
       if (cur) {
-        if (!(JavaObject::getClass(cur)->isAssignableFrom(dstType))) {
+        if (!(JavaObject::getClass(cur)->isSubclassOf(dstType))) {
           copyLen = i; // copy up until this element
           break;
         }

Modified: vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc Wed Dec  7 14:28:37 2011
@@ -124,7 +124,7 @@
         excp = th->getJavaException();
       } END_CATCH;
       if (excp) {
-        if (JavaObject::getClass(excp)->isAssignableFrom(vm->upcalls->newException)) {
+        if (JavaObject::getClass(excp)->isSubclassOf(vm->upcalls->newException)) {
           th->clearException();
           // If it's an exception, we encapsule it in an
           // invocationTargetException

Modified: vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc Wed Dec  7 14:28:37 2011
@@ -126,7 +126,7 @@
     if (isVirtual(meth->access)) {
       verifyNull(obj);
       UserCommonClass* objCl = JavaObject::getClass(obj);
-      if (!(objCl->isAssignableFrom(cl))) {
+      if (!(objCl->isSubclassOf(cl))) {
         vm->illegalArgumentException("<this> is not a valid type");
       }
 

Modified: vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc Wed Dec  7 14:28:37 2011
@@ -275,7 +275,7 @@
   UserCommonClass* cl1 = UserCommonClass::resolvedImplClass(vm, Cl1, false);
   UserCommonClass* cl2 = UserCommonClass::resolvedImplClass(vm, Cl2, false);
 
-  res = cl2->isAssignableFrom(cl1);
+  res = cl2->isSubclassOf(cl1);
 
   END_NATIVE_EXCEPTION
 

Modified: vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMThrowable.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMThrowable.inc?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMThrowable.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMThrowable.inc Wed Dec  7 14:28:37 2011
@@ -149,7 +149,7 @@
     else {
       JavaMethod* meth = (JavaMethod*)FI->Metadata;
       assert(meth && "Wrong stack trace");
-      if (meth->classDef->isAssignableFrom(vm->upcalls->newThrowable)) {
+      if (meth->classDef->isSubclassOf(vm->upcalls->newThrowable)) {
         ++index;
       } else break;
     }

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp Wed Dec  7 14:28:37 2011
@@ -49,7 +49,7 @@
     else {
       JavaMethod* meth = (JavaMethod*)FI->Metadata;
       assert(meth && "Wrong stack trace");
-      if (meth->classDef->isAssignableFrom(vm->upcalls->newThrowable)) {
+      if (meth->classDef->isSubclassOf(vm->upcalls->newThrowable)) {
         ++index;
       } else return index;
     }

Modified: vmkit/trunk/lib/j3/Compiler/J3Intrinsics.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/J3Intrinsics.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/J3Intrinsics.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/J3Intrinsics.cpp Wed Dec  7 14:28:37 2011
@@ -177,7 +177,7 @@
  
   GetClassDelegateeFunction = module->getFunction("getClassDelegatee");
   RuntimeDelegateeFunction = module->getFunction("j3RuntimeDelegatee");
-  IsAssignableFromFunction = module->getFunction("isAssignableFrom");
+  IsSubclassOfFunction = module->getFunction("isSubclassOf");
   IsSecondaryClassFunction = module->getFunction("isSecondaryClass");
   GetDepthFunction = module->getFunction("getDepth");
   GetStaticInstanceFunction = module->getFunction("getStaticInstance");

Modified: vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp Wed Dec  7 14:28:37 2011
@@ -1607,7 +1607,7 @@
       Tracer = ArrayObjectTracer;
     }
   } else if (classDef->isClass()) {
-    if (classDef->isAssignableFrom(
+    if (classDef->isSubclassOf(
           classDef->classLoader->bootstrapLoader->upcalls->newReference)) {
       Tracer = ReferenceObjectTracer;
     } else {

Modified: vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp Wed Dec  7 14:28:37 2011
@@ -61,7 +61,7 @@
 
 bool JavaJIT::needsInitialisationCheck(Class* cl) {
   if (cl->isReadyForCompilation() || 
-      (!cl->isInterface() && compilingClass->isAssignableFrom(cl))) {
+      (!cl->isInterface() && compilingClass->isSubclassOf(cl))) {
     return false;
   }
 
@@ -141,7 +141,7 @@
   if (thisReference && meth) {
     isCustomizable = true;
     if ((customizeFor != NULL)
-        && customizeFor->isAssignableFrom(cl)) {
+        && customizeFor->isSubclassOf(cl)) {
       meth = customizeFor->lookupMethodDontThrow(
           meth->name, meth->type, false, true, NULL);
       assert(meth);

Modified: vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJITOpcodes.cpp Wed Dec  7 14:28:37 2011
@@ -682,7 +682,7 @@
       
       case AASTORE : {
         if (TheCompiler->hasExceptionsEnabled()) {
-          // Get val and object and don't pop them: IsAssignableFromFunction
+          // Get val and object and don't pop them: IsSubclassOfFunction
           // may go into runtime and we don't want values in registers at that
           // point.
           Value* val = new LoadInst(objectStack[currentStackIndex - 1], "",
@@ -712,7 +712,7 @@
           
           Value* VTArgs[2] = { valVT, objVT };
           
-          Value* res = CallInst::Create(intrinsics->IsAssignableFromFunction,
+          Value* res = CallInst::Create(intrinsics->IsSubclassOfFunction,
                                         VTArgs, "", currentBlock);
 
           BranchInst::Create(endBlock, exceptionBlock, res, currentBlock);
@@ -2271,7 +2271,7 @@
                                TheVT, "");
           }
         } else {
-          res = CallInst::Create(intrinsics->IsAssignableFromFunction,
+          res = CallInst::Create(intrinsics->IsSubclassOfFunction,
                                  classArgs, "", currentBlock);
         }
 
@@ -3339,7 +3339,7 @@
         bool customized = false;
         if (!(isFinal(cl->access) || isFinal(meth->access))) {
           if (customizeFor == NULL) return false;
-          if (!customizeFor->isAssignableFrom(cl)) return false;
+          if (!customizeFor->isSubclassOf(cl)) return false;
           meth = customizeFor->lookupMethodDontThrow(
               meth->name, meth->type, false, true, NULL);
           assert(meth);

Modified: vmkit/trunk/lib/j3/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/LowerConstantCalls.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/LowerConstantCalls.cpp Wed Dec  7 14:28:37 2011
@@ -501,7 +501,7 @@
           Value* res = new LoadInst(val, "", CI);
           CI->replaceAllUsesWith(res);
           CI->eraseFromParent();
-        } else if (V == intrinsics->IsAssignableFromFunction) {
+        } else if (V == intrinsics->IsSubclassOfFunction) {
           Changed = true;
           Value* VT1 = Call.getArgument(0);
           Value* VT2 = Call.getArgument(1);

Modified: vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll Wed Dec  7 14:28:37 2011
@@ -208,8 +208,8 @@
 ;;; block or method.
 declare void @j3JavaObjectRelease(%JavaObject*)
 
-;;; isAssignableFrom - Returns if a type is a subtype of another type.
-declare i1 @isAssignableFrom(%VT*, %VT*) readnone
+;;; isSubclassOf - Returns if a type is a subtype of another type.
+declare i1 @isSubclassOf(%VT*, %VT*) readnone
 
 ;;; isSecondaryClass - Returns if a type is a secondary super type of
 ;;; another type.

Modified: vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaClass.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaClass.cpp Wed Dec  7 14:28:37 2011
@@ -315,7 +315,7 @@
   if (meth &&
       isSuper(current->access) &&
       current != meth->classDef &&
-      meth->classDef->isAssignableFrom(current) &&
+      meth->classDef->isSubclassOf(current) &&
       !name->equals(classLoader->bootstrapLoader->initName)) {
     meth = current->super->lookupMethodDontThrow(name, type, false, true, NULL);
   }
@@ -490,7 +490,7 @@
   }
 }
 
-bool UserCommonClass::isAssignableFrom(UserCommonClass* cl) {
+bool UserCommonClass::isSubclassOf(UserCommonClass* cl) {
   assert(virtualVT && cl->virtualVT);
   return virtualVT->isSubtypeOf(cl->virtualVT);
 }
@@ -1362,7 +1362,7 @@
 
     Class* referenceClass = 
         C->classLoader->bootstrapLoader->upcalls->newReference;
-    if (referenceClass != NULL && C->super->isAssignableFrom(referenceClass)) {
+    if (referenceClass != NULL && C->super->isSubclassOf(referenceClass)) {
       tracer = (word_t)ReferenceObjectTracer;
     } else {
       tracer = (word_t)RegularObjectTracer;

Modified: vmkit/trunk/lib/j3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaClass.h?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaClass.h Wed Dec  7 14:28:37 2011
@@ -293,10 +293,10 @@
   ///
   bool isOfTypeName(const UTF8* Tname);
 
-  /// isAssignableFrom - Is this class assignable from the given class? The
+  /// isSubclassOf - Is this class assignable from the given class? The
   /// classes may be of any type.
   ///
-  bool isAssignableFrom(CommonClass* cl);
+  bool isSubclassOf(CommonClass* cl);
 
   /// getClassDelegatee - Return the java/lang/Class representation of this
   /// class.

Modified: vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp Wed Dec  7 14:28:37 2011
@@ -172,7 +172,7 @@
     meth = objCl->lookupMethodDontThrow(name, type, false, true, &cl); \
   } \
   assert(meth && "No method found"); \
-  assert(objCl->isAssignableFrom(meth->classDef) && "Wrong type"); \
+  assert(objCl->isSubclassOf(meth->classDef) && "Wrong type"); \
   void* func = meth->compiledPtr(); \
   FUNC_TYPE_VIRTUAL_BUF call = (FUNC_TYPE_VIRTUAL_BUF)sign->getVirtualCallBuf(); \
   JavaThread* th = JavaThread::get(); \

Modified: vmkit/trunk/lib/j3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaObject.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaObject.cpp Wed Dec  7 14:28:37 2011
@@ -352,5 +352,5 @@
 bool JavaObject::instanceOf(JavaObject* self, UserCommonClass* cl) {
   llvm_gcroot(self, 0);
   if (self == NULL) return false;
-  else return getClass(self)->isAssignableFrom(cl);
+  else return getClass(self)->isSubclassOf(cl);
 }

Modified: vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp Wed Dec  7 14:28:37 2011
@@ -387,7 +387,7 @@
   ctpInfo->infoOfMethod(ctpIndex, ACC_VIRTUAL, ctpCl, origMeth);
 
   ctpInfo->resolveMethod(ctpIndex, ctpCl, utf8, sign);
-  assert(cl->isAssignableFrom(ctpCl) && "Wrong call object");
+  assert(cl->isSubclassOf(ctpCl) && "Wrong call object");
   UserClass* lookup = cl->isArray() ? cl->super : cl->asClass();
   JavaMethod* Virt = lookup->lookupMethod(utf8, sign->keyName, false, true, 0);
 

Modified: vmkit/trunk/lib/j3/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jni.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/Jni.cpp Wed Dec  7 14:28:37 2011
@@ -150,7 +150,7 @@
 }
   
  
-jboolean IsAssignableFrom(JNIEnv *env, jclass _sub, jclass _sup) {
+jboolean IsSubclassOf(JNIEnv *env, jclass _sub, jclass _sup) {
   
   BEGIN_JNI_EXCEPTION
  
@@ -166,7 +166,7 @@
   UserCommonClass* cl1 = 
     UserCommonClass::resolvedImplClass(vm, sub, false);
 
-  jboolean res = (jboolean)cl1->isAssignableFrom(cl2);
+  jboolean res = (jboolean)cl1->isSubclassOf(cl2);
   RETURN_FROM_JNI(res);
   
   END_JNI_EXCEPTION
@@ -4154,7 +4154,7 @@
 	&FromReflectedField,
 	&ToReflectedMethod,
 	&GetSuperclass,
-	&IsAssignableFrom,
+	&IsSubclassOf,
 	&ToReflectedField,
 
 	&Throw,

Modified: vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp?rev=146065&r1=146064&r2=146065&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp Wed Dec  7 14:28:37 2011
@@ -201,7 +201,7 @@
     //     ExceptionInInitializerError cannot be created because an
     //     OutOfMemoryError occurs, then instead use an OutOfMemoryError object
     //     in place of E in the following step.
-    if (JavaObject::getClass(exc)->isAssignableFrom(vm->upcalls->newException)) {
+    if (JavaObject::getClass(exc)->isSubclassOf(vm->upcalls->newException)) {
       Classpath* upcalls = classLoader->bootstrapLoader->upcalls;
       UserClass* clExcp = upcalls->ExceptionInInitializerError;
       Jnjvm* vm = self->getJVM();




From wdietz2 at illinois.edu  Wed Dec  7 15:34:31 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Wed, 07 Dec 2011 23:34:31 -0000
Subject: [vmkit-commits] [vmkit] r146102 -
	/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111207233431.C83772A6C12C@llvm.org>

Author: wdietz2
Date: Wed Dec  7 17:34:31 2011
New Revision: 146102

URL: http://llvm.org/viewvc/llvm-project?rev=146102&view=rev
Log:
Impl JVM_SocketAvailable

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=146102&r1=146101&r2=146102&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Wed Dec  7 17:34:31 2011
@@ -2590,7 +2590,16 @@
 
 JNIEXPORT jint JNICALL
 JVM_SocketAvailable(jint fd, jint *result) {
-  NYI();
+
+  BEGIN_JNI_EXCEPTION
+
+  if(ioctl(fd, TIOCINQ, result) == -1)
+    RETURN_FROM_JNI(JNI_FALSE);
+
+  RETURN_FROM_JNI(JNI_TRUE);
+  END_JNI_EXCEPTION
+
+  RETURN_FROM_JNI(JNI_FALSE);
 }
 
 




From wdietz2 at illinois.edu  Wed Dec  7 15:34:33 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Wed, 07 Dec 2011 23:34:33 -0000
Subject: [vmkit-commits] [vmkit] r146103 - in
 /vmkit/trunk/lib/j3/ClassLib/OpenJDK: JavaUpcalls.cpp JavaUpcalls.h
 OpenJDK.inc
Message-ID: <20111207233433.D84322A6C12C@llvm.org>

Author: wdietz2
Date: Wed Dec  7 17:34:33 2011
New Revision: 146103

URL: http://llvm.org/viewvc/llvm-project?rev=146103&view=rev
Log:
Impl JVM_AssertionStatusDirectives (empty fields)

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp?rev=146103&r1=146102&r2=146103&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp Wed Dec  7 17:34:33 2011
@@ -187,6 +187,7 @@
 Class*      Classpath::SystemClass;
 JavaMethod* Classpath::initSystem;
 Class*      Classpath::EnumClass;
+Class*      Classpath::assertionStatusDirectivesClass;
 
 JavaMethod* Classpath::ErrorWithExcpNoClassDefFoundError;
 JavaMethod* Classpath::ErrorWithExcpExceptionInInitializerError;
@@ -778,6 +779,9 @@
   SystemClass = UPCALL_CLASS(loader, "java/lang/System");
   EnumClass = UPCALL_CLASS(loader, "java/lang/Enum");
 
+  assertionStatusDirectivesClass =
+    UPCALL_CLASS(loader, "java/lang/AssertionStatusDirectives");
+
   cloneableClass = UPCALL_CLASS(loader, "java/lang/Cloneable");
 
   ReflectInvokeMethod =
@@ -983,9 +987,15 @@
     }
     abort();
   }
+
+  // resolve and initialize misc classes
+  assertionStatusDirectivesClass->resolveClass();
+  assertionStatusDirectivesClass->initialiseClass(jvm);
+
 }
 
 
+
 #include "ClasspathConstructor.inc"
 #include "ClasspathField.inc"
 #include "ClasspathMethod.inc"

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h?rev=146103&r1=146102&r2=146103&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h Wed Dec  7 17:34:33 2011
@@ -268,6 +268,7 @@
   ISOLATE_STATIC JavaMethod* threadStart;
 
   ISOLATE_STATIC UserClass*  EnumClass;
+  ISOLATE_STATIC UserClass*  assertionStatusDirectivesClass;
 
 private:
   ISOLATE_STATIC void CreateJavaThread(Jnjvm* vm, JavaThread* myth,

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=146103&r1=146102&r2=146103&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Wed Dec  7 17:34:33 2011
@@ -1967,7 +1967,33 @@
  */
 JNIEXPORT jobject JNICALL
 JVM_AssertionStatusDirectives(JNIEnv *env, jclass unused) {
-  NYI();
+  JavaObject* asdObj = 0;
+  JavaObject* emptyStringArr = 0;
+  llvm_gcroot(asdObj, 0);
+  llvm_gcroot(emptyStringArr, 0);
+  BEGIN_JNI_EXCEPTION
+
+  Jnjvm* vm = th->getJVM();
+  UserClass * asdCl = vm->upcalls->assertionStatusDirectivesClass;
+  asdObj = asdCl->doNew(vm);
+
+  emptyStringArr = vm->upcalls->ArrayOfString->doNew(0, vm);
+
+  const UTF8 * classesName = asdCl->classLoader->hashUTF8->lookupAsciiz("classes");
+  const UTF8 * packagesName = asdCl->classLoader->hashUTF8->lookupAsciiz("packages");
+  const UTF8 * stringArrType = asdCl->classLoader->hashUTF8->lookupAsciiz("[Ljava/lang/String;");
+  JavaField* classes = asdCl->lookupFieldDontThrow(classesName, stringArrType, false, true, 0);
+  JavaField* packages = asdCl->lookupFieldDontThrow(packagesName, stringArrType, false, true, 0);
+  assert(classes);
+  assert(packages);
+
+  classes->setInstanceObjectField(asdObj, emptyStringArr);
+  packages->setInstanceObjectField(asdObj, emptyStringArr);
+
+  RETURN_REF_FROM_JNI(asdObj, jobject);
+  END_JNI_EXCEPTION
+
+  return NULL;
 }
 
 /*




From wdietz2 at illinois.edu  Wed Dec  7 15:34:35 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Wed, 07 Dec 2011 23:34:35 -0000
Subject: [vmkit-commits] [vmkit] r146104 -
	/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111207233435.961522A6C12C@llvm.org>

Author: wdietz2
Date: Wed Dec  7 17:34:35 2011
New Revision: 146104

URL: http://llvm.org/viewvc/llvm-project?rev=146104&view=rev
Log:
Indiciate we're a 1.6 JVM when using OpenJDK

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=146104&r1=146103&r2=146104&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Wed Dec  7 17:34:35 2011
@@ -255,6 +255,11 @@
   if (tmp)
     setProperty(vm, prop, "java.compiler", tmp);
 
+  // Override properties to indicate java version 1.6
+  setProperty(vm, prop, "java.specification.version", "1.6");
+  setProperty(vm, prop, "java.version", "1.6");
+  setProperty(vm, prop, "java.runtime.version", "1.6");
+
   RETURN_FROM_JNI(p);
 
   END_JNI_EXCEPTION




From wdietz2 at illinois.edu  Wed Dec  7 15:34:37 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Wed, 07 Dec 2011 23:34:37 -0000
Subject: [vmkit-commits] [vmkit] r146105 -
	/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111207233437.5B2472A6C12C@llvm.org>

Author: wdietz2
Date: Wed Dec  7 17:34:37 2011
New Revision: 146105

URL: http://llvm.org/viewvc/llvm-project?rev=146105&view=rev
Log:
OpenJDK: Handle exceptions thrown from newly spawned threads

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=146105&r1=146104&r2=146105&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Wed Dec  7 17:34:37 2011
@@ -513,7 +513,11 @@
 void start(JavaThread* thread) {
 
   JavaObject* javaThread = NULL;
+  JavaObject* handler = NULL;
+  JavaObject* exc = NULL;
   llvm_gcroot(javaThread, 0);
+  llvm_gcroot(exc, 0);
+  llvm_gcroot(handler, 0);
 
   Jnjvm* vm = thread->getJVM();
 
@@ -546,9 +550,30 @@
   JavaMethod * meth = thClass->lookupMethodDontThrow(runName, runType, false, true, 0);
   assert(meth);
 
+  // Sanity check
+  assert(JavaThread::get() == thread);
+
   // Run the thread...
-  // TODO: What happens if the thread throws an exception?
-  meth->invokeIntSpecial(vm, thClass, javaThread);
+  TRY {
+    meth->invokeIntSpecial(vm, thClass, javaThread);
+  } CATCH {
+    exc = thread->pendingException;
+  } END_CATCH;
+
+  // Sanity check
+  assert(JavaThread::get() == thread);
+
+  if (exc != NULL) {
+    thread->clearException();
+    TRY {
+      handler = vm->upcalls->getUncaughtExceptionHandler->invokeJavaObjectVirtual(vm, thClass, javaThread);
+      verifyNull(handler);
+      vm->upcalls->uncaughtException->invokeIntVirtual(vm, vm->upcalls->uncaughtException->classDef, handler, &javaThread, &exc);
+    } CATCH {
+      fprintf(stderr, "Exception in thread \"(unknown)\": "
+                      "Can not print stack trace.\n");
+    } END_CATCH;
+  }
 
   // Indicate that the thread is done by clearing the eetop field.
   // and notify all waiting threads.




From wdietz2 at illinois.edu  Sun Dec 11 12:42:56 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sun, 11 Dec 2011 20:42:56 -0000
Subject: [vmkit-commits] [vmkit] r146346 - in /vmkit/trunk:
 autoconf/configure.ac lib/j3/ClassLib/Classpath.h.in
 lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111211204256.50BCA2A6C12C@llvm.org>

Author: wdietz2
Date: Sun Dec 11 14:42:56 2011
New Revision: 146346

URL: http://llvm.org/viewvc/llvm-project?rev=146346&view=rev
Log:
OpenJDK: Improved path support, simpler configure-time parameters.

Properly set various paths from input JDK path.
java.home should point to a JRE, not the JDK, for example.

Additionally, set java.ext.dirs so programs can find the classes there
(in particular enables various crypto-related codes to work)

Modified:
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/lib/j3/ClassLib/Classpath.h.in
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=146346&r1=146345&r2=146346&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Sun Dec 11 14:42:56 2011
@@ -206,24 +206,15 @@
 dnl **************************************************************************
 dnl OpenJDK Paths
 dnl **************************************************************************
-dnl Chat with OpenJDK folk about best way to look for the things we need
-dnl For now, this should suffice.
 
-AC_ARG_WITH(openjdk-jre,
-       [AS_HELP_STRING(--with-openjdk-jre,
-           [Build J3 with OpenJDK JRE install (default is '/usr/lib/java/jre')])],
-       [[openjdkjre=$withval]],
-       [[openjdkjre=/usr/lib/java/jre]]
+AC_ARG_WITH(openjdk-path,
+       [AS_HELP_STRING(--with-openjdk-path,
+           [Build J3 with OpenJDK JRE install (default is '/usr/lib/java/')])],
+       [[openjdkpath=$withval]],
+       [[openjdkpath=/usr/lib/java/]]
 )
 
-AC_ARG_WITH(openjdk-arch-dir,
-       [AS_HELP_STRING(--with-openjdk-arch-dir,
-           [Location of architecture-specific OpenJDK libraries (default is '/usr/lib/java/jre/lib/i386')])],
-       [[openjdkarchdir=$withval]],
-       [[openjdkarchdir=/usr/lib/java/jre/lib/i386]]
-)
-AC_SUBST([openjdkjre])
-AC_SUBST([openjdkarchdir])
+AC_SUBST([openjdkpath])
 
 
 dnl **************************************************************************
@@ -253,15 +244,9 @@
       ;;
   openjdk)
     AC_MSG_NOTICE(Validating OpenJDK installation...)
-    AC_CHECK_FILES([${openjdkjre}]
-                   [${openjdkjre}/lib/rt.jar],,
-      AC_MSG_ERROR([[Invalid OpenJDK JRE path, can't find required jar files!]]))
-    AC_CHECK_FILE([${openjdkarchdir}],,
-      AC_MSG_ERROR([[Invalid OpenJDK arch dir]]))
-    dnl Check that $archdir/client/libjava.so or $archdir/server/libjava.so exist
-    AC_CHECK_FILE([${openjdkarchdir}]/client/libjvm.$DYLIB_EXTENSION,,
-      AC_CHECK_FILE([${openjdkarchdir}]/server/libjvm.$DYLIB_EXTENSION,,
-        AC_MSG_ERROR([[Can't find libjvm.$DYLIB_EXTENSION]])))
+    AC_CHECK_FILES([${openjdkpath}]
+                   [${openjdkpath}/jre/lib/rt.jar],,
+      AC_MSG_ERROR([[Invalid OpenJDK JDK path, can't find required jar files!]]))
       ;;
   *)
     AC_MSG_ERROR([Invalid --with-classpath-impl "${classpathimpl}".  Must be one of "gnuclasspath" or "openjdk"])

Modified: vmkit/trunk/lib/j3/ClassLib/Classpath.h.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/Classpath.h.in?rev=146346&r1=146345&r2=146346&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/Classpath.h.in (original)
+++ vmkit/trunk/lib/j3/ClassLib/Classpath.h.in Sun Dec 11 14:42:56 2011
@@ -9,6 +9,7 @@
 
 // Historically has been included here, keep it for now
 #include <jni.h>
+#include "vmkit/System.h"
 
 #ifndef USE_OPENJDK
 
@@ -23,27 +24,35 @@
 #else
 
 // OpenJDK values
-#define OpenJDKJRE "@openjdkjre@"
-#define OpenJDKArch "@openjdkarchdir@"
+#define OpenJDKPath "@openjdkpath@"
 
-// OpenJDK Bootstrap classpath
-extern const char * OpenJDKBootPath;
+// Select which architecture directory name to use
+#if ARCH_X86
+#define OpenJDKArchComp "i386"
+#elif ARCH_X64
+#define OpenJDKArchComp "amd64"
+#else
+#error "Unsupported architecture"
+#endif
 
-// Location of OpenJDK's libjava.so
-#define OpenJDKLibJava OpenJDKArch "/libjava.so"
+// Build various other paths from OpenJDKPath
+// Done this way to make them compile-time constants.
+#define OpenJDKJRE OpenJDKPath "/jre"
+#define OpenJDKArchDir OpenJDKJRE "/lib/" OpenJDKArchComp
+#define OpenJDKLibJava OpenJDKArchDir "/libjava.so"
+#define OpenJDKExtDirs OpenJDKJRE "/lib/ext"
 
 // Search path for native library files
-// TODO: Use LD_LIBRARY_PATH to second part of this?
-#define OpenJDKLibPaths \
-      OpenJDKArch \
-  ":" OpenJDKArch "/client" \
-  ":" OpenJDKArch "/server" \
-  ":" "/lib" \
-  ":" "/lib64" \
-  ":" "/usr/lib" \
-  ":" "/usr/lib64"
+#define OpenJDKSystemLibPaths "/lib:/lib64:/usr/lib:/usr/lib64"
+#define OpenJDKLibPath \
+      OpenJDKArchDir \
+  ":" OpenJDKArchDir "/server/" \
+  ":" OpenJDKSystemLibPaths
+
+// Bootstrap path. Defined in JavaUpcalls.cpp to add VMString location.
+extern const char * OpenJDKBootPath;
 
 #define ClasslibBootEnv OpenJDKBootPath
-#define ClasslibLibEnv OpenJDKLibPaths
+#define ClasslibLibEnv OpenJDKLibPath
 
 #endif // USE_OPENJDK

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=146346&r1=146345&r2=146346&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Sun Dec 11 14:42:56 2011
@@ -260,6 +260,12 @@
   setProperty(vm, prop, "java.version", "1.6");
   setProperty(vm, prop, "java.runtime.version", "1.6");
 
+  // Set additional path properties
+  // For now, ignore JAVA_HOME.  We don't want to be using a location
+  // other than the one we precompiled against anyway.
+  setProperty(vm, prop, "java.home", OpenJDKJRE);
+  setProperty(vm, prop, "java.ext.dirs", OpenJDKExtDirs);
+
   RETURN_FROM_JNI(p);
 
   END_JNI_EXCEPTION




From wdietz2 at illinois.edu  Sun Dec 11 12:42:58 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sun, 11 Dec 2011 20:42:58 -0000
Subject: [vmkit-commits] [vmkit] r146347 - /vmkit/trunk/configure
Message-ID: <20111211204258.1B0402A6C12C@llvm.org>

Author: wdietz2
Date: Sun Dec 11 14:42:57 2011
New Revision: 146347

URL: http://llvm.org/viewvc/llvm-project?rev=146347&view=rev
Log:
Regenerated configure.

Modified:
    vmkit/trunk/configure

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=146347&r1=146346&r2=146347&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Sun Dec 11 14:42:57 2011
@@ -643,8 +643,7 @@
 CFLAGS
 CC
 classpathimpl
-openjdkarchdir
-openjdkjre
+openjdkpath
 classpathversion
 classpathlibs
 classpathglibj
@@ -713,8 +712,7 @@
 with_mmtk_plan
 with_gnu_classpath_libs
 with_gnu_classpath_glibj
-with_openjdk_jre
-with_openjdk_arch_dir
+with_openjdk_path
 with_classpath_impl
 '
       ac_precious_vars='build_alias
@@ -1354,10 +1352,8 @@
   --with-gnu-classpath-glibj
                           Build J3 with GNU Classpath install (default is
                           '/usr/share/classpath/glibj.zip')
-  --with-openjdk-jre      Build J3 with OpenJDK JRE install (default is
-                          '/usr/lib/java/jre')
-  --with-openjdk-arch-dir Location of architecture-specific OpenJDK libraries
-                          (default is '/usr/lib/java/jre/lib/i386')
+  --with-openjdk-path     Build J3 with OpenJDK JRE install (default is
+                          '/usr/lib/java/')
   --with-classpath-impl   Build J3 with the specified classpath implementation
                           (default is gnuclasspath)
 
@@ -2566,21 +2562,11 @@
 
 
 
-# Check whether --with-openjdk-jre was given.
-if test "${with_openjdk_jre+set}" = set; then :
-  withval=$with_openjdk_jre; openjdkjre=$withval
+# Check whether --with-openjdk-path was given.
+if test "${with_openjdk_path+set}" = set; then :
+  withval=$with_openjdk_path; openjdkpath=$withval
 else
-  openjdkjre=/usr/lib/java/jre
-
-fi
-
-
-
-# Check whether --with-openjdk-arch-dir was given.
-if test "${with_openjdk_arch_dir+set}" = set; then :
-  withval=$with_openjdk_arch_dir; openjdkarchdir=$withval
-else
-  openjdkarchdir=/usr/lib/java/jre/lib/i386
+  openjdkpath=/usr/lib/java/
 
 fi
 
@@ -2813,15 +2799,15 @@
   openjdk)
     { $as_echo "$as_me:${as_lineno-$LINENO}: Validating OpenJDK installation..." >&5
 $as_echo "$as_me: Validating OpenJDK installation..." >&6;}
-    as_ac_File=`$as_echo "ac_cv_file_${openjdkjre}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${openjdkjre}" >&5
-$as_echo_n "checking for ${openjdkjre}... " >&6; }
+    as_ac_File=`$as_echo "ac_cv_file_${openjdkpath}" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${openjdkpath}" >&5
+$as_echo_n "checking for ${openjdkpath}... " >&6; }
 if eval \${$as_ac_File+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "${openjdkjre}"; then
+if test -r "${openjdkpath}"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -2833,21 +2819,21 @@
 if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_${openjdkjre}" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_${openjdkpath}" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error $? "Invalid OpenJDK JRE path, can't find required jar files!" "$LINENO" 5
+  as_fn_error $? "Invalid OpenJDK JDK path, can't find required jar files!" "$LINENO" 5
 fi
-as_ac_File=`$as_echo "ac_cv_file_${openjdkjre}/lib/rt.jar" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${openjdkjre}/lib/rt.jar" >&5
-$as_echo_n "checking for ${openjdkjre}/lib/rt.jar... " >&6; }
+as_ac_File=`$as_echo "ac_cv_file_${openjdkpath}/jre/lib/rt.jar" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${openjdkpath}/jre/lib/rt.jar" >&5
+$as_echo_n "checking for ${openjdkpath}/jre/lib/rt.jar... " >&6; }
 if eval \${$as_ac_File+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "${openjdkjre}/lib/rt.jar"; then
+if test -r "${openjdkpath}/jre/lib/rt.jar"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -2859,79 +2845,11 @@
 if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_${openjdkjre}/lib/rt.jar" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_${openjdkpath}/jre/lib/rt.jar" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error $? "Invalid OpenJDK JRE path, can't find required jar files!" "$LINENO" 5
-fi
-
-    as_ac_File=`$as_echo "ac_cv_file_${openjdkarchdir}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${openjdkarchdir}" >&5
-$as_echo_n "checking for ${openjdkarchdir}... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "${openjdkarchdir}"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "Invalid OpenJDK arch dir" "$LINENO" 5
-fi
-
-        as_ac_File=`$as_echo "ac_cv_file_${openjdkarchdir}/client/libjvm.$DYLIB_EXTENSION" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${openjdkarchdir}/client/libjvm.$DYLIB_EXTENSION" >&5
-$as_echo_n "checking for ${openjdkarchdir}/client/libjvm.$DYLIB_EXTENSION... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "${openjdkarchdir}/client/libjvm.$DYLIB_EXTENSION"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_ac_File=`$as_echo "ac_cv_file_${openjdkarchdir}/server/libjvm.$DYLIB_EXTENSION" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${openjdkarchdir}/server/libjvm.$DYLIB_EXTENSION" >&5
-$as_echo_n "checking for ${openjdkarchdir}/server/libjvm.$DYLIB_EXTENSION... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "${openjdkarchdir}/server/libjvm.$DYLIB_EXTENSION"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-else
-  as_fn_error $? "Can't find libjvm.$DYLIB_EXTENSION" "$LINENO" 5
-fi
-
+  as_fn_error $? "Invalid OpenJDK JDK path, can't find required jar files!" "$LINENO" 5
 fi
 
       ;;




From wdietz2 at illinois.edu  Sun Dec 11 12:43:00 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sun, 11 Dec 2011 20:43:00 -0000
Subject: [vmkit-commits] [vmkit] r146348 - in
 /vmkit/trunk/lib/j3/ClassLib/OpenJDK: JavaUpcalls.cpp JavaUpcalls.h
 OpenJDK.inc
Message-ID: <20111211204300.5FC922A6C12C@llvm.org>

Author: wdietz2
Date: Sun Dec 11 14:42:59 2011
New Revision: 146348

URL: http://llvm.org/viewvc/llvm-project?rev=146348&view=rev
Log:
OpenJDK: Call Thread.exit() when a thread exits

Removes thread from its threadgroup, clears fields, etc.

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp?rev=146348&r1=146347&r2=146348&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp Sun Dec 11 14:42:59 2011
@@ -229,6 +229,7 @@
 Class*      Classpath::RefHandlerClass;
 JavaMethod* Classpath::initRefHandler;
 JavaMethod* Classpath::threadStart;
+JavaMethod* Classpath::threadExit;
 
 const char * OpenJDKBootPath =
       OpenJDKJRE "/lib/rt.jar"
@@ -918,6 +919,10 @@
     UPCALL_METHOD(loader, "java/lang/Thread", "start",
         "()V", ACC_VIRTUAL);
 
+  threadExit =
+    UPCALL_METHOD(loader, "java/lang/Thread", "exit",
+        "()V", ACC_VIRTUAL);
+
   EnqueueReference =
     UPCALL_METHOD(loader, "java/lang/ref/Reference",  "enqueue", "()Z",
                   ACC_VIRTUAL);

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h?rev=146348&r1=146347&r2=146348&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h Sun Dec 11 14:42:59 2011
@@ -266,6 +266,7 @@
   ISOLATE_STATIC UserClass*  RefHandlerClass;
   ISOLATE_STATIC JavaMethod* initRefHandler;
   ISOLATE_STATIC JavaMethod* threadStart;
+  ISOLATE_STATIC JavaMethod* threadExit;
 
   ISOLATE_STATIC UserClass*  EnumClass;
   ISOLATE_STATIC UserClass*  assertionStatusDirectivesClass;

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=146348&r1=146347&r2=146348&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Sun Dec 11 14:42:59 2011
@@ -581,10 +581,13 @@
     } END_CATCH;
   }
 
+  // Call Thread.exit()
+  vm->upcalls->threadExit->invokeIntVirtual(vm, thClass, javaThread);
+
+  JavaObject::acquire(javaThread);
   // Indicate that the thread is done by clearing the eetop field.
-  // and notify all waiting threads.
   vm->upcalls->eetop->setInstanceLongField(javaThread, 0);
-  JavaObject::acquire(javaThread);
+  // Notify all waiting threads
   JavaObject::notifyAll(javaThread);
   JavaObject::release(javaThread);
 




From wdietz2 at illinois.edu  Sun Dec 11 12:43:02 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sun, 11 Dec 2011 20:43:02 -0000
Subject: [vmkit-commits] [vmkit] r146349 -
	/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111211204302.875662A6C12C@llvm.org>

Author: wdietz2
Date: Sun Dec 11 14:43:02 2011
New Revision: 146349

URL: http://llvm.org/viewvc/llvm-project?rev=146349&view=rev
Log:
OpenJDK: Use thClass for uncaughtException field lookup.

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=146349&r1=146348&r2=146349&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Sun Dec 11 14:43:02 2011
@@ -574,7 +574,7 @@
     TRY {
       handler = vm->upcalls->getUncaughtExceptionHandler->invokeJavaObjectVirtual(vm, thClass, javaThread);
       verifyNull(handler);
-      vm->upcalls->uncaughtException->invokeIntVirtual(vm, vm->upcalls->uncaughtException->classDef, handler, &javaThread, &exc);
+      vm->upcalls->uncaughtException->invokeIntVirtual(vm, thClass, handler, &javaThread, &exc);
     } CATCH {
       fprintf(stderr, "Exception in thread \"(unknown)\": "
                       "Can not print stack trace.\n");




From wdietz2 at illinois.edu  Sat Dec 17 21:05:51 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sun, 18 Dec 2011 05:05:51 -0000
Subject: [vmkit-commits] [vmkit] r146843 -
	/vmkit/trunk/mmtk/magic/LowerMagic.cpp
Message-ID: <20111218050551.E1B102A6C12C@llvm.org>

Author: wdietz2
Date: Sat Dec 17 23:05:51 2011
New Revision: 146843

URL: http://llvm.org/viewvc/llvm-project?rev=146843&view=rev
Log:
LowerMagic: remove multiple null checks if exist, avoid iterator badness

Modified:
    vmkit/trunk/mmtk/magic/LowerMagic.cpp

Modified: vmkit/trunk/mmtk/magic/LowerMagic.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/magic/LowerMagic.cpp?rev=146843&r1=146842&r2=146843&view=diff
==============================================================================
--- vmkit/trunk/mmtk/magic/LowerMagic.cpp (original)
+++ vmkit/trunk/mmtk/magic/LowerMagic.cpp Sat Dec 17 23:05:51 2011
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/Constants.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
@@ -37,6 +38,7 @@
   char LowerMagic::ID = 0;
   static RegisterPass<LowerMagic> X("LowerMagic",
                                     "Lower magic calls");
+  typedef SmallPtrSet<Instruction*,128> InstSet;
 
 static const char* AddressClass = "JnJVM_org_vmmagic_unboxed_Address_";
 static const char* AddressZeroMethod = 0;
@@ -353,24 +355,25 @@
   }
 }
 
-
-static bool removePotentialNullCheck(BasicBlock* Cur, Value* Obj) {
+static bool removePotentialNullCheck(BasicBlock* Cur, Value* Obj, InstSet& RemoveSet) {
   if (!Obj->getType()->isPointerTy()) return false;
 
   if (vmkit::System::SupportsHardwareNullCheck()) {
+    bool changed = false;
     for (Value::use_iterator I = Obj->use_begin(), E = Obj->use_end(); I != E; I++) {
       if (GetElementPtrInst* GE = dyn_cast<GetElementPtrInst>(*I)) {
         for (Value::use_iterator II = GE->use_begin(), EE = GE->use_end(); II != EE; II++) {
           if (LoadInst* LI = dyn_cast<LoadInst>(*II)) {
             if (LI->isVolatile()) {
               assert(LI->use_empty());
-              LI->eraseFromParent();
-              return true;
+              RemoveSet.insert(LI);
+              changed = true;
             }
           }
         }
       }
     }
+    return changed;
   } else {
     BasicBlock* BB = Cur->getUniquePredecessor();
     LLVMContext& Context = Cur->getParent()->getContext();
@@ -425,6 +428,8 @@
   }
 
 
+  InstSet RemoveSet;
+
   for (Function::iterator BI = F.begin(), BE = F.end(); BI != BE; BI++) { 
     BasicBlock *Cur = BI; 
     for (BasicBlock::iterator II = Cur->begin(), IE = Cur->end(); II != IE;) {
@@ -447,7 +452,7 @@
             Changed = true;
             // Remove the null check
             if (Call.arg_begin() != Call.arg_end()) {
-              removePotentialNullCheck(Cur, Call.getArgument(0));
+              removePotentialNullCheck(Cur, Call.getArgument(0), RemoveSet);
             }
 
             if (!strcmp(FCur->getName().data(), AddressZeroMethod)) {
@@ -700,7 +705,7 @@
             Changed = true;
             // Remove the null check
             if (Call.arg_begin() != Call.arg_end()) {
-              removePotentialNullCheck(Cur, Call.getArgument(0));
+              removePotentialNullCheck(Cur, Call.getArgument(0), RemoveSet);
             }
 
             if (!strcmp(FCur->getName().data(), ExtentToWordMethod)) {
@@ -828,7 +833,7 @@
             Changed = true;
             // Remove the null check
             if (Call.arg_begin() != Call.arg_end()) {
-              removePotentialNullCheck(Cur, Call.getArgument(0));
+              removePotentialNullCheck(Cur, Call.getArgument(0), RemoveSet);
             }
             
             if (!strcmp(FCur->getName().data(), OffsetSLTMethod)) {
@@ -955,7 +960,7 @@
             Changed = true;
             // Remove the null check
             if (Call.arg_begin() != Call.arg_end()) {
-              removePotentialNullCheck(Cur, Call.getArgument(0));
+              removePotentialNullCheck(Cur, Call.getArgument(0), RemoveSet);
             }
 
             if (!strcmp(FCur->getName().data(), ObjectReferenceNullReferenceMethod)) {
@@ -994,7 +999,7 @@
             Changed = true;
             // Remove the null check
             if (Call.arg_begin() != Call.arg_end()) {
-              removePotentialNullCheck(Cur, Call.getArgument(0));
+              removePotentialNullCheck(Cur, Call.getArgument(0), RemoveSet);
             }
              
             if (!strcmp(FCur->getName().data(), WordOrMethod)) {
@@ -1264,6 +1269,13 @@
         }
     }
   }
+
+  Changed |= !RemoveSet.empty();
+  for (InstSet::iterator I = RemoveSet.begin(),
+       E = RemoveSet.end(); I != E; ++I) {
+    (*I)->eraseFromParent();
+  }
+
   return Changed;
 }
 




From wdietz2 at illinois.edu  Sat Dec 17 22:55:06 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Sun, 18 Dec 2011 00:55:06 -0600
Subject: [vmkit-commits] Breaking change for openjdk
In-Reply-To: <CAPYwfionA8-dARbEsTOjvLQLK5C+cz=_L426tb7GHQAxUuYcEg@mail.gmail.com>
References: <CAPYwfiqiZBPb4F2_QnJmcbODkqpgpw5b0d=tYP61iwGmGp1NAw@mail.gmail.com>
	<CAKGWAO_0-0yMekx=xDAhiNKCgO_5JGjBRSNnRa+rehJ5uQkBWg@mail.gmail.com>
	<CAPYwfionA8-dARbEsTOjvLQLK5C+cz=_L426tb7GHQAxUuYcEg@mail.gmail.com>
Message-ID: <CAKGWAO9DgmLb-rXaxouTHyWH8K09XoVtYncUtCLyS2MnTC21BA@mail.gmail.com>

On Fri, Dec 2, 2011 at 11:54 AM, Nicolas Geoffray
<nicolas.geoffray at gmail.com> wrote:
> Yes, I believe that's possible. Depends if openjdk needs fancy things when
> creating a WeakHashMap.

How right you were (see commits involving hardcoding the
java.lang.Reference's clinit as to not spawn its own thread....) but
seems to be working fine now :).

> This is great news! Does that mean precompilation and GC work on the openjdk
> port? That's awesome. Can't wait to try it out!

Precompilation has worked for some time (the speedups it provides
makes it a high priority :)), and I believe the GC works.  It
certainly "mostly" works, but for example the limiting factor in
specjvm2008 presently is that memory isn't being freed when it should,
so I'm running out of memory when trying to do a full run--running
individual benchmarks works much better.  In general the bugs I'm
seeing seem to be more of a "memory not freed" variety not a "memory
freed that shouldn't be", which is some comfort.

Also, I've almost exclusively tested with the default MarkSweep mmtk
plan, although the others seem to work in much more limited testing.

As for trying this out yourself, here's a rough guide:

** Install an OpenJDK JDK6 (not Sun, not JRE, not 1.7).
This should be available in your linux distribution's package manager,
otherwise I've had great success with locally built copies of icedtea6
(what I use for most my testing, actually).

** Replace the GNU Classpath-related configure arguments with
"--with-classpath-impl=openjdk --with-openjdk-path=$JDK_HOME".
JDK_HOME is in surprisingly different places on different
distributions, but it should contain "bin/javac" as well as a "jre"
subdirectory.  The configure script's checks on the path should tell
you if you've got the right path.

** "make"
Might want to cross your fingers first :).


Some caveats when testing this on the various systems I have access to:

* When precompiling, in particular building BootstrapClasses.s,
sometimes gcc (at least with 4.4.5 on one particular system) barfs
claiming invalid assembly.  Other versions of gcc build the same
assembly fine, and "make CC=clang CXX=clang++" avoids this as well.
FYI
* Many recent OpenJDK versions seem to work (1.9 and later), although
I've encountered one ("OpenJDK Runtime Environment (IcedTea6 1.9.10)
(rhel-1.40.1.9.10.el6_1-x86_64)" from Scientific Linux 6.1) that has
some dlopen/dlclose issue (of all things) that makes accessing fonts
segfault.  Previous version from same distribution works as does
building from scratch via IcedTea, so I've mostly given up on this.

The abbreviated version of the above is that "some configurations
don't work" and I don't have a particularly great handle on that due
to lack of time and testing :).  So YMMV.

If you do get to trying it please let me know how it goes/if you have
problems/etc :).  Once it seems to work well for you, then I can work
towards writing a more formal set of instructions for the website as
you previously mentioned :).

Good luck and happy holidays! :)

~Will


From wdietz2 at illinois.edu  Mon Dec 19 00:42:53 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Mon, 19 Dec 2011 08:42:53 -0000
Subject: [vmkit-commits] [vmkit] r146860 -
	/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111219084254.0AADD1BE003@llvm.org>

Author: wdietz2
Date: Mon Dec 19 02:42:53 2011
New Revision: 146860

URL: http://llvm.org/viewvc/llvm-project?rev=146860&view=rev
Log:
OpenJDK: Add JVM methods for get/setsockopt, recvfrom and sendto

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=146860&r1=146859&r2=146860&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Mon Dec 19 02:42:53 2011
@@ -2644,13 +2644,13 @@
 JNIEXPORT jint JNICALL
 JVM_RecvFrom(jint fd, char *buf, int nBytes,
                   int flags, struct sockaddr *from, int *fromlen) {
-  NYI();
+  return recvfrom(fd, buf, nBytes, flags, from, (socklen_t*)fromlen);
 }
 
 JNIEXPORT jint JNICALL
 JVM_SendTo(jint fd, char *buf, int len,
                 int flags, struct sockaddr *to, int tolen) {
-  NYI();
+  return sendto(fd, buf, len, flags, to, (socklen_t)tolen);
 }
 
 JNIEXPORT jint JNICALL
@@ -2675,12 +2675,12 @@
 
 JNIEXPORT jint JNICALL
 JVM_GetSockOpt(jint fd, int level, int optname, char *optval, int *optlen) {
-  NYI();
+  return getsockopt(fd, level, optname, optval, (socklen_t*)optlen);
 }
 
 JNIEXPORT jint JNICALL
 JVM_SetSockOpt(jint fd, int level, int optname, const char *optval, int optlen) {
-  NYI();
+  return setsockopt(fd, level, optname, optval, optlen);
 }
 
 /*




From wdietz2 at illinois.edu  Wed Dec 21 04:16:37 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Wed, 21 Dec 2011 12:16:37 -0000
Subject: [vmkit-commits] [vmkit] r147050 - in /vmkit/trunk/lib/j3:
 ClassLib/OpenJDK/OpenJDK.inc VMCore/JavaClass.cpp VMCore/JavaClass.h
 VMCore/JnjvmClassLoader.cpp
Message-ID: <20111221121637.9ECA82A6C12C@llvm.org>

Author: wdietz2
Date: Wed Dec 21 06:16:37 2011
New Revision: 147050

URL: http://llvm.org/viewvc/llvm-project?rev=147050&view=rev
Log:
Add support for Signature and EnclosingMethod attributes.

OpenJDK: Use these to impl JVM_GetClassSignature and JVM_GetEnclosingMethodInfo

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
    vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
    vmkit/trunk/lib/j3/VMCore/JavaClass.h
    vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147050&r1=147049&r2=147050&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Wed Dec 21 06:16:37 2011
@@ -1661,7 +1661,37 @@
 /* Generics support (JDK 1.5) */
 JNIEXPORT jstring JNICALL
 JVM_GetClassSignature(JNIEnv *env, jclass cls) {
-  NYI();
+  JavaObjectClass * Cl = 0;
+  jstring sig = 0;
+  llvm_gcroot(Cl, 0);
+
+  BEGIN_JNI_EXCEPTION
+
+  Cl = cls ? *(JavaObjectClass**)cls : 0;
+  verifyNull(Cl);
+
+  Jnjvm* vm = th->getJVM();
+  CommonClass* CC =
+    UserCommonClass::resolvedImplClass(vm, Cl, false);
+  Class* cl = CC->asClass();
+
+  // Primitives, arrays, interfaces...
+  if (!cl) RETURN_FROM_JNI(0);
+
+  Attribut* sigAtt = cl->lookupAttribut(Attribut::signatureAttribut);
+
+  if (sigAtt) {
+    Reader reader(sigAtt, cl->bytes);
+    uint16 index = reader.readU2();
+
+    sig = (jstring)cl->classLoader->UTF8ToStr(cl->getConstantPool()->UTF8At(index));
+  }
+
+  RETURN_FROM_JNI(sig);
+
+  END_JNI_EXCEPTION
+
+  return 0;
 }
 
 /* Annotations support (JDK 1.5) */
@@ -2800,7 +2830,55 @@
  */
 JNIEXPORT jobjectArray JNICALL
 JVM_GetEnclosingMethodInfo(JNIEnv* env, jclass ofClass) {
-  NYI();
+  JavaObjectClass * Cl = 0;
+  ArrayObject * arr = 0;
+  llvm_gcroot(Cl, 0);
+  llvm_gcroot(arr, 0);
+
+  BEGIN_JNI_EXCEPTION
+  Jnjvm * vm = th->getJVM();
+
+  Cl = ofClass ? *(JavaObjectClass**)ofClass : 0;
+  verifyNull(Cl);
+
+  CommonClass* CC =
+    UserCommonClass::resolvedImplClass(vm, Cl, false);
+  Class* cl = CC->asClass();
+
+  // Primitives arrays, interfaces...
+  if (!cl) RETURN_FROM_JNI(0);
+
+  Attribut* emAtt = cl->lookupAttribut(Attribut::enclosingMethodAttribut);
+
+  if (emAtt) {
+    Reader reader(emAtt, cl->bytes);
+    uint16 class_index = reader.readU2();
+    uint16 method_index = reader.readU2();
+
+    JavaConstantPool * cpl = cl->getConstantPool();
+    CommonClass * enclosingClass = cpl->loadClass(class_index, true);
+    assert(enclosingClass);
+
+    arr = (ArrayObject*)vm->upcalls->ArrayOfObject->doNew(3,vm);
+    ArrayObject::setElement(arr, enclosingClass->getClassDelegatee(vm), 0);
+
+    if (method_index) {
+      Signdef * sign = cl->getConstantPool()->resolveNameAndSign(method_index);
+      assert(sign);
+
+      const UTF8* methodName = cpl->UTF8At((cpl->ctpDef[method_index] >> 16) & 0xFFFF);
+      assert(methodName);
+
+      ArrayObject::setElement(arr, *cl->classLoader->UTF8ToStr(methodName), 1);
+      ArrayObject::setElement(arr, *cl->classLoader->UTF8ToStr(sign->keyName), 2);
+    }
+  }
+
+  RETURN_REF_FROM_JNI(arr, jobjectArray);
+
+  END_JNI_EXCEPTION
+
+  return 0;
 }
 
 /*

Modified: vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaClass.cpp?rev=147050&r1=147049&r2=147050&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaClass.cpp Wed Dec 21 06:16:37 2011
@@ -36,6 +36,8 @@
 const UTF8* Attribut::lineNumberTableAttribut = 0;
 const UTF8* Attribut::innerClassesAttribut = 0;
 const UTF8* Attribut::sourceFileAttribut = 0;
+const UTF8* Attribut::signatureAttribut = 0;
+const UTF8* Attribut::enclosingMethodAttribut = 0;
 
 Class* ClassArray::SuperArray;
 Class** ClassArray::InterfacesArray;

Modified: vmkit/trunk/lib/j3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaClass.h?rev=147050&r1=147049&r2=147050&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaClass.h Wed Dec 21 06:16:37 2011
@@ -130,6 +130,16 @@
   /// file.
   ///
   static const UTF8* sourceFileAttribut;
+
+  /// signatureAttribut - The "Signature" attribut.  This is used to record
+  /// generics information about a class or method.
+  ///
+  static const UTF8* signatureAttribut;
+
+  /// enclosingMEthodAttribut - The "EnclosingMethod" attribut.  This is a class
+  /// attribut that identifies the method definining a local or anonymous class
+  ///
+  static const UTF8* enclosingMethodAttribut;
   
 };
 

Modified: vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp?rev=147050&r1=147049&r2=147050&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp Wed Dec 21 06:16:37 2011
@@ -150,6 +150,8 @@
   Attribut::lineNumberTableAttribut = asciizConstructUTF8("LineNumberTable");
   Attribut::innerClassesAttribut = asciizConstructUTF8("InnerClasses");
   Attribut::sourceFileAttribut = asciizConstructUTF8("SourceFile");
+  Attribut::signatureAttribut = asciizConstructUTF8("Signature");
+  Attribut::enclosingMethodAttribut = asciizConstructUTF8("EnclosingMethod");
  
   JavaCompiler::InlinePragma =
     asciizConstructUTF8("Lorg/vmmagic/pragma/Inline;");




From wdietz2 at illinois.edu  Wed Dec 21 06:11:41 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Wed, 21 Dec 2011 14:11:41 -0000
Subject: [vmkit-commits] [vmkit] r147052 - in /vmkit/trunk/lib/j3:
 ClassLib/OpenJDK/OpenJDK.inc VMCore/JnjvmClassLoader.cpp
 VMCore/JnjvmClassLoader.h
Message-ID: <20111221141141.261602A6C12D@llvm.org>

Author: wdietz2
Date: Wed Dec 21 08:11:40 2011
New Revision: 147052

URL: http://llvm.org/viewvc/llvm-project?rev=147052&view=rev
Log:
Track boot packages as they're loaded and report this set upon request.

Used in OpenJDK only, as the Classpath API expects a static 'complete' list.

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
    vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp
    vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147052&r1=147051&r2=147052&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Wed Dec 21 08:11:40 2011
@@ -910,7 +910,19 @@
 
 JNIEXPORT jobjectArray JNICALL
 JVM_GetSystemPackages(JNIEnv *env) {
-  NYI();
+  ArrayObject * res = 0;
+  llvm_gcroot(res, 0);
+
+  BEGIN_JNI_EXCEPTION
+
+  Jnjvm* vm = JavaThread::get()->getJVM();
+  res = vm->bootstrapLoader->getBootPackages(vm);
+
+  RETURN_REF_FROM_JNI(res, jobjectArray);
+
+  END_JNI_EXCEPTION
+
+  return NULL;
 }
 
 /*

Modified: vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp?rev=147052&r1=147051&r2=147052&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp Wed Dec 21 08:11:40 2011
@@ -297,6 +297,23 @@
     if (doResolve) cl->asClass()->resolveClass();
   }
 
+  if (cl) {
+    // If we don't have knowledge of the package containing this class,
+    // add it to the set of packages defined in this classLoader
+    UTF8Buffer buffer(name);
+    const char * cname = buffer.cString();
+    const char * slash = strrchr(cname, '/');
+    if (slash) {
+      int packagelen = slash - cname;
+      const UTF8 * package = name->extract(hashUTF8, 0, packagelen);
+      lock.lock();
+      packages.insert(package);
+      lock.unlock();
+    }
+  }
+
+
+
   return (UserClass*)cl;
 }
 
@@ -1052,3 +1069,20 @@
   nativesLock.unlock();
   return res;
 }
+
+ArrayObject* JnjvmBootstrapLoader::getBootPackages(Jnjvm * vm) {
+  ArrayObject* res = 0;
+  llvm_gcroot(res, 0);
+
+  lock.lock();
+  res = (ArrayObject*)vm->upcalls->ArrayOfString->doNew(packages.size(), vm);
+  std::set<const UTF8*>::const_iterator I = packages.begin(),
+                                        E = packages.end();
+  for (int i = 0; I != E; ++I, ++i) {
+    ArrayObject::setElement(res, *UTF8ToStr(*I), i);
+  }
+
+  lock.unlock();
+
+  return res;
+}

Modified: vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h?rev=147052&r1=147051&r2=147052&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h Wed Dec 21 08:11:40 2011
@@ -12,6 +12,7 @@
 #define JNJVM_CLASSLOADER_H
 
 #include <map>
+#include <set>
 #include <vector>
 
 #include "types.h"
@@ -45,6 +46,7 @@
 class TypeMap;
 class VMClassLoader;
 class ZipArchive;
+class ArrayObject;
 
 /// JnjvmClassLoader - Runtime representation of a class loader. It contains
 /// its own tables (signatures, UTF8, types) which are mapped to a single
@@ -429,6 +431,11 @@
   /// primitiveMap - Map of primitive classes, hashed by id.
   std::map<const char, UserClassPrimitive*> primitiveMap;
 
+  // Set of boot packages
+  std::set<const UTF8*> packages;
+
+  ArrayObject* getBootPackages(Jnjvm* vm);
+
   UserClassPrimitive* getPrimitiveClass(char id) {
     return primitiveMap[id];
   }




From wdietz2 at illinois.edu  Wed Dec 21 06:11:39 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Wed, 21 Dec 2011 14:11:39 -0000
Subject: [vmkit-commits] [vmkit] r147051 -
	/vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
Message-ID: <20111221141139.E5ABD2A6C12C@llvm.org>

Author: wdietz2
Date: Wed Dec 21 08:11:39 2011
New Revision: 147051

URL: http://llvm.org/viewvc/llvm-project?rev=147051&view=rev
Log:
Drop requirement that operand stack be empty after processing a method.

I can't find any mention of this in the VM spec, and this assertion causes both
jython and clojure to fail.

Modified:
    vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp

Modified: vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp?rev=147051&r1=147050&r2=147051&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp Wed Dec 21 08:11:39 2011
@@ -1151,7 +1151,12 @@
   reader.cursor = start;
   compileOpcodes(reader, codeLen);
   
-  assert(stack.size() == 0 && "Stack not empty after compiling bytecode");
+  // This isn't a real requirement, although javac-produced bytcode does
+  // seem to adhere to it.  However jython and similar (clojure, etc) don't
+  // always create bytecode that matches this, and AFAICT rejecting the
+  // code is incorrect.
+  //assert(stack.size() == 0 && "Stack not empty after compiling bytecode");
+
   // Fix a javac(?) bug where a method only throws an exception and does
   // not return.
   pred_iterator PI = pred_begin(endBlock);




From nicolas.geoffray at lip6.fr  Sun Dec 25 10:25:51 2011
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Sun, 25 Dec 2011 18:25:51 -0000
Subject: [vmkit-commits] [vmkit] r147268 - in /vmkit/trunk/lib:
 j3/Compiler/JavaAOTCompiler.cpp j3/Compiler/JavaJITCompiler.cpp
 j3/Compiler/LLVMInfo.cpp vmkit/Compiler/JIT.cpp
Message-ID: <20111225182551.1645F2A6C12C@llvm.org>

Author: geoffray
Date: Sun Dec 25 12:25:50 2011
New Revision: 147268

URL: http://llvm.org/viewvc/llvm-project?rev=147268&view=rev
Log:
Move to new LLVM API.


Modified:
    vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp
    vmkit/trunk/lib/vmkit/Compiler/JIT.cpp

Modified: vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp?rev=147268&r1=147267&r2=147268&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp Sun Dec 25 12:25:50 2011
@@ -1806,8 +1806,12 @@
   JavaLLVMCompiler(ModuleID) {
 
   std::string Error;
-  const Target* TheTarget(TargetRegistry::lookupTarget(vmkit::VmkitModule::getHostTriple(), Error));
-  TargetMachine* TM = TheTarget->createTargetMachine(vmkit::VmkitModule::getHostTriple(), "", "");
+  const Target* TheTarget(TargetRegistry::lookupTarget(
+      vmkit::VmkitModule::getHostTriple(), Error));
+  TargetOptions options;
+  options.NoFramePointerElim = true;
+  TargetMachine* TM = TheTarget->createTargetMachine(
+      vmkit::VmkitModule::getHostTriple(), "", "", options);
   TheTargetData = TM->getTargetData();
   TheModule->setDataLayout(TheTargetData->getStringRepresentation());
   TheModule->setTargetTriple(TM->getTargetTriple());

Modified: vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp?rev=147268&r1=147267&r2=147268&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp Sun Dec 25 12:25:50 2011
@@ -157,9 +157,14 @@
 
   EmitFunctionName = false;
   GCInfo = NULL;
+  
+  EngineBuilder engine(TheModule);
+  TargetOptions options;
+  options.NoFramePointerElim = true;
+  engine.setTargetOptions(options);
+  engine.setEngineKind(EngineKind::JIT);
+  executionEngine = engine.create();
 
-  executionEngine = ExecutionEngine::createJIT(TheModule, 0,
-                                               0, llvm::CodeGenOpt::Default, false);
   executionEngine->RegisterJITEventListener(&listener);
   TheTargetData = executionEngine->getTargetData();
   TheModule->setDataLayout(TheTargetData->getStringRepresentation());

Modified: vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp?rev=147268&r1=147267&r2=147268&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp Sun Dec 25 12:25:50 2011
@@ -136,10 +136,6 @@
   return virtualSizeConstant;
 }
 
-namespace llvm {
-  extern bool JITEmitDebugInfo;
-}
-
 static char* GetMethodName(vmkit::ThreadAllocator& allocator,
                            JavaMethod* methodDef,
                            Class* customizeFor) {
@@ -180,7 +176,7 @@
   }
 
   if (result == NULL) {
-    if (Compiler->emitFunctionName() || JITEmitDebugInfo) {
+    if (Compiler->emitFunctionName()) {
       vmkit::ThreadAllocator allocator;
       char* buf = GetMethodName(
           allocator, methodDef, customizing ? customizeFor : NULL);
@@ -216,7 +212,7 @@
 void LLVMMethodInfo::setCustomizedVersion(Class* cl, llvm::Function* F) {
   assert(customizedVersions.size() == 0);
   vmkit::ThreadAllocator allocator;
-  if (Compiler->emitFunctionName() || JITEmitDebugInfo) {
+  if (Compiler->emitFunctionName()) {
     char* buf = GetMethodName(allocator, methodDef, cl);
     F->setName(buf);
   }

Modified: vmkit/trunk/lib/vmkit/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/JIT.cpp?rev=147268&r1=147267&r2=147268&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/vmkit/Compiler/JIT.cpp Sun Dec 25 12:25:50 2011
@@ -98,7 +98,6 @@
   initializeTarget(Registry);
   InitializeNativeTarget(); 
   
-  NoFramePointerElim = true;
   DisablePrettyStackTrace = true;
 
   ThreadAllocator allocator;




From nicolas.geoffray at gmail.com  Wed Dec 28 05:57:09 2011
From: nicolas.geoffray at gmail.com (Nicolas Geoffray)
Date: Wed, 28 Dec 2011 14:57:09 +0100
Subject: [vmkit-commits] Breaking change for openjdk
In-Reply-To: <CAKGWAO9DgmLb-rXaxouTHyWH8K09XoVtYncUtCLyS2MnTC21BA@mail.gmail.com>
References: <CAPYwfiqiZBPb4F2_QnJmcbODkqpgpw5b0d=tYP61iwGmGp1NAw@mail.gmail.com>
	<CAKGWAO_0-0yMekx=xDAhiNKCgO_5JGjBRSNnRa+rehJ5uQkBWg@mail.gmail.com>
	<CAPYwfionA8-dARbEsTOjvLQLK5C+cz=_L426tb7GHQAxUuYcEg@mail.gmail.com>
	<CAKGWAO9DgmLb-rXaxouTHyWH8K09XoVtYncUtCLyS2MnTC21BA@mail.gmail.com>
Message-ID: <CAPYwfiqC0+t8P7KvnyLgz7GoJZZB_cw-xzo9Rx4_u5tdBAAVdw@mail.gmail.com>

Hi Will,

Thanks very much for the instructions! I managed to get everything working
with two gotchas:
1) libjvm.so could not be found. I had to set LD_LIBRARY_PATH to its
location.
2) Generating BootstrapClasses.s does not work on a machine with 1GB of
RAM. It did work on my 12GB work station. We might need to split it into
mulitple files.

Other than that, it worked like a charm! I did see a memory leak, but did
not investigate much. I also tried to use a generational GC but hit an MMTk
assertion quite soon. I will investigate.

FYI, here are some numbers for the dacapo benchmarks. I can't wait to
see JVM_GetClassConstantPool implemented :) And hopefully, it's not as bad
as it looks. By the name, it looks like we need to have a common
representation of the constant pool between libjava.so and vmkit.

avrora: 8490 (8103)
batik: segfault (java exception)
eclipse: java exception (java exception)
fop: 1792 (java exception)
h2: java exception (gc error)
jython: unimplemented JVM_GetClassConstantPool (unimplemented
NewWeakGlobalRef)
luindex: 2185 (2135)
lusearch: 2131 (3683)
pmd: 3473 (3526)
sunflow: 5548 (4671)
tomcat: unimplemented JVM_GetClassConstantPool (segfault)
tradebeans: unimplemented JVM_GetClassConstantPool (java exception)
tradesoap: unimplemented JVM_GetClassConstantPool (java exception)
 xalan: 21728 (2970)

Nice work!
Nicolas

On Sun, Dec 18, 2011 at 7:55 AM, Will Dietz <wdietz2 at illinois.edu> wrote:

> On Fri, Dec 2, 2011 at 11:54 AM, Nicolas Geoffray
> <nicolas.geoffray at gmail.com> wrote:
> > Yes, I believe that's possible. Depends if openjdk needs fancy things
> when
> > creating a WeakHashMap.
>
> How right you were (see commits involving hardcoding the
> java.lang.Reference's clinit as to not spawn its own thread....) but
> seems to be working fine now :).
>
> > This is great news! Does that mean precompilation and GC work on the
> openjdk
> > port? That's awesome. Can't wait to try it out!
>
> Precompilation has worked for some time (the speedups it provides
> makes it a high priority :)), and I believe the GC works.  It
> certainly "mostly" works, but for example the limiting factor in
> specjvm2008 presently is that memory isn't being freed when it should,
> so I'm running out of memory when trying to do a full run--running
> individual benchmarks works much better.  In general the bugs I'm
> seeing seem to be more of a "memory not freed" variety not a "memory
> freed that shouldn't be", which is some comfort.
>
> Also, I've almost exclusively tested with the default MarkSweep mmtk
> plan, although the others seem to work in much more limited testing.
>
> As for trying this out yourself, here's a rough guide:
>
> ** Install an OpenJDK JDK6 (not Sun, not JRE, not 1.7).
> This should be available in your linux distribution's package manager,
> otherwise I've had great success with locally built copies of icedtea6
> (what I use for most my testing, actually).
>
> ** Replace the GNU Classpath-related configure arguments with
> "--with-classpath-impl=openjdk --with-openjdk-path=$JDK_HOME".
> JDK_HOME is in surprisingly different places on different
> distributions, but it should contain "bin/javac" as well as a "jre"
> subdirectory.  The configure script's checks on the path should tell
> you if you've got the right path.
>
> ** "make"
> Might want to cross your fingers first :).
>
>
> Some caveats when testing this on the various systems I have access to:
>
> * When precompiling, in particular building BootstrapClasses.s,
> sometimes gcc (at least with 4.4.5 on one particular system) barfs
> claiming invalid assembly.  Other versions of gcc build the same
> assembly fine, and "make CC=clang CXX=clang++" avoids this as well.
> FYI
> * Many recent OpenJDK versions seem to work (1.9 and later), although
> I've encountered one ("OpenJDK Runtime Environment (IcedTea6 1.9.10)
> (rhel-1.40.1.9.10.el6_1-x86_64)" from Scientific Linux 6.1) that has
> some dlopen/dlclose issue (of all things) that makes accessing fonts
> segfault.  Previous version from same distribution works as does
> building from scratch via IcedTea, so I've mostly given up on this.
>
> The abbreviated version of the above is that "some configurations
> don't work" and I don't have a particularly great handle on that due
> to lack of time and testing :).  So YMMV.
>
> If you do get to trying it please let me know how it goes/if you have
> problems/etc :).  Once it seems to work well for you, then I can work
> towards writing a more formal set of instructions for the website as
> you previously mentioned :).
>
> Good luck and happy holidays! :)
>
> ~Will
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111228/70315fea/attachment.html>

From wdietz2 at illinois.edu  Wed Dec 28 16:06:38 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Thu, 29 Dec 2011 10:36:38 +1030
Subject: [vmkit-commits] Breaking change for openjdk
In-Reply-To: <CAPYwfiqC0+t8P7KvnyLgz7GoJZZB_cw-xzo9Rx4_u5tdBAAVdw@mail.gmail.com>
References: <CAPYwfiqiZBPb4F2_QnJmcbODkqpgpw5b0d=tYP61iwGmGp1NAw@mail.gmail.com>
	<CAKGWAO_0-0yMekx=xDAhiNKCgO_5JGjBRSNnRa+rehJ5uQkBWg@mail.gmail.com>
	<CAPYwfionA8-dARbEsTOjvLQLK5C+cz=_L426tb7GHQAxUuYcEg@mail.gmail.com>
	<CAKGWAO9DgmLb-rXaxouTHyWH8K09XoVtYncUtCLyS2MnTC21BA@mail.gmail.com>
	<CAPYwfiqC0+t8P7KvnyLgz7GoJZZB_cw-xzo9Rx4_u5tdBAAVdw@mail.gmail.com>
Message-ID: <CAKGWAO_uYp4joQOhd93pR2J7cuoXqefX+64zkL4g=2YWO4tAbQ@mail.gmail.com>

On Thu, Dec 29, 2011 at 12:27 AM, Nicolas Geoffray
<nicolas.geoffray at gmail.com> wrote:
> Hi Will,
>
> Thanks very much for the instructions! I managed to get everything working
> with two gotchas:
> 1) libjvm.so could not be found. I had to set LD_LIBRARY_PATH to its
> location.

Ah, yes.  I should've mentioned that, hopefully that didn't give you
too much trouble.
Eventually should remove this (by creating our own libjvm of some
kind, most likely), as requiring the setting of LD_LIBRARY_PATH is
obnoxious if nothing else.

> 2) Generating BootstrapClasses.s does not work on a machine with 1GB of RAM.
> It did work on my 12GB work station. We might need to split it into mulitple
> files.
>

Hmm, interesting.  This is just the class bytecodes emitted into
assembly right?  That should be split up easily enough, or perhaps
when using OpenJDK we could limit the classes emitted in this manner,
since we probably don't need to do this for all of them.

> Other than that, it worked like a charm! I did see a memory leak, but did
> not investigate much. I also tried to use a generational GC but hit an MMTk
> assertion quite soon. I will investigate.
>

Great to hear that it worked well for you!  As for memory issues, how
do you find these leaks?  Valgrind?  I'm naturally interested in
trying to tackle these myself but haven't found a particularly useful
way to get a handle on the GC's behavior yet.  Also, keep me posted on
anything you find re:generational GC behavior, and thanks for looking
into that :).

> FYI, here are some numbers for the dacapo benchmarks. I can't wait to
> see JVM_GetClassConstantPool implemented :) And hopefully, it's not as bad
> as it looks. By the name, it looks like we need to have a common
> representation of the constant pool between libjava.so and vmkit.
>

JVM_GetClassConstantPool as well as implementing Global Weak
References (JNI) are the two big blockers at this point.

The constant pool stuff seems fine, there's a class in OpenJDK
"sun/reflect/ConstantPool" for this, with an Object field to be used
to point to whatever representation we find useful, which is passed to
the various JVM_* methods that operate on constant pools.

I'm mid-implementing this, and was going the route of using this field
to simply store the Class in question, which can be used in the other
calls to find the appropriate constant pool (and means the GC will
trace that ConstantPool object to the Class, preventing it from being
unloaded while it's live).  I believe this should work, but we'll see
as I finish implementing it :).

I haven't tackled Global Weak References yet, but that shouldn't be
too terrible given existing support for weak references and global
references :).

> avrora: 8490 (8103)
> batik: segfault (java exception)

For me this fails due to lack of Global Weak Reference support, and
hacking those JNI calls to return global (non-weak) references was
sufficient to make this benchmark complete.  Nothing that should be
committed, but just FYI this benchmark should work once that support
is in place.

> eclipse: java exception (java exception)

Fails here too with an invocation exception... strange since actual
eclipse seems to work fine :).

> fop: 1792 (java exception)
> h2: java exception (gc error)

Same here, not sure what's going on.

> jython: unimplemented JVM_GetClassConstantPool (unimplemented
> NewWeakGlobalRef)
> luindex: 2185 (2135)
> lusearch: 2131 (3683)
> pmd: 3473 (3526)
> sunflow: 5548 (4671)
> tomcat: unimplemented JVM_GetClassConstantPool (segfault)
> tradebeans: unimplemented JVM_GetClassConstantPool (java exception)
> tradesoap: unimplemented JVM_GetClassConstantPool (java exception)

Hopefully these fall into place once support for constant pools is added.

> xalan: 21728 (2970)
>

Is the Classpath time a typo?  Locally I get 21919 (16550), which
isn't good but isn't as dramatic as 10x either :).

> Nice work!

Thanks, and I'm very glad you were able to get it up and running.
Here's hoping we can get full dacapo 9-12 working soon-ish!

~Will

> Nicolas
>
> On Sun, Dec 18, 2011 at 7:55 AM, Will Dietz <wdietz2 at illinois.edu> wrote:
>>
>> On Fri, Dec 2, 2011 at 11:54 AM, Nicolas Geoffray
>> <nicolas.geoffray at gmail.com> wrote:
>> > Yes, I believe that's possible. Depends if openjdk needs fancy things
>> > when
>> > creating a WeakHashMap.
>>
>> How right you were (see commits involving hardcoding the
>> java.lang.Reference's clinit as to not spawn its own thread....) but
>> seems to be working fine now :).
>>
>> > This is great news! Does that mean precompilation and GC work on the
>> > openjdk
>> > port? That's awesome. Can't wait to try it out!
>>
>> Precompilation has worked for some time (the speedups it provides
>> makes it a high priority :)), and I believe the GC works.  It
>> certainly "mostly" works, but for example the limiting factor in
>> specjvm2008 presently is that memory isn't being freed when it should,
>> so I'm running out of memory when trying to do a full run--running
>> individual benchmarks works much better.  In general the bugs I'm
>> seeing seem to be more of a "memory not freed" variety not a "memory
>> freed that shouldn't be", which is some comfort.
>>
>> Also, I've almost exclusively tested with the default MarkSweep mmtk
>> plan, although the others seem to work in much more limited testing.
>>
>> As for trying this out yourself, here's a rough guide:
>>
>> ** Install an OpenJDK JDK6 (not Sun, not JRE, not 1.7).
>> This should be available in your linux distribution's package manager,
>> otherwise I've had great success with locally built copies of icedtea6
>> (what I use for most my testing, actually).
>>
>> ** Replace the GNU Classpath-related configure arguments with
>> "--with-classpath-impl=openjdk --with-openjdk-path=$JDK_HOME".
>> JDK_HOME is in surprisingly different places on different
>> distributions, but it should contain "bin/javac" as well as a "jre"
>> subdirectory.  The configure script's checks on the path should tell
>> you if you've got the right path.
>>
>> ** "make"
>> Might want to cross your fingers first :).
>>
>>
>> Some caveats when testing this on the various systems I have access to:
>>
>> * When precompiling, in particular building BootstrapClasses.s,
>> sometimes gcc (at least with 4.4.5 on one particular system) barfs
>> claiming invalid assembly.  Other versions of gcc build the same
>> assembly fine, and "make CC=clang CXX=clang++" avoids this as well.
>> FYI
>> * Many recent OpenJDK versions seem to work (1.9 and later), although
>> I've encountered one ("OpenJDK Runtime Environment (IcedTea6 1.9.10)
>> (rhel-1.40.1.9.10.el6_1-x86_64)" from Scientific Linux 6.1) that has
>> some dlopen/dlclose issue (of all things) that makes accessing fonts
>> segfault.  Previous version from same distribution works as does
>> building from scratch via IcedTea, so I've mostly given up on this.
>>
>> The abbreviated version of the above is that "some configurations
>> don't work" and I don't have a particularly great handle on that due
>> to lack of time and testing :).  So YMMV.
>>
>> If you do get to trying it please let me know how it goes/if you have
>> problems/etc :).  Once it seems to work well for you, then I can work
>> towards writing a more formal set of instructions for the website as
>> you previously mentioned :).
>>
>> Good luck and happy holidays! :)
>>
>> ~Will
>
>



From nicolas.geoffray at gmail.com  Thu Dec 29 02:08:40 2011
From: nicolas.geoffray at gmail.com (Nicolas Geoffray)
Date: Thu, 29 Dec 2011 11:08:40 +0100
Subject: [vmkit-commits] Breaking change for openjdk
In-Reply-To: <CAKGWAO_uYp4joQOhd93pR2J7cuoXqefX+64zkL4g=2YWO4tAbQ@mail.gmail.com>
References: <CAPYwfiqiZBPb4F2_QnJmcbODkqpgpw5b0d=tYP61iwGmGp1NAw@mail.gmail.com>
	<CAKGWAO_0-0yMekx=xDAhiNKCgO_5JGjBRSNnRa+rehJ5uQkBWg@mail.gmail.com>
	<CAPYwfionA8-dARbEsTOjvLQLK5C+cz=_L426tb7GHQAxUuYcEg@mail.gmail.com>
	<CAKGWAO9DgmLb-rXaxouTHyWH8K09XoVtYncUtCLyS2MnTC21BA@mail.gmail.com>
	<CAPYwfiqC0+t8P7KvnyLgz7GoJZZB_cw-xzo9Rx4_u5tdBAAVdw@mail.gmail.com>
	<CAKGWAO_uYp4joQOhd93pR2J7cuoXqefX+64zkL4g=2YWO4tAbQ@mail.gmail.com>
Message-ID: <CAPYwfipk5Y8gHqt_91pbz3B5EAzdraV88AZLpFeS9NW_Ss7-WQ@mail.gmail.com>

On Thu, Dec 29, 2011 at 1:06 AM, Will Dietz <wdietz2 at illinois.edu> wrote:

> On Thu, Dec 29, 2011 at 12:27 AM, Nicolas Geoffray
> <nicolas.geoffray at gmail.com> wrote:
> > Hi Will,
> >
> > Thanks very much for the instructions! I managed to get everything
> working
> > with two gotchas:
> > 1) libjvm.so could not be found. I had to set LD_LIBRARY_PATH to its
> > location.
>
> Ah, yes.  I should've mentioned that, hopefully that didn't give you
> too much trouble.
> Eventually should remove this (by creating our own libjvm of some
> kind, most likely), as requiring the setting of LD_LIBRARY_PATH is
> obnoxious if nothing else.
>
> > 2) Generating BootstrapClasses.s does not work on a machine with 1GB of
> RAM.
> > It did work on my 12GB work station. We might need to split it into
> mulitple
> > files.
> >
>
> Hmm, interesting.  This is just the class bytecodes emitted into
> assembly right?


Right.


> That should be split up easily enough, or perhaps
> when using OpenJDK we could limit the classes emitted in this manner,
> since we probably don't need to do this for all of them.
>

Yeah, both approaches could work.


>
> > Other than that, it worked like a charm! I did see a memory leak, but did
> > not investigate much. I also tried to use a generational GC but hit an
> MMTk
> > assertion quite soon. I will investigate.
> >
>
> Great to hear that it worked well for you!  As for memory issues, how
> do you find these leaks?  Valgrind?  I'm naturally interested in
> trying to tackle these myself but haven't found a particularly useful
> way to get a handle on the GC's behavior yet.


I found them by passing the option -X:gc:verbose=1 to j3. The memory always
grows when running multiple times the same benchmark.

Also, keep me posted on
> anything you find re:generational GC behavior, and thanks for looking
> into that :).
>
> > FYI, here are some numbers for the dacapo benchmarks. I can't wait to
> > see JVM_GetClassConstantPool implemented :) And hopefully, it's not as
> bad
> > as it looks. By the name, it looks like we need to have a common
> > representation of the constant pool between libjava.so and vmkit.
> >
>
> JVM_GetClassConstantPool as well as implementing Global Weak
> References (JNI) are the two big blockers at this point.
>
> The constant pool stuff seems fine, there's a class in OpenJDK
> "sun/reflect/ConstantPool" for this, with an Object field to be used
> to point to whatever representation we find useful, which is passed to
> the various JVM_* methods that operate on constant pools.
>

That's good news.


>
> I'm mid-implementing this, and was going the route of using this field
> to simply store the Class in question, which can be used in the other
> calls to find the appropriate constant pool (and means the GC will
> trace that ConstantPool object to the Class, preventing it from being
> unloaded while it's live).  I believe this should work, but we'll see
> as I finish implementing it :).
>
> I haven't tackled Global Weak References yet, but that shouldn't be
> too terrible given existing support for weak references and global
> references :).
>
> > avrora: 8490 (8103)
> > batik: segfault (java exception)
>
> For me this fails due to lack of Global Weak Reference support, and
> hacking those JNI calls to return global (non-weak) references was
> sufficient to make this benchmark complete.  Nothing that should be
> committed, but just FYI this benchmark should work once that support
> is in place.
>
> > eclipse: java exception (java exception)
>
> Fails here too with an invocation exception... strange since actual
> eclipse seems to work fine :).
>
> > fop: 1792 (java exception)
> > h2: java exception (gc error)
>
> Same here, not sure what's going on.
>
> > jython: unimplemented JVM_GetClassConstantPool (unimplemented
> > NewWeakGlobalRef)
> > luindex: 2185 (2135)
> > lusearch: 2131 (3683)
> > pmd: 3473 (3526)
> > sunflow: 5548 (4671)
> > tomcat: unimplemented JVM_GetClassConstantPool (segfault)
> > tradebeans: unimplemented JVM_GetClassConstantPool (java exception)
> > tradesoap: unimplemented JVM_GetClassConstantPool (java exception)
>
> Hopefully these fall into place once support for constant pools is added.
>
> > xalan: 21728 (2970)
> >
>
> Is the Classpath time a typo?  Locally I get 21919 (16550), which
> isn't good but isn't as dramatic as 10x either :).
>

No the classpath time was not a typo. FYI, I ran the benchmark on a 16 core
machine with 12GB of memory.


>
> > Nice work!
>
> Thanks, and I'm very glad you were able to get it up and running.
> Here's hoping we can get full dacapo 9-12 working soon-ish!
>
>
Can't wait for it! :)

Nicolas


> ~Will
>
> > Nicolas
> >
> > On Sun, Dec 18, 2011 at 7:55 AM, Will Dietz <wdietz2 at illinois.edu>
> wrote:
> >>
> >> On Fri, Dec 2, 2011 at 11:54 AM, Nicolas Geoffray
> >> <nicolas.geoffray at gmail.com> wrote:
> >> > Yes, I believe that's possible. Depends if openjdk needs fancy things
> >> > when
> >> > creating a WeakHashMap.
> >>
> >> How right you were (see commits involving hardcoding the
> >> java.lang.Reference's clinit as to not spawn its own thread....) but
> >> seems to be working fine now :).
> >>
> >> > This is great news! Does that mean precompilation and GC work on the
> >> > openjdk
> >> > port? That's awesome. Can't wait to try it out!
> >>
> >> Precompilation has worked for some time (the speedups it provides
> >> makes it a high priority :)), and I believe the GC works.  It
> >> certainly "mostly" works, but for example the limiting factor in
> >> specjvm2008 presently is that memory isn't being freed when it should,
> >> so I'm running out of memory when trying to do a full run--running
> >> individual benchmarks works much better.  In general the bugs I'm
> >> seeing seem to be more of a "memory not freed" variety not a "memory
> >> freed that shouldn't be", which is some comfort.
> >>
> >> Also, I've almost exclusively tested with the default MarkSweep mmtk
> >> plan, although the others seem to work in much more limited testing.
> >>
> >> As for trying this out yourself, here's a rough guide:
> >>
> >> ** Install an OpenJDK JDK6 (not Sun, not JRE, not 1.7).
> >> This should be available in your linux distribution's package manager,
> >> otherwise I've had great success with locally built copies of icedtea6
> >> (what I use for most my testing, actually).
> >>
> >> ** Replace the GNU Classpath-related configure arguments with
> >> "--with-classpath-impl=openjdk --with-openjdk-path=$JDK_HOME".
> >> JDK_HOME is in surprisingly different places on different
> >> distributions, but it should contain "bin/javac" as well as a "jre"
> >> subdirectory.  The configure script's checks on the path should tell
> >> you if you've got the right path.
> >>
> >> ** "make"
> >> Might want to cross your fingers first :).
> >>
> >>
> >> Some caveats when testing this on the various systems I have access to:
> >>
> >> * When precompiling, in particular building BootstrapClasses.s,
> >> sometimes gcc (at least with 4.4.5 on one particular system) barfs
> >> claiming invalid assembly.  Other versions of gcc build the same
> >> assembly fine, and "make CC=clang CXX=clang++" avoids this as well.
> >> FYI
> >> * Many recent OpenJDK versions seem to work (1.9 and later), although
> >> I've encountered one ("OpenJDK Runtime Environment (IcedTea6 1.9.10)
> >> (rhel-1.40.1.9.10.el6_1-x86_64)" from Scientific Linux 6.1) that has
> >> some dlopen/dlclose issue (of all things) that makes accessing fonts
> >> segfault.  Previous version from same distribution works as does
> >> building from scratch via IcedTea, so I've mostly given up on this.
> >>
> >> The abbreviated version of the above is that "some configurations
> >> don't work" and I don't have a particularly great handle on that due
> >> to lack of time and testing :).  So YMMV.
> >>
> >> If you do get to trying it please let me know how it goes/if you have
> >> problems/etc :).  Once it seems to work well for you, then I can work
> >> towards writing a more formal set of instructions for the website as
> >> you previously mentioned :).
> >>
> >> Good luck and happy holidays! :)
> >>
> >> ~Will
> >
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111229/f8c92a80/attachment.html>

From wdietz2 at illinois.edu  Fri Dec 30 06:15:58 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Fri, 30 Dec 2011 14:15:58 -0000
Subject: [vmkit-commits] [vmkit] r147374 - in
 /vmkit/trunk/lib/j3/ClassLib/OpenJDK: JavaUpcalls.cpp JavaUpcalls.h
 OpenJDK.inc
Message-ID: <20111230141558.711962A6C12C@llvm.org>

Author: wdietz2
Date: Fri Dec 30 08:15:58 2011
New Revision: 147374

URL: http://llvm.org/viewvc/llvm-project?rev=147374&view=rev
Log:
Initial work on generating constantpool objects for annotation reflection. (OJ)

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp?rev=147374&r1=147373&r2=147374&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp Fri Dec 30 08:15:58 2011
@@ -219,6 +219,8 @@
 JavaField* Classpath::methodClass;
 JavaField* Classpath::fieldClass;
 JavaField* Classpath::constructorClass;
+Class*     Classpath::constantPoolClass;
+JavaField* Classpath::constantPoolOop;
 
 JavaMethod* Classpath::EnqueueReference;
 Class*      Classpath::newReference;
@@ -855,6 +857,12 @@
     UPCALL_FIELD(loader, "java/lang/reflect/Constructor", "clazz",
                  "Ljava/lang/Class;", ACC_VIRTUAL);
 
+  constantPoolClass =
+    UPCALL_CLASS(loader, "sun/reflect/ConstantPool");
+  constantPoolOop =
+    UPCALL_FIELD(loader, "sun/reflect/ConstantPool", "constantPoolOop",
+                 "Ljava/lang/Object;", ACC_VIRTUAL);
+
   loader->loadName(loader->asciizConstructUTF8("java/lang/String"),
                                        true, false, NULL);
 
@@ -997,6 +1005,8 @@
   assertionStatusDirectivesClass->resolveClass();
   assertionStatusDirectivesClass->initialiseClass(jvm);
 
+  constantPoolClass->resolveClass();
+  constantPoolClass->initialiseClass(jvm);
 }
 
 

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h?rev=147374&r1=147373&r2=147374&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.h Fri Dec 30 08:15:58 2011
@@ -256,6 +256,8 @@
   ISOLATE_STATIC JavaField* methodClass;
   ISOLATE_STATIC JavaField* fieldClass;
   ISOLATE_STATIC JavaField* constructorClass;
+  ISOLATE_STATIC UserClass* constantPoolClass;
+  ISOLATE_STATIC JavaField* constantPoolOop;
 
   ISOLATE_STATIC JavaMethod* EnqueueReference;
   ISOLATE_STATIC UserClass*  newReference;

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147374&r1=147373&r2=147374&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Fri Dec 30 08:15:58 2011
@@ -1863,7 +1863,28 @@
 
 JNIEXPORT jobject JNICALL
 JVM_GetClassConstantPool(JNIEnv *env, jclass cls) {
-  NYI();
+  JavaObjectClass * Cl = 0;
+  JavaObject* CP = 0;
+  llvm_gcroot(Cl, 0);
+  llvm_gcroot(CP, 0);
+  BEGIN_JNI_EXCEPTION
+
+  Cl = cls ? *(JavaObjectClass**)cls : 0;
+  verifyNull(Cl);
+
+  Jnjvm* vm = th->getJVM();
+
+  CP = vm->upcalls->constantPoolClass->doNew(vm);
+
+  // Set the constantPoolOop field to point to the Class this
+  // ConstantPool object is supposed to represent the constant pool for.
+  vm->upcalls->constantPoolOop->setInstanceObjectField(CP, Cl);
+
+  RETURN_REF_FROM_JNI(CP, jobject);
+
+  END_JNI_EXCEPTION
+
+  return 0;
 }
 
 JNIEXPORT jint JNICALL JVM_ConstantPoolGetSize




From wdietz2 at illinois.edu  Fri Dec 30 06:15:59 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Fri, 30 Dec 2011 14:15:59 -0000
Subject: [vmkit-commits] [vmkit] r147375 - in /vmkit/trunk/lib/j3/ClassLib:
 GNUClasspath/ClasspathVMClass.inc OpenJDK/OpenJDK.inc Reflect.inc
Message-ID: <20111230141559.D1AD72A6C12C@llvm.org>

Author: wdietz2
Date: Fri Dec 30 08:15:59 2011
New Revision: 147375

URL: http://llvm.org/viewvc/llvm-project?rev=147375&view=rev
Log:
Un-share annotation reflection support, OpenJDK works differently.

Modified:
    vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
    vmkit/trunk/lib/j3/ClassLib/Reflect.inc

Modified: vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc?rev=147375&r1=147374&r2=147375&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc Fri Dec 30 08:15:59 2011
@@ -442,7 +442,9 @@
 
   BEGIN_NATIVE_EXCEPTION(0)
 
-  res = JavaObjectClass::getDeclaredAnnotations((JavaObjectClass*)Cl);
+  Jnjvm* vm = JavaThread::get()->getJVM();
+  UserClassArray* array = vm->upcalls->constructorArrayAnnotation;
+  res = (ArrayObject*)array->doNew(0, vm);
 
   END_NATIVE_EXCEPTION
 

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147375&r1=147374&r2=147375&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Fri Dec 30 08:15:59 2011
@@ -1709,14 +1709,13 @@
 /* Annotations support (JDK 1.5) */
 JNIEXPORT jbyteArray JNICALL
 JVM_GetClassAnnotations(JNIEnv *env, jclass cls) {
-  ArrayObject* ret = 0;
+  JavaObject* ret = 0;
   llvm_gcroot(ret, 0);
 
   BEGIN_JNI_EXCEPTION
 
-  ret = JavaObjectClass::getDeclaredAnnotations(*(JavaObjectClass**)cls);
-
-  RETURN_REF_FROM_JNI(ret, jbyteArray);
+  NYI();
+  RETURN_FROM_JNI(0);
 
   END_JNI_EXCEPTION
 

Modified: vmkit/trunk/lib/j3/ClassLib/Reflect.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/Reflect.inc?rev=147375&r1=147374&r2=147375&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/Reflect.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/Reflect.inc Fri Dec 30 08:15:59 2011
@@ -224,18 +224,6 @@
   return res;
 }
 
-ArrayObject* JavaObjectClass::getDeclaredAnnotations(JavaObjectClass* Cl) {
-  // TODO: Implement me (for now just returning empty array)
-  ArrayObject* res = 0;
-  llvm_gcroot(res, 0);
-
-  Jnjvm* vm = JavaThread::get()->getJVM();
-  UserClassArray* array = vm->upcalls->constructorArrayAnnotation;
-  res = (ArrayObject*)array->doNew(0, vm);
-
-  return res;
-}
-
 int32_t JavaObjectClass::getModifiers(JavaObjectClass* Cl) {
   llvm_gcroot(Cl, 0);
   int32_t res;




From wdietz2 at illinois.edu  Fri Dec 30 06:16:00 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Fri, 30 Dec 2011 14:16:00 -0000
Subject: [vmkit-commits] [vmkit] r147376 -
	/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111230141600.C7C7E2A6C12C@llvm.org>

Author: wdietz2
Date: Fri Dec 30 08:16:00 2011
New Revision: 147376

URL: http://llvm.org/viewvc/llvm-project?rev=147376&view=rev
Log:
Impl JVM_GetClassAnnotations (OpenJDK)

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147376&r1=147375&r2=147376&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Fri Dec 30 08:16:00 2011
@@ -1709,12 +1709,36 @@
 /* Annotations support (JDK 1.5) */
 JNIEXPORT jbyteArray JNICALL
 JVM_GetClassAnnotations(JNIEnv *env, jclass cls) {
-  JavaObject* ret = 0;
+  ArraySInt8 * ret = 0;
+  JavaObjectClass* Cl = 0;
   llvm_gcroot(ret, 0);
+  llvm_gcroot(Cl, 0);
 
   BEGIN_JNI_EXCEPTION
 
-  NYI();
+  Cl = cls ? *(JavaObjectClass**)cls : 0;
+  verifyNull(Cl);
+
+  Jnjvm* vm = th->getJVM();
+  CommonClass* CC = JavaObjectClass::getClass(Cl);
+  assert(CC);
+  Class* cl = CC->asClass();
+  assert(cl);
+
+  Attribut* annotationsAtt =
+    cl->lookupAttribut(Attribut::annotationsAttribut);
+
+  if (annotationsAtt) {
+    uint32 len = annotationsAtt->nbb;
+    ret = (ArraySInt8*)vm->upcalls->ArrayOfByte->doNew(len, vm);
+
+    Reader reader(annotationsAtt, cl->bytes);
+    for(uint32 i = 0; i < len; ++i) {
+      ArraySInt8::setElement(ret, reader.readS1(), i);
+    }
+    RETURN_REF_FROM_JNI(ret, jbyteArray);
+  }
+
   RETURN_FROM_JNI(0);
 
   END_JNI_EXCEPTION




From wdietz2 at illinois.edu  Fri Dec 30 06:16:01 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Fri, 30 Dec 2011 14:16:01 -0000
Subject: [vmkit-commits] [vmkit] r147377 -
	/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111230141601.BD1A22A6C12C@llvm.org>

Author: wdietz2
Date: Fri Dec 30 08:16:01 2011
New Revision: 147377

URL: http://llvm.org/viewvc/llvm-project?rev=147377&view=rev
Log:
Impl JVM_ConstantPoolGetUTF8At (OpenJDK)

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147377&r1=147376&r2=147377&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Fri Dec 30 08:16:01 2011
@@ -1977,7 +1977,28 @@
 
 JNIEXPORT jstring JNICALL JVM_ConstantPoolGetUTF8At
 (JNIEnv *env, jobject unused, jobject jcpool, jint index) {
-  NYI();
+  JavaObjectClass* Cl = 0;
+  llvm_gcroot(Cl, 0);
+
+  BEGIN_JNI_EXCEPTION
+
+  Cl = jcpool ? *(JavaObjectClass**)jcpool : 0;
+  verifyNull(Cl);
+
+  Class* cl = JavaObjectClass::getClass(Cl)->asClass();
+  assert(cl);
+
+  const UTF8* utf = cl->getConstantPool()->UTF8At(index);
+  assert(utf);
+
+  Jnjvm* vm = th->getJVM();
+  jstring str = (jstring)cl->classLoader->UTF8ToStr(utf);
+
+  RETURN_FROM_JNI(str);
+
+  END_JNI_EXCEPTION
+
+  return 0;
 }
 
 /*




From wdietz2 at illinois.edu  Fri Dec 30 12:40:16 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Fri, 30 Dec 2011 20:40:16 -0000
Subject: [vmkit-commits] [vmkit] r147380 - in /vmkit/trunk/lib/j3:
 ClassLib/OpenJDK/ClasspathReflect.cpp ClassLib/OpenJDK/ClasspathReflect.h
 ClassLib/OpenJDK/OpenJDK.inc VMCore/JavaClass.cpp VMCore/JavaClass.h
 VMCore/JnjvmClassLoader.cpp
Message-ID: <20111230204017.0260F2A6C12C@llvm.org>

Author: wdietz2
Date: Fri Dec 30 14:40:16 2011
New Revision: 147380

URL: http://llvm.org/viewvc/llvm-project?rev=147380&view=rev
Log:
Add support for annotation-related attributes in OpenJDK.

Populate signature fields in generated reflection objects also.

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.h
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
    vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
    vmkit/trunk/lib/j3/VMCore/JavaClass.h
    vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp?rev=147380&r1=147379&r2=147380&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.cpp Fri Dec 30 14:40:16 2011
@@ -10,11 +10,14 @@
 #include "ClasspathReflect.h"
 #include "JavaArray.h"
 #include "JavaClass.h"
+#include "JavaConstantPool.h"
 #include "JavaObject.h"
 #include "JavaThread.h"
 #include "JavaTypes.h"
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
+#include "Reader.h"
+
 #include "Reflect.inc"
 
 namespace j3 {
@@ -86,9 +89,13 @@
   JavaObjectConstructor* ret = 0;
   JavaObject* pArr = 0;
   JavaObject* eArr = 0;
+  ArraySInt8* ann = 0;
+  ArraySInt8* pmAnn = 0;
   llvm_gcroot(ret, 0);
   llvm_gcroot(pArr, 0);
   llvm_gcroot(eArr, 0);
+  llvm_gcroot(ann, 0);
+  llvm_gcroot(pmAnn, 0);
 
   Jnjvm* vm = JavaThread::get()->getJVM();
   JnjvmClassLoader * classLoader = cons->classDef->classLoader;
@@ -98,15 +105,20 @@
   eArr = cons->getExceptionTypes(classLoader);
   ret = (JavaObjectConstructor*)Cons->doNew(vm);
   JavaObject* const* Cl = cons->classDef->getDelegateePtr();
+
+  JavaString ** sig = getSignature(cons);
+  ann = getAnnotations(cons);
+  pmAnn = getParamAnnotations(cons);
+
   vm->upcalls->initConstructor->invokeIntSpecial(vm, Cons, ret,
     Cl,           /* declaringClass */
     &pArr,        /* parameterTypes */
     &eArr,        /* checkedExceptions */
     cons->access, /* modifiers */
     i,            /* slot */
-    NULL,         /* String signature */
-    NULL,         /* annotations */
-    NULL          /* parameterAnnotations */
+    sig,          /* String signature */
+    &ann,         /* annotations */
+    &pmAnn        /* parameterAnnotations */
   );
 
   return ret;
@@ -118,11 +130,17 @@
   JavaObject* pArr = 0;
   JavaObject* eArr = 0;
   JavaObject* retTy = 0;
+  ArraySInt8* ann = 0;
+  ArraySInt8* pmAnn = 0;
+  ArraySInt8* defAnn = 0;
   llvm_gcroot(ret, 0);
   llvm_gcroot(str, 0);
   llvm_gcroot(pArr, 0);
   llvm_gcroot(eArr, 0);
   llvm_gcroot(retTy, 0);
+  llvm_gcroot(ann, 0);
+  llvm_gcroot(pmAnn, 0);
+  llvm_gcroot(defAnn, 0);
 
   // TODO: check parameter types
   Jnjvm* vm = JavaThread::get()->getJVM();
@@ -134,6 +152,11 @@
   pArr = meth->getParameterTypes(classLoader);
   eArr = meth->getExceptionTypes(classLoader);
   retTy = meth->getReturnType(classLoader);
+  JavaString ** sig = getSignature(meth);
+  ann = getAnnotations(meth);
+  pmAnn = getParamAnnotations(meth);
+  defAnn = getAnnotationDefault(meth);
+
   JavaObject* const* Cl = meth->classDef->getClassDelegateePtr(vm);
   vm->upcalls->initMethod->invokeIntSpecial(vm, Meth, ret,
     Cl,           /* declaring class */
@@ -143,10 +166,10 @@
     &eArr,        /* exceptions */
     meth->access, /* modifiers */
     i,            /* slot */
-    NULL,         /* signature */
-    NULL,         /* annotations */
-    NULL,         /* parameter annotations */
-    NULL);        /* default annotations */
+    sig,          /* signature */
+    &ann,         /* annotations */
+    &pmAnn,       /* parameter annotations */
+    &defAnn);     /* default annotations */
 
   return ret;
 }
@@ -154,8 +177,10 @@
 JavaObjectField* JavaObjectField::createFromInternalField(JavaField* field, int i) {
   JavaObjectField* ret = 0;
   JavaString* name = 0;
+  ArraySInt8* ann = 0;
   llvm_gcroot(ret, 0);
   llvm_gcroot(name, 0);
+  llvm_gcroot(ann, 0);
 
   // TODO: check parameter types
   Jnjvm* vm = JavaThread::get()->getJVM();
@@ -170,9 +195,8 @@
   JavaObject* const* type = fieldCl->getClassDelegateePtr(vm);
   JavaObject* const* Cl = field->classDef->getClassDelegateePtr(vm);
 
-  // TODO:Implement these!
-  JavaObject** sign = NULL;
-  JavaObject** annArray = NULL;
+  JavaString** sig = getSignature(field);
+  ann = getAnnotations(field);
 
   /* java.reflect.Field(
   *   Class declaringClass,
@@ -189,10 +213,106 @@
     type,
     field->access,
     i,
-    sign,
-    annArray);
+    sig,
+    ann);
 
   return ret;
 }
 
+static inline JavaString** getSignatureString(Attribut* sigAtt, Class* cl) {
+  if (!sigAtt) return 0;
+
+  Reader reader(sigAtt, cl->bytes);
+  uint16 index = reader.readU2();
+
+  return cl->classLoader->UTF8ToStr(cl->getConstantPool()->UTF8At(index));
+
+}
+
+JavaString** JavaObjectClass::getSignature(Class *cl) {
+  Attribut* sigAtt = cl->lookupAttribut(Attribut::signatureAttribut);
+  return getSignatureString(sigAtt, cl);
+}
+
+JavaString** JavaObjectField::getSignature(JavaField* field) {
+  Attribut* sigAtt = field->lookupAttribut(Attribut::signatureAttribut);
+  return getSignatureString(sigAtt, field->classDef);
+}
+
+JavaString** JavaObjectMethod::getSignature(JavaMethod* meth) {
+  Attribut* sigAtt = meth->lookupAttribut(Attribut::signatureAttribut);
+  return getSignatureString(sigAtt, meth->classDef);
+}
+
+JavaString** JavaObjectConstructor::getSignature(JavaMethod* cons) {
+  Attribut* sigAtt = cons->lookupAttribut(Attribut::signatureAttribut);
+  return getSignatureString(sigAtt, cons->classDef);
+}
+
+static inline ArraySInt8* getAttrBytes(Attribut* annotationsAtt, Class* cl) {
+  ArraySInt8* ret = 0;
+  llvm_gcroot(ret, 0);
+
+  if (!annotationsAtt) return 0;
+
+  JavaThread* th = JavaThread::get();
+  Jnjvm* vm = th->getJVM();
+
+  uint32 len = annotationsAtt->nbb;
+  ret = (ArraySInt8*)vm->upcalls->ArrayOfByte->doNew(len, vm);
+
+  Reader reader(annotationsAtt, cl->bytes);
+  for(uint32 i = 0; i < len; ++i) {
+    ArraySInt8::setElement(ret, reader.readS1(), i);
+  }
+
+  return ret;
+}
+
+ArraySInt8* JavaObjectClass::getAnnotations(Class *cl) {
+  Attribut* attr =
+    cl->lookupAttribut(Attribut::annotationsAttribut);
+
+  return getAttrBytes(attr, cl);
+}
+
+ArraySInt8* JavaObjectField::getAnnotations(JavaField *field) {
+  Attribut* attr =
+    field->lookupAttribut(Attribut::annotationsAttribut);
+
+  return getAttrBytes(attr, field->classDef);
+}
+
+ArraySInt8* JavaObjectMethod::getAnnotations(JavaMethod *meth) {
+  Attribut* attr =
+    meth->lookupAttribut(Attribut::annotationsAttribut);
+
+  return getAttrBytes(attr, meth->classDef);
+}
+ArraySInt8* JavaObjectMethod::getParamAnnotations(JavaMethod *meth) {
+  Attribut* attr =
+    meth->lookupAttribut(Attribut::paramAnnotationsAttribut);
+
+  return getAttrBytes(attr, meth->classDef);
+}
+ArraySInt8* JavaObjectMethod::getAnnotationDefault(JavaMethod *meth) {
+  Attribut* attr =
+    meth->lookupAttribut(Attribut::annotationDefaultAttribut);
+
+  return getAttrBytes(attr, meth->classDef);
+}
+
+ArraySInt8* JavaObjectConstructor::getAnnotations(JavaMethod *cons) {
+  Attribut* attr =
+    cons->lookupAttribut(Attribut::annotationsAttribut);
+
+  return getAttrBytes(attr, cons->classDef);
+}
+ArraySInt8* JavaObjectConstructor::getParamAnnotations(JavaMethod *cons) {
+  Attribut* attr =
+    cons->lookupAttribut(Attribut::paramAnnotationsAttribut);
+
+  return getAttrBytes(attr, cons->classDef);
+}
+
 } // end namespace j3

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.h?rev=147380&r1=147379&r2=147380&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.h (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/ClasspathReflect.h Fri Dec 30 14:40:16 2011
@@ -12,6 +12,7 @@
 
 #include "VmkitGC.h"
 
+#include "JavaArray.h"
 #include "JavaClass.h"
 #include "JavaObject.h"
 #include "JavaThread.h"
@@ -97,7 +98,6 @@
     }
   }
 
-  static ArrayObject* getDeclaredAnnotations(JavaObjectClass* Cl);
   static ArrayObject* getDeclaredClasses(JavaObjectClass* Cl, bool publicOnly);
   static ArrayObject* getDeclaredConstructors(JavaObjectClass* Cl, bool publicOnly);
   static ArrayObject* getDeclaredFields(JavaObjectClass* Cl, bool publicOnly);
@@ -105,6 +105,8 @@
   static ArrayObject* getInterfaces(JavaObjectClass* Cl);
   static JavaObject* getDeclaringClass(JavaObjectClass* Cl);
   static int getModifiers(JavaObjectClass* Cl);
+  static JavaString** getSignature(Class* cl);
+  static ArraySInt8* getAnnotations(Class* cl);
 };
 
 class JavaObjectField : public JavaObject {
@@ -157,6 +159,8 @@
   }
 
   static JavaObjectField* createFromInternalField(JavaField* field, int i);
+  static JavaString** getSignature(JavaField* field);
+  static ArraySInt8* getAnnotations(JavaField* field);
 };
 
 class JavaObjectMethod : public JavaObject {
@@ -211,6 +215,10 @@
   }
 
   static JavaObjectMethod* createFromInternalMethod(JavaMethod* meth, int i);
+  static JavaString** getSignature(JavaMethod* meth);
+  static ArraySInt8* getAnnotations(JavaMethod* meth);
+  static ArraySInt8* getParamAnnotations(JavaMethod* meth);
+  static ArraySInt8* getAnnotationDefault(JavaMethod* meth);
 };
 
 class JavaObjectConstructor : public JavaObject {
@@ -256,6 +264,9 @@
   }
 
   static JavaObjectConstructor* createFromInternalConstructor(JavaMethod* cons, int i);
+  static JavaString** getSignature(JavaMethod* cons);
+  static ArraySInt8* getAnnotations(JavaMethod* cons);
+  static ArraySInt8* getParamAnnotations(JavaMethod* cons);
 };
 
 class JavaObjectThrowable : public JavaObject {

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147380&r1=147379&r2=147380&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Fri Dec 30 14:40:16 2011
@@ -1674,7 +1674,6 @@
 JNIEXPORT jstring JNICALL
 JVM_GetClassSignature(JNIEnv *env, jclass cls) {
   JavaObjectClass * Cl = 0;
-  jstring sig = 0;
   llvm_gcroot(Cl, 0);
 
   BEGIN_JNI_EXCEPTION
@@ -1682,24 +1681,11 @@
   Cl = cls ? *(JavaObjectClass**)cls : 0;
   verifyNull(Cl);
 
-  Jnjvm* vm = th->getJVM();
-  CommonClass* CC =
-    UserCommonClass::resolvedImplClass(vm, Cl, false);
-  Class* cl = CC->asClass();
-
-  // Primitives, arrays, interfaces...
-  if (!cl) RETURN_FROM_JNI(0);
-
-  Attribut* sigAtt = cl->lookupAttribut(Attribut::signatureAttribut);
-
-  if (sigAtt) {
-    Reader reader(sigAtt, cl->bytes);
-    uint16 index = reader.readU2();
-
-    sig = (jstring)cl->classLoader->UTF8ToStr(cl->getConstantPool()->UTF8At(index));
-  }
+  Class* cl = JavaObjectClass::getClass(Cl)->asClass();
+  if (!cl) return 0;
 
-  RETURN_FROM_JNI(sig);
+  JavaString** sig = JavaObjectClass::getSignature(cl);
+  RETURN_FROM_JNI((jstring)sig);
 
   END_JNI_EXCEPTION
 
@@ -1718,28 +1704,12 @@
 
   Cl = cls ? *(JavaObjectClass**)cls : 0;
   verifyNull(Cl);
-
-  Jnjvm* vm = th->getJVM();
-  CommonClass* CC = JavaObjectClass::getClass(Cl);
-  assert(CC);
-  Class* cl = CC->asClass();
+  Class * cl = JavaObjectClass::getClass(Cl)->asClass();
   assert(cl);
 
-  Attribut* annotationsAtt =
-    cl->lookupAttribut(Attribut::annotationsAttribut);
-
-  if (annotationsAtt) {
-    uint32 len = annotationsAtt->nbb;
-    ret = (ArraySInt8*)vm->upcalls->ArrayOfByte->doNew(len, vm);
-
-    Reader reader(annotationsAtt, cl->bytes);
-    for(uint32 i = 0; i < len; ++i) {
-      ArraySInt8::setElement(ret, reader.readS1(), i);
-    }
-    RETURN_REF_FROM_JNI(ret, jbyteArray);
-  }
+  ret = JavaObjectClass::getAnnotations(cl);
 
-  RETURN_FROM_JNI(0);
+  RETURN_REF_FROM_JNI(ret, jbyteArray);
 
   END_JNI_EXCEPTION
 

Modified: vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaClass.cpp?rev=147380&r1=147379&r2=147380&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaClass.cpp Fri Dec 30 14:40:16 2011
@@ -38,6 +38,8 @@
 const UTF8* Attribut::sourceFileAttribut = 0;
 const UTF8* Attribut::signatureAttribut = 0;
 const UTF8* Attribut::enclosingMethodAttribut = 0;
+const UTF8* Attribut::paramAnnotationsAttribut = 0;
+const UTF8* Attribut::annotationDefaultAttribut = 0;
 
 Class* ClassArray::SuperArray;
 Class** ClassArray::InterfacesArray;

Modified: vmkit/trunk/lib/j3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaClass.h?rev=147380&r1=147379&r2=147380&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaClass.h Fri Dec 30 14:40:16 2011
@@ -140,7 +140,14 @@
   /// attribut that identifies the method definining a local or anonymous class
   ///
   static const UTF8* enclosingMethodAttribut;
-  
+
+  /// paramAnnotationsAttribut - Annotations for parameters attribut
+  ///
+  static const UTF8* paramAnnotationsAttribut;
+
+  /// annotationDefaultAttribut - The "AnnotationDefault" attribut
+  ///
+  static const UTF8* annotationDefaultAttribut;
 };
 
 /// TaskClassMirror - The isolate specific class information: the initialization

Modified: vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp?rev=147380&r1=147379&r2=147380&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp Fri Dec 30 14:40:16 2011
@@ -152,6 +152,8 @@
   Attribut::sourceFileAttribut = asciizConstructUTF8("SourceFile");
   Attribut::signatureAttribut = asciizConstructUTF8("Signature");
   Attribut::enclosingMethodAttribut = asciizConstructUTF8("EnclosingMethod");
+  Attribut::paramAnnotationsAttribut = asciizConstructUTF8("RuntimeVisibleParameterAnnotations");
+  Attribut::annotationDefaultAttribut = asciizConstructUTF8("AnnotationDefault");
  
   JavaCompiler::InlinePragma =
     asciizConstructUTF8("Lorg/vmmagic/pragma/Inline;");




From wdietz2 at illinois.edu  Fri Dec 30 12:40:17 2011
From: wdietz2 at illinois.edu (Will Dietz)
Date: Fri, 30 Dec 2011 20:40:17 -0000
Subject: [vmkit-commits] [vmkit] r147381 -
	/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
Message-ID: <20111230204018.B576E2A6C12C@llvm.org>

Author: wdietz2
Date: Fri Dec 30 14:40:17 2011
New Revision: 147381

URL: http://llvm.org/viewvc/llvm-project?rev=147381&view=rev
Log:
Remove unused variable.  No functionality changed.

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147381&r1=147380&r2=147381&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Fri Dec 30 14:40:17 2011
@@ -1961,7 +1961,6 @@
   const UTF8* utf = cl->getConstantPool()->UTF8At(index);
   assert(utf);
 
-  Jnjvm* vm = th->getJVM();
   jstring str = (jstring)cl->classLoader->UTF8ToStr(utf);
 
   RETURN_FROM_JNI(str);