[vmkit-commits] [vmkit] r145029 - in /vmkit/trunk: ./ autoconf/ include/j3/ include/mvm/ include/mvm/Config/ include/mvm/GC/ include/mvm/Threads/ lib/J3/Compiler/ lib/J3/VMCore/ lib/Mvm/CommonThread/ lib/Mvm/Compiler/ lib/Mvm/MMTk/ mmtk/mmtk-j3/ tools/j3/ tools/precompiler/ tools/vmjc/

Gael Thomas gael.thomas at lip6.fr
Mon Nov 21 02:12:26 PST 2011 

Author: gthomas
Date: Mon Nov 21 04:12:26 2011
New Revision: 145029

URL: http://llvm.org/viewvc/llvm-project?rev=145029&view=rev
Log:
Move mvm/include/GC/*, mvm/include/Config/* and mvm/include/Threads/* into mvm/include


Added:
    vmkit/trunk/include/mvm/CollectionRV.h
      - copied, changed from r145028, vmkit/trunk/include/mvm/Threads/CollectionRV.h
    vmkit/trunk/include/mvm/Cond.h
      - copied unchanged from r145028, vmkit/trunk/include/mvm/Threads/Cond.h
    vmkit/trunk/include/mvm/GC.h
      - copied unchanged from r145028, vmkit/trunk/include/mvm/GC/GC.h
    vmkit/trunk/include/mvm/Locks.h
      - copied, changed from r145028, vmkit/trunk/include/mvm/Threads/Locks.h
    vmkit/trunk/include/mvm/ObjectLocks.h
      - copied, changed from r145028, vmkit/trunk/include/mvm/Threads/ObjectLocks.h
    vmkit/trunk/include/mvm/Thread.h
      - copied unchanged from r145028, vmkit/trunk/include/mvm/Threads/Thread.h
    vmkit/trunk/include/mvm/config.h.in
      - copied unchanged from r145028, vmkit/trunk/include/mvm/Config/config.h.in
Removed:
    vmkit/trunk/include/mvm/Config/
    vmkit/trunk/include/mvm/GC/
    vmkit/trunk/include/mvm/Threads/
Modified:
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure
    vmkit/trunk/include/j3/JavaCompiler.h
    vmkit/trunk/include/mvm/   (props changed)
    vmkit/trunk/include/mvm/Allocator.h
    vmkit/trunk/include/mvm/JIT.h
    vmkit/trunk/include/mvm/MethodInfo.h
    vmkit/trunk/include/mvm/VirtualMachine.h
    vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/J3/VMCore/JavaClass.h
    vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
    vmkit/trunk/lib/J3/VMCore/JavaObject.h
    vmkit/trunk/lib/J3/VMCore/JavaThread.cpp
    vmkit/trunk/lib/J3/VMCore/JavaThread.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/ReferenceQueue.h
    vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp
    vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
    vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp
    vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp
    vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
    vmkit/trunk/lib/Mvm/Compiler/EscapeAnalysis.cpp
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
    vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h
    vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
    vmkit/trunk/mmtk/mmtk-j3/Strings.cpp
    vmkit/trunk/tools/j3/Main.cpp
    vmkit/trunk/tools/precompiler/Precompiler.cpp
    vmkit/trunk/tools/vmjc/vmjc.cpp

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Mon Nov 21 04:12:26 2011
@@ -50,7 +50,7 @@
 dnl Quit if the source directory has already been configured.
 dnl NOTE: This relies upon undocumented autoconf behavior.
 if test ${srcdir} != "." ; then
-  if test -f ${srcdir}/include/mvm/Config/config.h ; then
+  if test -f ${srcdir}/include/mvm/config.h ; then
     AC_MSG_ERROR([Already configured in ${srcdir}])
   fi
 fi
@@ -369,7 +369,7 @@
 dnl you MUST also update Makefile.rules so that the variable FilesToConfig
 dnl contains the same list of files as AC_CONFIG_HEADERS below. This ensures the
 dnl files can be updated automatically when their *.in sources change.
-AC_CONFIG_HEADERS([include/mvm/Config/config.h])
+AC_CONFIG_HEADERS([include/mvm/config.h])
 
 dnl Verify that the source directory is valid
 AC_CONFIG_SRCDIR(["Makefile.common.in"])

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Mon Nov 21 04:12:26 2011
@@ -2259,7 +2259,7 @@
 
 
 if test ${srcdir} != "." ; then
-  if test -f ${srcdir}/include/mvm/Config/config.h ; then
+  if test -f ${srcdir}/include/mvm/config.h ; then
     as_fn_error $? "Already configured in ${srcdir}" "$LINENO" 5
   fi
 fi
@@ -5780,7 +5780,7 @@
 
 
 
-ac_config_headers="$ac_config_headers include/mvm/Config/config.h"
+ac_config_headers="$ac_config_headers include/mvm/config.h"
 
 
 
@@ -6515,7 +6515,7 @@
 do
   case $ac_config_target in
     "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
-    "include/mvm/Config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/mvm/Config/config.h" ;;
+    "include/mvm/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/mvm/config.h" ;;
     "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
     "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
     "lib/J3/ClassLib/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/J3/ClassLib/Classpath.h" ;;

Modified: vmkit/trunk/include/j3/JavaCompiler.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JavaCompiler.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/include/j3/JavaCompiler.h (original)
+++ vmkit/trunk/include/j3/JavaCompiler.h Mon Nov 21 04:12:26 2011
@@ -15,7 +15,7 @@
 #include <string>
 #include <dlfcn.h>
 
-#include "mvm/GC/GC.h"
+#include "mvm/GC.h"
 #include "mvm/Allocator.h"
 
 namespace mvm {

Propchange: vmkit/trunk/include/mvm/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 21 04:12:26 2011
@@ -0,0 +1 @@
+config.h

Modified: vmkit/trunk/include/mvm/Allocator.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Allocator.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Allocator.h (original)
+++ vmkit/trunk/include/mvm/Allocator.h Mon Nov 21 04:12:26 2011
@@ -11,7 +11,7 @@
 #define MVM_ALLOCATOR_H
 
 #include "llvm/Support/Allocator.h"
-#include "mvm/Threads/Locks.h"
+#include "mvm/Locks.h"
 
 #include <cstring>
 

Copied: vmkit/trunk/include/mvm/CollectionRV.h (from r145028, vmkit/trunk/include/mvm/Threads/CollectionRV.h)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/CollectionRV.h?p2=vmkit/trunk/include/mvm/CollectionRV.h&p1=vmkit/trunk/include/mvm/Threads/CollectionRV.h&r1=145028&r2=145029&rev=145029&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/CollectionRV.h (original)
+++ vmkit/trunk/include/mvm/CollectionRV.h Mon Nov 21 04:12:26 2011
@@ -10,9 +10,9 @@
 #ifndef _MVM_COLLECTIONRV_H_
 #define _MVM_COLLECTIONRV_H_
 
-#include "mvm/Threads/Cond.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Cond.h"
+#include "mvm/Locks.h"
+#include "mvm/Thread.h"
 
 namespace mvm {
 

Modified: vmkit/trunk/include/mvm/JIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/JIT.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/JIT.h (original)
+++ vmkit/trunk/include/mvm/JIT.h Mon Nov 21 04:12:26 2011
@@ -19,7 +19,7 @@
 #include "llvm/Target/TargetMachine.h"
 
 #include "mvm/MethodInfo.h"
-#include "mvm/GC/GC.h"
+#include "mvm/GC.h"
 
 namespace llvm {
   class Constant;

Copied: vmkit/trunk/include/mvm/Locks.h (from r145028, vmkit/trunk/include/mvm/Threads/Locks.h)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Locks.h?p2=vmkit/trunk/include/mvm/Locks.h&p1=vmkit/trunk/include/mvm/Threads/Locks.h&r1=145028&r2=145029&rev=145029&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/Locks.h (original)
+++ vmkit/trunk/include/mvm/Locks.h Mon Nov 21 04:12:26 2011
@@ -14,7 +14,7 @@
 #include <cassert>
 #include <cstdio>
 
-#include "mvm/Threads/Thread.h"
+#include "mvm/Thread.h"
 
 extern "C" void __llvm_gcroot(void**, void*) __attribute__((nothrow));
 #define llvm_gcroot(a, b) __llvm_gcroot((void**)&a, b)

Modified: vmkit/trunk/include/mvm/MethodInfo.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/MethodInfo.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/MethodInfo.h (original)
+++ vmkit/trunk/include/mvm/MethodInfo.h Mon Nov 21 04:12:26 2011
@@ -12,7 +12,7 @@
 
 #include "mvm/Allocator.h"
 #include "mvm/System.h"
-#include "mvm/GC/GC.h"
+#include "mvm/GC.h"
 
 namespace mvm {
 

Copied: vmkit/trunk/include/mvm/ObjectLocks.h (from r145028, vmkit/trunk/include/mvm/Threads/ObjectLocks.h)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/ObjectLocks.h?p2=vmkit/trunk/include/mvm/ObjectLocks.h&p1=vmkit/trunk/include/mvm/Threads/ObjectLocks.h&r1=145028&r2=145029&rev=145029&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/ObjectLocks.h (original)
+++ vmkit/trunk/include/mvm/ObjectLocks.h Mon Nov 21 04:12:26 2011
@@ -11,10 +11,10 @@
 #define MVM_OBJECT_LOCKS_H
 
 #include "mvm/Allocator.h"
-#include "mvm/GC/GC.h"
-#include "mvm/Threads/Cond.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/GC.h"
+#include "mvm/Cond.h"
+#include "mvm/Locks.h"
+#include "mvm/Thread.h"
 
 namespace mvm {
 

Modified: vmkit/trunk/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/VirtualMachine.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Mon Nov 21 04:12:26 2011
@@ -13,9 +13,9 @@
 #include "llvm/ADT/DenseMap.h"
 
 #include "mvm/Allocator.h"
-#include "mvm/Threads/CollectionRV.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/GC/GC.h"
+#include "mvm/CollectionRV.h"
+#include "mvm/Locks.h"
+#include "mvm/GC.h"
 
 #include <cassert>
 #include <map>

Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Mon Nov 21 04:12:26 2011
@@ -18,7 +18,7 @@
 #include "llvm/Target/TargetData.h"
 
 #include "mvm/UTF8.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Thread.h"
 
 #include "j3/J3Intrinsics.h"
 #include "j3/JavaAOTCompiler.h"

Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.h Mon Nov 21 04:12:26 2011
@@ -15,8 +15,8 @@
 
 #include "mvm/Allocator.h"
 #include "mvm/MethodInfo.h"
-#include "mvm/Threads/Cond.h"
-#include "mvm/Threads/Locks.h"
+#include "mvm/Cond.h"
+#include "mvm/Locks.h"
 
 #include "JavaAccess.h"
 #include "JavaObject.h"

Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.cpp Mon Nov 21 04:12:26 2011
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mvm/Threads/Locks.h"
+#include "mvm/Locks.h"
 
 #include "JavaArray.h"
 #include "JavaClass.h"

Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.h Mon Nov 21 04:12:26 2011
@@ -12,8 +12,8 @@
 
 #include "mvm/Allocator.h"
 #include "mvm/UTF8.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Locks.h"
+#include "mvm/Thread.h"
 #include "MvmGC.h"
 
 #include "types.h"

Modified: vmkit/trunk/lib/J3/VMCore/JavaThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaThread.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaThread.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaThread.cpp Mon Nov 21 04:12:26 2011
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Locks.h"
+#include "mvm/Thread.h"
 
 #include "JavaClass.h"
 #include "JavaObject.h"

Modified: vmkit/trunk/lib/J3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaThread.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaThread.h Mon Nov 21 04:12:26 2011
@@ -10,10 +10,10 @@
 #ifndef JNJVM_JAVA_THREAD_H
 #define JNJVM_JAVA_THREAD_H
 
-#include "mvm/Threads/Cond.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/ObjectLocks.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Cond.h"
+#include "mvm/Locks.h"
+#include "mvm/ObjectLocks.h"
+#include "mvm/Thread.h"
 
 #include "MutatorThread.h"
 

Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp Mon Nov 21 04:12:26 2011
@@ -18,7 +18,7 @@
 #include <string>
 #include "debug.h"
 
-#include "mvm/Threads/Thread.h"
+#include "mvm/Thread.h"
 #include "MvmGC.h"
 
 #include "ClasspathReflect.h"

Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.h Mon Nov 21 04:12:26 2011
@@ -17,9 +17,9 @@
 #include "mvm/Allocator.h"
 #include "mvm/MethodInfo.h"
 #include "mvm/VirtualMachine.h"
-#include "mvm/Threads/Cond.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/ObjectLocks.h"
+#include "mvm/Cond.h"
+#include "mvm/Locks.h"
+#include "mvm/ObjectLocks.h"
 
 #include "JnjvmConfig.h"
 #include "JNIReferences.h"

Modified: vmkit/trunk/lib/J3/VMCore/LockedMap.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/LockedMap.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/LockedMap.h (original)
+++ vmkit/trunk/lib/J3/VMCore/LockedMap.h Mon Nov 21 04:12:26 2011
@@ -25,7 +25,7 @@
 
 #include "mvm/Allocator.h"
 #include "mvm/MvmDenseMap.h"
-#include "mvm/Threads/Locks.h"
+#include "mvm/Locks.h"
 #include "UTF8.h"
 
 namespace j3 {

Modified: vmkit/trunk/lib/J3/VMCore/ReferenceQueue.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/ReferenceQueue.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/ReferenceQueue.h (original)
+++ vmkit/trunk/lib/J3/VMCore/ReferenceQueue.h Mon Nov 21 04:12:26 2011
@@ -10,7 +10,7 @@
 #ifndef J3_REFERENCE_QUEUE_H
 #define J3_REFERENCE_QUEUE_H
 
-#include "mvm/Threads/Locks.h"
+#include "mvm/Locks.h"
 
 #include "JavaThread.h"
 

Modified: vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp Mon Nov 21 04:12:26 2011
@@ -11,7 +11,7 @@
 #include <signal.h>
 #include "MvmGC.h"
 #include "mvm/VirtualMachine.h"
-#include "mvm/Threads/CollectionRV.h"
+#include "mvm/CollectionRV.h"
 
 #include "debug.h"
 

Modified: vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp Mon Nov 21 04:12:26 2011
@@ -9,10 +9,10 @@
 
 #include <cassert>
 
-#include "mvm/Threads/Cond.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/ObjectLocks.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Cond.h"
+#include "mvm/Locks.h"
+#include "mvm/ObjectLocks.h"
+#include "mvm/Thread.h"
 #include "mvm/VirtualMachine.h"
 #include "MvmGC.h"
 #include <cerrno>

Modified: vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp Mon Nov 21 04:12:26 2011
@@ -11,7 +11,7 @@
 #include "mvm/MethodInfo.h"
 #include "mvm/System.h"
 #include "mvm/VirtualMachine.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Thread.h"
 
 #include <csignal>
 #include <cstdio>

Modified: vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp Mon Nov 21 04:12:26 2011
@@ -9,9 +9,9 @@
 
 #include <cassert>
 
-#include "mvm/Threads/Cond.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Cond.h"
+#include "mvm/Locks.h"
+#include "mvm/Thread.h"
 #include "mvm/VirtualMachine.h"
 #include "MvmGC.h"
 #include <cerrno>

Modified: vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp Mon Nov 21 04:12:26 2011
@@ -12,9 +12,9 @@
 #include "MvmGC.h"
 #include "mvm/MethodInfo.h"
 #include "mvm/VirtualMachine.h"
-#include "mvm/Threads/Cond.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Cond.h"
+#include "mvm/Locks.h"
+#include "mvm/Thread.h"
 
 #include <cassert>
 #include <cstdio>

Modified: vmkit/trunk/lib/Mvm/Compiler/EscapeAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/EscapeAnalysis.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/EscapeAnalysis.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/EscapeAnalysis.cpp Mon Nov 21 04:12:26 2011
@@ -23,7 +23,7 @@
 #include <cstddef>
 #include <map>
 
-#include "mvm/GC/GC.h"
+#include "mvm/GC.h"
 
 using namespace llvm;
 

Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Mon Nov 21 04:12:26 2011
@@ -38,11 +38,11 @@
 #include <../lib/ExecutionEngine/JIT/JIT.h>
 
 #include "mvm/JIT.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/ObjectLocks.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Locks.h"
+#include "mvm/ObjectLocks.h"
+#include "mvm/Thread.h"
 #include "mvm/VirtualMachine.h"
-#include "mvm/GC/GC.h"
+#include "mvm/GC.h"
 #include "MutatorThread.h"
 #include "MvmGC.h"
 

Modified: vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h Mon Nov 21 04:12:26 2011
@@ -12,7 +12,7 @@
 #define MVM_MUTATOR_THREAD_H
 
 #include "mvm/Allocator.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Thread.h"
 
 namespace mvm {
 

Modified: vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MvmGC.h?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.h (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MvmGC.h Mon Nov 21 04:12:26 2011
@@ -11,7 +11,7 @@
 #ifndef MVM_MMTK_GC_H
 #define MVM_MMTK_GC_H
 
-#include "mvm/GC/GC.h"
+#include "mvm/GC.h"
 #include <cstdlib>
 
 extern "C" void EmptyDestructor();

Modified: vmkit/trunk/mmtk/mmtk-j3/Strings.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Strings.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Strings.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Strings.cpp Mon Nov 21 04:12:26 2011
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mvm/Threads/Thread.h"
+#include "mvm/Thread.h"
 
 #include "MMTkObject.h"
 

Modified: vmkit/trunk/tools/j3/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Main.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/tools/j3/Main.cpp (original)
+++ vmkit/trunk/tools/j3/Main.cpp Mon Nov 21 04:12:26 2011
@@ -11,7 +11,7 @@
 #include "mvm/JIT.h"
 #include "mvm/MethodInfo.h"
 #include "mvm/VirtualMachine.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Thread.h"
 
 #include "j3/JavaJITCompiler.h"
 #include "../../lib/J3/VMCore/JnjvmClassLoader.h"

Modified: vmkit/trunk/tools/precompiler/Precompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/precompiler/Precompiler.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/Precompiler.cpp (original)
+++ vmkit/trunk/tools/precompiler/Precompiler.cpp Mon Nov 21 04:12:26 2011
@@ -19,7 +19,7 @@
 #include "mvm/JIT.h"
 #include "mvm/MethodInfo.h"
 #include "mvm/VirtualMachine.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Thread.h"
 
 #include "j3/JavaAOTCompiler.h"
 #include "j3/JavaJITCompiler.h"

Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=145029&r1=145028&r2=145029&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Mon Nov 21 04:12:26 2011
@@ -41,7 +41,7 @@
 #include "MvmGC.h"
 #include "mvm/JIT.h"
 #include "mvm/VirtualMachine.h"
-#include "mvm/Threads/Thread.h"
+#include "mvm/Thread.h"
 
 #include "j3/JavaAOTCompiler.h"

More information about the vmkit-commits mailing list