[vmkit-commits] [vmkit] r182967 - Restored some needed dependencies to VirtualTables.

[Harris Bakiras]

Author: harris
Date: Thu May 30 17:15:52 2013
New Revision: 182967

URL: http://llvm.org/viewvc/llvm-project?rev=182967&view=rev
Log:
Restored some needed dependencies to VirtualTables.

Modified:
    vmkit/trunk/include/vmkit/VirtualMachine.h
    vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp
    vmkit/trunk/lib/j3/VMCore/Jnjvm.h
    vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp

Modified: vmkit/trunk/include/vmkit/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/vmkit/VirtualMachine.h?rev=182967&r1=182966&r2=182967&view=diff
==============================================================================
--- vmkit/trunk/include/vmkit/VirtualMachine.h (original)
+++ vmkit/trunk/include/vmkit/VirtualMachine.h Thu May 30 17:15:52 2013
@@ -205,7 +205,7 @@ public:
   /// set the identity of the object (identity is determined by user).
   ///
   virtual void setType(gc* header, void* type) = 0;
-  virtual void setType(void* header, void* type) = 0;
+//  virtual void setType(void* header, void* type) = 0;
 
   /// getType - Gets the type of given object.
   ///

Modified: vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp?rev=182967&r1=182966&r2=182967&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp Thu May 30 17:15:52 2013
@@ -1475,10 +1475,10 @@ void Jnjvm::setType(gc* header, void* ty
 	src->setVirtualTable((JavaVirtualTable*)type);
 }
 
-void Jnjvm::setType(void* header, void* type)
-{
-	((JavaObject*)header)->setVirtualTable((JavaVirtualTable*)type);
-}
+//void Jnjvm::setType(void* header, void* type)
+//{
+//	((JavaObject*)header)->setVirtualTable((JavaVirtualTable*)type);
+//}
 
 void* Jnjvm::getType(gc* header) {
 	JavaObject* src = 0;

Modified: vmkit/trunk/lib/j3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jnjvm.h?rev=182967&r1=182966&r2=182967&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/j3/VMCore/Jnjvm.h Thu May 30 17:15:52 2013
@@ -137,7 +137,7 @@ private:
   virtual void finalizeObject(gc* res);
   virtual void traceObject(gc* obj, word_t closure);
   virtual void setType(gc* header, void* type);
-  virtual void setType(void* header, void* type);
+//  virtual void setType(void* header, void* type);
   virtual void* getType(gc* obj);
   virtual size_t getObjectSize(gc* obj);
   virtual const char* getObjectTypeName(gc* obj);

Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=182967&r1=182966&r2=182967&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Thu May 30 17:15:52 2013
@@ -298,7 +298,8 @@ extern "C" void* MMTkMutatorAllocate(uin
   size = llvm::RoundUpToAlignment(size, sizeof(void*));
   head = (gcHeader*)MutatorThread::get()->Allocator.Allocate(size);
   void* val = head->toReference();
-  vmkit::Thread::get()->MyVM->setType(val, type);
+  VirtualTable::setVirtualTable((gc*)val, (VirtualTable*)type);
+//  vmkit::Thread::get()->MyVM->setType(val, type);
   return val;
 }