[vmkit-commits] [vmkit] r120565 - in /vmkit/branches/multi-vm: include/mvm/Object.h include/mvm/PrintBuffer.h lib/J3/Compiler/LLVMInfo.cpp lib/J3/VMCore/JavaClass.h lib/J3/VMCore/JavaObject.h lib/J3/VMCore/JavaThread.h lib/J3/VMCore/Jnjvm.h lib/J3/VMCore/JnjvmClassLoader.h lib/J3/VMCore/Reader.h lib/Mvm/Runtime/PrintBuffer.cpp tools/j3/Main.cpp tools/vmjc/vmjc.cpp tools/vmkit/Launcher.cpp
Gael Thomas
gael.thomas at lip6.fr
Wed Dec 1 00:56:55 PST 2010
Author: gthomas
Date: Wed Dec 1 02:56:54 2010
New Revision: 120565
URL: http://llvm.org/viewvc/llvm-project?rev=120565&view=rev
Log:
remove Object.h, it was a little disturbing
Removed:
vmkit/branches/multi-vm/include/mvm/Object.h
Modified:
vmkit/branches/multi-vm/include/mvm/PrintBuffer.h
vmkit/branches/multi-vm/lib/J3/Compiler/LLVMInfo.cpp
vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h
vmkit/branches/multi-vm/lib/J3/VMCore/JavaObject.h
vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h
vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h
vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h
vmkit/branches/multi-vm/lib/J3/VMCore/Reader.h
vmkit/branches/multi-vm/lib/Mvm/Runtime/PrintBuffer.cpp
vmkit/branches/multi-vm/tools/j3/Main.cpp
vmkit/branches/multi-vm/tools/vmjc/vmjc.cpp
vmkit/branches/multi-vm/tools/vmkit/Launcher.cpp
Removed: vmkit/branches/multi-vm/include/mvm/Object.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/include/mvm/Object.h?rev=120564&view=auto
==============================================================================
--- vmkit/branches/multi-vm/include/mvm/Object.h (original)
+++ vmkit/branches/multi-vm/include/mvm/Object.h (removed)
@@ -1,21 +0,0 @@
-//===---------- Object.h - Common layout for all objects ------------------===//
-//
-// The Micro Virtual Machine
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef MVM_OBJECT_H
-#define MVM_OBJECT_H
-
-#include "types.h"
-#include "MvmGC.h"
-
-namespace mvm {
-
-
-} // end namespace mvm
-
-#endif // MVM_OBJECT_H
Modified: vmkit/branches/multi-vm/include/mvm/PrintBuffer.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/include/mvm/PrintBuffer.h?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/include/mvm/PrintBuffer.h (original)
+++ vmkit/branches/multi-vm/include/mvm/PrintBuffer.h Wed Dec 1 02:56:54 2010
@@ -14,7 +14,6 @@
#include <cstring> // memcpy
#include "types.h"
-#include "mvm/Object.h"
#include "mvm/UTF8.h"
namespace mvm {
Modified: vmkit/branches/multi-vm/lib/J3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Compiler/LLVMInfo.cpp?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/Compiler/LLVMInfo.cpp Wed Dec 1 02:56:54 2010
@@ -16,7 +16,7 @@
#include "llvm/Support/MutexGuard.h"
#include "llvm/Target/TargetData.h"
-
+#include "MvmGC.h"
#include "mvm/JIT.h"
#include "JavaConstantPool.h"
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h Wed Dec 1 02:56:54 2010
@@ -15,7 +15,6 @@
#include "mvm/Allocator.h"
#include "mvm/MethodInfo.h"
-#include "mvm/Object.h"
#include "mvm/Threads/Cond.h"
#include "mvm/Threads/Locks.h"
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaObject.h?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaObject.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaObject.h Wed Dec 1 02:56:54 2010
@@ -11,7 +11,7 @@
#define JNJVM_JAVA_OBJECT_H
#include "mvm/Allocator.h"
-#include "mvm/Object.h"
+#include "MvmGC.h"
#include "mvm/UTF8.h"
#include "mvm/Threads/Locks.h"
#include "mvm/Threads/Thread.h"
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h Wed Dec 1 02:56:54 2010
@@ -10,7 +10,6 @@
#ifndef JNJVM_JAVA_THREAD_H
#define JNJVM_JAVA_THREAD_H
-#include "mvm/Object.h"
#include "mvm/Threads/Cond.h"
#include "mvm/Threads/Locks.h"
#include "mvm/Threads/ObjectLocks.h"
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h Wed Dec 1 02:56:54 2010
@@ -15,7 +15,6 @@
#include "types.h"
#include "mvm/Allocator.h"
-#include "mvm/Object.h"
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Cond.h"
#include "mvm/Threads/Locks.h"
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h Wed Dec 1 02:56:54 2010
@@ -18,7 +18,6 @@
#include "mvm/Allocator.h"
-#include "mvm/Object.h"
#include "JavaObject.h"
#include "JnjvmConfig.h"
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/Reader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/Reader.h?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/Reader.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/Reader.h Wed Dec 1 02:56:54 2010
@@ -10,8 +10,6 @@
#ifndef JNJVM_READER_H
#define JNJVM_READER_H
-#include "mvm/Object.h"
-
#include "types.h"
#include "JavaArray.h"
Modified: vmkit/branches/multi-vm/lib/Mvm/Runtime/PrintBuffer.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/Mvm/Runtime/PrintBuffer.cpp?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/Mvm/Runtime/PrintBuffer.cpp (original)
+++ vmkit/branches/multi-vm/lib/Mvm/Runtime/PrintBuffer.cpp Wed Dec 1 02:56:54 2010
@@ -11,7 +11,6 @@
#include <cstdlib>
#include "MvmGC.h"
-#include "mvm/Object.h"
#include "mvm/PrintBuffer.h"
using namespace mvm;
Modified: vmkit/branches/multi-vm/tools/j3/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/tools/j3/Main.cpp?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/tools/j3/Main.cpp (original)
+++ vmkit/branches/multi-vm/tools/j3/Main.cpp Wed Dec 1 02:56:54 2010
@@ -9,7 +9,6 @@
#include "MvmGC.h"
#include "mvm/JIT.h"
-#include "mvm/Object.h"
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Thread.h"
Modified: vmkit/branches/multi-vm/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/tools/vmjc/vmjc.cpp?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/tools/vmjc/vmjc.cpp (original)
+++ vmkit/branches/multi-vm/tools/vmjc/vmjc.cpp Wed Dec 1 02:56:54 2010
@@ -38,7 +38,6 @@
#include "MvmGC.h"
#include "mvm/JIT.h"
-#include "mvm/Object.h"
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Thread.h"
Modified: vmkit/branches/multi-vm/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/tools/vmkit/Launcher.cpp?rev=120565&r1=120564&r2=120565&view=diff
==============================================================================
--- vmkit/branches/multi-vm/tools/vmkit/Launcher.cpp (original)
+++ vmkit/branches/multi-vm/tools/vmkit/Launcher.cpp Wed Dec 1 02:56:54 2010
@@ -21,7 +21,6 @@
#include "MvmGC.h"
#include "mvm/Config/config.h"
#include "mvm/JIT.h"
-#include "mvm/Object.h"
#include "mvm/VirtualMachine.h"
#include "mvm/Threads/Thread.h"
More information about the vmkit-commits
mailing list