[vmkit-commits] [vmkit] r145388 - in /vmkit/trunk/lib/j3/ClassLib: GNUClasspath/JavaUpcalls.cpp OpenJDK/JavaUpcalls.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Nov 29 01:36:51 2011
New Revision: 145388

URL: http://llvm.org/viewvc/llvm-project?rev=145388&view=rev
Log:
Call JavaThread::initialise to initialise system threads. This also makes sure that we execute a write barrier.


Modified:
    vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.cpp
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.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=145388&r1=145387&r2=145388&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/JavaUpcalls.cpp Tue Nov 29 01:36:51 2011
@@ -242,8 +242,9 @@
   llvm_gcroot(name, 0);
 
   th = newThread->doNew(vm);
-  myth->javaThread = th;
   vmth = (JavaObjectVMThread*)newVMThread->doNew(vm);
+  myth->initialise(th, vmth);
+
   name = vm->asciizToStr(thName);
 
   initThread->invokeIntSpecial(vm, newThread, th, &vmth, &name, 1, 0); 

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=145388&r1=145387&r2=145388&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp Tue Nov 29 01:36:51 2011
@@ -235,9 +235,7 @@
 
   th = newThread->doNew(vm);
   sleep = OfObject->doNew(vm);
-
-  myth->javaThread = th;
-  myth->sleepObject = sleep;
+  myth->initialise(th, sleep);
 
   name = vm->asciizToStr(thName);